diff --git a/src/dune-microstructure.cc b/src/dune-microstructure.cc index 815f04cc1c5baf6b634c135d5d13dee6e14db351..edc90c05b307810a5ffe8ed1a2edd4a11833627c 100644 --- a/src/dune-microstructure.cc +++ b/src/dune-microstructure.cc @@ -1604,11 +1604,13 @@ int main(int argc, char *argv[]) ParameterTree parameterSet; -// if (argc < 2) - ParameterTreeParser::readINITree("../../inputs/cellsolver.parset", parameterSet); - -// ParameterTreeParser::readINITree(argv[1], parameterSet); -// ParameterTreeParser::readOptions(argc, argv, parameterSet); + if (argc < 2) + ParameterTreeParser::readINITree("../../inputs/cellsolver.parset", parameterSet); + else + { + ParameterTreeParser::readINITree(argv[1], parameterSet); + ParameterTreeParser::readOptions(argc, argv, parameterSet); + } // output setter std::string outputPath = parameterSet.get("outputPath", "../../outputs/output.txt"); @@ -1640,7 +1642,7 @@ int main(int argc, char *argv[]) /////////////////////////////////// // Get Prestrain Parameters /////////////////////////////////// - unsigned int prestraintype = parameterSet.get<unsigned int>("imp", 2); + unsigned int prestraintype = parameterSet.get<unsigned int>("prestrainType", 2); double rho1 = parameterSet.get<double>("rho1", 1.0); double alpha = parameterSet.get<double>("alpha", 2.0); double theta = parameterSet.get<double>("theta",0.3);