Skip to content
Snippets Groups Projects
Commit 3abd5e68 authored by Oliver Sander's avatar Oliver Sander Committed by sander@FU-BERLIN.DE
Browse files

use ParameterTree instead of ConfigParser

[[Imported from SVN: r7025]]
parent 54985b47
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
#define HARMONIC_ENERGY_FD_GRADIENT #define HARMONIC_ENERGY_FD_GRADIENT
#include <dune/common/bitsetvector.hh> #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/uggrid.hh>
#include <dune/grid/onedgrid.hh> #include <dune/grid/onedgrid.hh>
...@@ -39,7 +40,7 @@ template <class GridType> ...@@ -39,7 +40,7 @@ template <class GridType>
void solve (const shared_ptr<GridType>& grid, void solve (const shared_ptr<GridType>& grid,
SolutionType& x, SolutionType& x,
int numLevels, int numLevels,
ConfigParser& parameters) const ParameterTree& parameters)
{ {
// read solver setting // read solver setting
const double innerTolerance = parameters.get<double>("innerTolerance"); const double innerTolerance = parameters.get<double>("innerTolerance");
...@@ -144,11 +145,11 @@ void solve (const shared_ptr<GridType>& grid, ...@@ -144,11 +145,11 @@ void solve (const shared_ptr<GridType>& grid,
int main (int argc, char *argv[]) try int main (int argc, char *argv[]) try
{ {
// parse data file // parse data file
ConfigParser parameterSet; ParameterTree parameterSet;
if (argc==2) if (argc==2)
parameterSet.parseFile(argv[1]); ParameterTreeParser::readINITree(argv[1], parameterSet);
else else
parameterSet.parseFile("harmonicmaps-eoc.parset"); ParameterTreeParser::readINITree("harmonicmaps-eoc.parset", parameterSet);
// read solver settings // read solver settings
const int numLevels = parameterSet.get<int>("numLevels"); const int numLevels = parameterSet.get<int>("numLevels");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment