From 3abd5e683711517b95e2e42b4a0185aee15803f5 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 17 Mar 2011 10:54:33 +0000
Subject: [PATCH] use ParameterTree instead of ConfigParser
[[Imported from SVN: r7025]]
---
harmonicmaps-eoc.cc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/harmonicmaps-eoc.cc b/harmonicmaps-eoc.cc
index cc5c4742..63c2c884 100644
--- a/harmonicmaps-eoc.cc
+++ b/harmonicmaps-eoc.cc
@@ -3,7 +3,8 @@
#define HARMONIC_ENERGY_FD_GRADIENT
#include <dune/common/bitsetvector.hh>
-#include <dune/common/configparser.hh>
+#include <dune/common/parametertree.hh>
+#include <dune/common/parametertreeparser.hh>
#include <dune/grid/uggrid.hh>
#include <dune/grid/onedgrid.hh>
@@ -39,7 +40,7 @@ template <class GridType>
void solve (const shared_ptr<GridType>& grid,
SolutionType& x,
int numLevels,
- ConfigParser& parameters)
+ const ParameterTree& parameters)
{
// read solver setting
const double innerTolerance = parameters.get<double>("innerTolerance");
@@ -144,11 +145,11 @@ void solve (const shared_ptr<GridType>& grid,
int main (int argc, char *argv[]) try
{
// parse data file
- ConfigParser parameterSet;
+ ParameterTree parameterSet;
if (argc==2)
- parameterSet.parseFile(argv[1]);
+ ParameterTreeParser::readINITree(argv[1], parameterSet);
else
- parameterSet.parseFile("harmonicmaps-eoc.parset");
+ ParameterTreeParser::readINITree("harmonicmaps-eoc.parset", parameterSet);
// read solver settings
const int numLevels = parameterSet.get<int>("numLevels");
--
GitLab