mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move mas tasks into volume specific folder

Browse Source
This commit is contained in:
Jonathan Grangien
2018-06-15 11:10:09 -04:00
parent aea94bcb06
commit bf422df2db
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
data/tasks/mas_bastille_conversion.task → data/tasks/volume/mas_bastille_conversion.task
View File

5
data/tasks/mas_bastille_single_conversion.task → data/tasks/volume/mas_bastille_single_conversion.task
View File

@@ -5,9 +5,10 @@ return {{
-- Variable = "rho",
VariableVector = "ur uphi utheta",
InnerRadialLimit = 1.75,
FactorRSquared = "false",
Dimensions = {100, 100, 128},
LowerDomainBound = {1, -90, 0},
UpperDomainBound = {15, 90, 360},
RawVolumeOutput = "${DATA}/mas/bastille/u/mas_merged_step_112.rawvolume",
DictionaryOutput = "${DATA}/mas/bastille/u/mas_merged_step_112.dictionary"
RawVolumeOutput = "${DATA}/mas/bastille/test/mas_merged_step_112.rawvolume",
DictionaryOutput = "${DATA}/mas/bastille/test/mas_merged_step_112.dictionary"
}}

0
data/tasks/mas_eclipse_conversion.task → data/tasks/volume/mas_eclipse_conversion.task
View File

2
modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
View File

@@ -113,11 +113,9 @@ KameleonVolumeToRawTask::KameleonVolumeToRawTask(const ghoul::Dictionary& dictio
_autoDomainBounds = true;
}
if (dictionary.hasValue<std::string>(KeyFactorRSquared) && dictionary.value<std::string>(KeyFactorRSquared) != "false") {
std::cout << "With factor r squared\n";
_factorRSquared = true;
}
if (!dictionary.getValue<float>(KeyInnerRadialLimit, _innerRadialLimit)) {
std::cout << "Without inner radial limit\n";
_innerRadialLimit = -1.0;
}
}