diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc index 3289cb8bb1a3b109b620ede4f9c380441db229dc..24c68e8686fe4abef194748abf36121fdf80e709 100644 --- a/src/sand-wedge.cc +++ b/src/sand-wedge.cc @@ -85,16 +85,24 @@ void initPython(fs::path const &dataDirectory) { str(boost::format("sys.path.append('%s')") % dataDirectory.string())); } +Dune::ParameterTree getParameters(int argc, char *argv[], + fs::path const &dataDirectory) { + Dune::ParameterTree parset; + std::string sharedParsetName("parset.cfg"); + fs::path sharedParsetPath(dataDirectory / fs::path(sharedParsetName)); + Dune::ParameterTreeParser::readINITree(sharedParsetPath.string(), parset); + + Dune::ParameterTreeParser::readOptions(argc, argv, parset); + + return parset; +} + int main(int argc, char *argv[]) { try { auto const dataDirectory = fs::system_complete(fs::path(argv[0])).parent_path() / fs::path("sand-wedge-data"); - - Dune::ParameterTree parset; - Dune::ParameterTreeParser::readINITree( - (dataDirectory / fs::path("parset.cfg")).string(), parset); - Dune::ParameterTreeParser::readOptions(argc, argv, parset); + auto const parset = getParameters(argc, argv, dataDirectory); MyGeometry::render(); MyGeometry::write();