Commit 5515d70d authored by Santiago Ospina's avatar Santiago Ospina

Updated headers and ini setup in tests

Signed-off-by: Santiago Ospina De Los Ríos's avatarSantiago Ospina <santiago.ospina@iup.uni-heidelberg.de>
parent 57d93d2b
......@@ -5,6 +5,7 @@
#include <array>
#include <vector>
#include <iostream>
#include <iomanip>
#include <type_traits>
#include <dune/common/timer.hh>
......
......@@ -16,9 +16,9 @@
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/uggrid.hh>
#include "common/grid_creator.hh"
#include "common/setup_inifile.hh"
#include "model/richards/richards.hh"
#include <dune/dorie/common/grid_creator.hh>
#include <dune/dorie/common/setup_inifile.hh>
#include <dune/dorie/model/richards/richards.hh>
//===============================================================
......@@ -100,7 +100,7 @@ int main(int argc, char** argv)
sleep(5);
}
// extract richards configuration
// setup richards configuration
Dune::ParameterTree richards_config = Dune::Dorie::Setup::prep_ini_for_richards(inifile);
// Read necessary variables
......
......@@ -31,10 +31,6 @@
#include <dune/dorie/model/richards/flow_source.hh>
#include <dune/dorie/model/richards/local_operator.hh>
#ifndef DUNE_DORIE_RICHARDS_IMPL_HH
#include <dune/dorie/model/richards/richards.cc>
#endif
namespace Dune{
namespace Dorie{
......
......@@ -14,8 +14,10 @@
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/uggrid.hh>
#include <dune/dorie/common/setup_inifile.hh>
#include <dune/dorie/common/grid_creator.hh>
#include <dune/dorie/test/test-parameterization.hh>
#include <dune/dorie/solver/util_grid_creator.hh>
namespace Dune{
namespace Dorie{
......@@ -52,11 +54,8 @@ int main (int argc, char** argv)
Dune::ParameterTreeParser ptreeparser;
ptreeparser.readINITree(inifilename,inifile);
Dune::Dorie::Setup::inifile(inifile);
// extract richards configuration
Dune::ParameterTree richards_config = inifile.sub("richards");
// setup richards configuration
Dune::ParameterTree richards_config = Dune::Dorie::Setup::prep_ini_for_richards(inifile);
// run test
// double result {0.0};
......
......@@ -5,9 +5,8 @@
#include <dune/common/timer.hh>
#include "../interface/richards_simulation.cc"
#include "../solver/param_interface.hh"
#include <dune/dorie/model/richards/richards.cc>
#include <dune/dorie/model/richards/parametrization/interface.hh>
namespace Dune {
namespace Dorie {
......
......@@ -4,11 +4,11 @@
#include <cassert>
#include <dune/dorie/interface/simulation_base.hh>
#include <dune/common/parallel/mpihelper.hh>
#include <dune/common/float_cmp.hh>
#include <dune/dorie/common/simulation_base.hh>
/// Dummy model for testing.
/** Makes sure that all functions of SimulationBase are properly overridden
* and called.
......
......@@ -16,7 +16,8 @@
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/uggrid.hh>
#include <dune/dorie/solver/util_grid_creator.hh>
#include <dune/dorie/common/grid_creator.hh>
#include <dune/dorie/common/setup_inifile.hh>
template<int dim, int order>
using Simplex = Dune::Dorie::RichardsSimulationTraits<Dune::Dorie::BaseTraits<Dune::UGGrid<dim>,
......@@ -46,9 +47,8 @@ int main (int argc, char** argv)
Dune::ParameterTreeParser ptreeparser;
ptreeparser.readINITree(inifilename,inifile);
Dune::Dorie::Setup::inifile(inifile);
// extract richards configuration
Dune::ParameterTree richards_config = inifile.sub("richards");
// setup richards configuration
Dune::ParameterTree richards_config = Dune::Dorie::Setup::prep_ini_for_richards(inifile);
const double limit = inifile.get<double>("limit");
......
......@@ -24,11 +24,10 @@
#include <dune/pdelab/localoperator/defaultimp.hh>
#include <dune/pdelab/finiteelement/localbasiscache.hh>
#include <dune/dorie/interface/richards_simulation.cc>
#include <dune/dorie/solver/util_typedefs.hh>
#include <dune/dorie/solver/util_grid_creator.hh>
#include <dune/dorie/solver/richards_boundary.hh>
#include <dune/dorie/interface/util.hh>
#include <dune/dorie/common/typedefs.hh>
#include <dune/dorie/common/util.hh>
#include <dune/dorie/model/richards/flow_boundary.hh>
#include <dune/dorie/model/richards/richards.cc>
namespace Dune {
namespace Dorie {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment