From 526768ac40e1e84be14b232cc87555a66323fe2a Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 7 Apr 2015 16:04:00 +0200
Subject: [PATCH] [Cleanup] Add getParameters()
---
src/sand-wedge.cc | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 3289cb8b..24c68e86 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();
--
GitLab