mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-18 10:59:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge with latest master

Browse Source
This commit is contained in:
GPayne
2020-02-19 09:25:33 -07:00
parent 79a3b42d06
commit addfa65fa6
230 changed files with 1151 additions and 2270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/fieldlinessequence/util/commons.cpp
View File

@@ -29,9 +29,11 @@ namespace openspace::fls {
Model stringToModel(const std::string& s) {
if (s == "batsrus") {
return Model::Batsrus;
} else if (s == "enlil") {
}
else if (s == "enlil") {
return Model::Enlil;
} else if (s == "pfss") {
}
else if (s == "pfss") {
return Model::Pfss;
}
return Model::Invalid;

15
modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
View File

@@ -236,7 +236,8 @@ void addExtraQuantities(ccmc::Kameleon* kameleon,
val = interpolator->interpolate("p", p.x, p.y, p.z);
val *= ToKelvin;
val /= interpolator->interpolate("rho", p.x, p.y, p.z);
} else {
}
else {
val = interpolator->interpolate(extraScalarVars[i], p.x, p.y, p.z);
// When measuring density in ENLIL CCMC multiply by the radius^2
@@ -265,7 +266,8 @@ void addExtraQuantities(ccmc::Kameleon* kameleon,
// the magnetic field vector!
val = glm::dot(glm::vec3(x,y,z), normMagnetic);
} else {
}
else {
val = std::sqrt(x*x + y*y + z*z);
}
state.appendToExtra(i + nXtraScalars, val);
@@ -315,7 +317,8 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
));
extraScalarVars.erase(extraScalarVars.begin() + i);
--i;
} else {
}
else {
extraQuantityNames.push_back(str);
}
}
@@ -359,11 +362,13 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
extraMagVars.begin() + i + 3
);
i -= 3;
} else {
}
else {
extraQuantityNames.push_back(std::move(name));
}
}
} else {
}
else {
// WRONG NUMBER OF MAGNITUDE VARIABLES.. REMOVE ALL!
extraMagVars.clear();
LWARNING(fmt::format(