Skip to content
Snippets Groups Projects
Commit 1c72dc25 authored by akbib's avatar akbib Committed by akbib@FU-BERLIN.DE
Browse files

use parametertree instead of config parser 

[[Imported from SVN: r10709]]
parent 80f41a22
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
linelast.cc
+ 7
− 3
View file @ 1c72dc25
#include <config.h> #include <config.h>
#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/io/file/amirameshwriter.hh> #include <dune/grid/io/file/amirameshwriter.hh>
...@@ -46,8 +47,11 @@ int main (int argc, char *argv[]) try ...@@ -46,8 +47,11 @@ int main (int argc, char *argv[]) try
typedef BlockVector<FieldVector<double, dim> > VectorType; typedef BlockVector<FieldVector<double, dim> > VectorType;
// parse data file // parse data file
ConfigParser parameterSet; ParameterTree parameterSet;
parameterSet.parseFile("linelast.parset"); if (argc==2)
ParameterTreeParser::readINITree(argv[1], parameterSet);
else
ParameterTreeParser::readINITree("linelast.parset", parameterSet);
// read solver settings // read solver settings
const int minLevel = parameterSet.get<int>("minLevel"); const int minLevel = parameterSet.get<int>("minLevel");
......
nonlinelast.cc
+ 7
− 3
View file @ 1c72dc25
#include <config.h> #include <config.h>
#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/io/file/amirameshwriter.hh> #include <dune/grid/io/file/amirameshwriter.hh>
...@@ -40,8 +41,11 @@ int main (int argc, char *argv[]) try ...@@ -40,8 +41,11 @@ int main (int argc, char *argv[]) try
typedef BlockVector<FieldVector<double, dim> > VectorType; typedef BlockVector<FieldVector<double, dim> > VectorType;
// parse data file // parse data file
ConfigParser parameterSet; ParameterTree parameterSet;
parameterSet.parseFile("nonlinelast.parset"); if (argc==2)
ParameterTreeParser::readINITree(argv[1], parameterSet);
else
ParameterTreeParser::readINITree("nonlinelast.parset", parameterSet);
// read solver settings // read solver settings
const int numLevels = parameterSet.get<int>("numLevels"); const int numLevels = parameterSet.get<int>("numLevels");
......
viscoelast.cc
+ 11
− 7
View file @ 1c72dc25
#include <config.h> #include <config.h>
#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/io/file/amirameshwriter.hh> #include <dune/grid/io/file/amirameshwriter.hh>
...@@ -57,8 +58,11 @@ int main (int argc, char *argv[]) try ...@@ -57,8 +58,11 @@ int main (int argc, char *argv[]) try
typedef BlockVector<FieldVector<double, dim> > VectorType; typedef BlockVector<FieldVector<double, dim> > VectorType;
// parse data file // parse data file
ConfigParser parameterSet; ParameterTree parameterSet;
parameterSet.parseFile("viscoelast.parset"); if (argc==2)
ParameterTreeParser::readINITree(argv[1], parameterSet);
else
ParameterTreeParser::readINITree("viscoelast.parset", parameterSet);
// read solver settings // read solver settings
const int minLevel = parameterSet.get<int>("minLevel"); const int minLevel = parameterSet.get<int>("minLevel");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment