From a933813cfcea78340d2287b23cbe155a9c7dc6fc Mon Sep 17 00:00:00 2001
From: Klaus <klaus.boehnlein@tu-dresden.de>
Date: Tue, 27 Jul 2021 16:42:30 +0200
Subject: [PATCH] adjust Input
---
src/dune-microstructure.cc | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/dune-microstructure.cc b/src/dune-microstructure.cc
index 815f04cc..edc90c05 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);
--
GitLab