Skip to content
Snippets Groups Projects
Commit 58f0e4bb authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Start functionality: fix usage of group names for "Restart",

"PrintParameters", "PrintProperties".


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8832 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent ac68ab14
No related branches found
No related tags found
No related merge requests found
...@@ -225,7 +225,7 @@ std::string usageTextBlock() ...@@ -225,7 +225,7 @@ std::string usageTextBlock()
"\t-PrintProperties [true|false] Print the compile-time parameters _before_ \n" "\t-PrintProperties [true|false] Print the compile-time parameters _before_ \n"
"\t the simulation [default: false]\n" "\t the simulation [default: false]\n"
"\t-ParameterFile FILENAME File with parameter definitions\n" "\t-ParameterFile FILENAME File with parameter definitions\n"
"\t-Restart RESTARTTIME Restart simulation from a restart file\n" "\t-TimeManager.Restart RESTARTTIME Restart simulation from a restart file\n"
"\n" "\n"
"\n"; "\n";
} }
...@@ -341,7 +341,8 @@ int start_(int argc, ...@@ -341,7 +341,8 @@ int start_(int argc,
parameterFile.close(); parameterFile.close();
bool printProps = false; bool printProps = false;
if (ParameterTree::tree().hasKey("PrintProperties")) if (ParameterTree::tree().hasKey("PrintProperties")
|| ParameterTree::tree().hasKey("TimeManager.PrintProperties"))
printProps = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintProperties); printProps = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintProperties);
if (printProps && mpiHelper.rank() == 0) { if (printProps && mpiHelper.rank() == 0) {
...@@ -351,14 +352,16 @@ int start_(int argc, ...@@ -351,14 +352,16 @@ int start_(int argc,
// deal with the restart stuff // deal with the restart stuff
bool restart = false; bool restart = false;
Scalar restartTime = 0; Scalar restartTime = 0;
if (ParameterTree::tree().hasKey("Restart")) { if (ParameterTree::tree().hasKey("Restart")
|| ParameterTree::tree().hasKey("TimeManager.Restart")) {
restart = true; restart = true;
restartTime = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, Restart); restartTime = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, Restart);
} }
// read the PrintParams parameter // read the PrintParams parameter
bool printParams = true; bool printParams = true;
if (ParameterTree::tree().hasKey("PrintParameters")) if (ParameterTree::tree().hasKey("PrintParameters")
|| ParameterTree::tree().hasKey("TimeManager.PrintParameters"))
printParams = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintParameters); printParams = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintParameters);
// try to create a grid (from the given grid file) // try to create a grid (from the given grid file)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment