Commit 6386af8b authored by Lukas Riedel's avatar Lukas Riedel

Fix grid_creator not being passed in main routine.

Also, fix header in transport.hh
parent d99c069a
......@@ -92,19 +92,19 @@ int main(int argc, char** argv)
Dune::Dorie::GridCreator<Dune::UGGrid<2>> grid_creator(inifile, helper);
switch(FEorder){
case 1:{
Sim<Simplex<2,1>> sim(richards_config, grid_mapper, helper);
Sim<Simplex<2,1>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 2:{
Sim<Simplex<2,2>> sim(richards_config, grid_mapper, helper);
Sim<Simplex<2,2>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 3:{
Sim<Simplex<2,3>> sim(richards_config, grid_mapper, helper);
Sim<Simplex<2,3>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
......@@ -118,19 +118,19 @@ int main(int argc, char** argv)
Dune::Dorie::GridCreator<Dune::UGGrid<2>> grid_creator(inifile, helper);
switch(FEorder){
case 1:{
Sim<CubeAdaptive<2,1>> sim(richards_config, grid_mapper, helper);
Sim<CubeAdaptive<2,1>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 2:{
Sim<CubeAdaptive<2,2>> sim(richards_config, grid_mapper, helper);
Sim<CubeAdaptive<2,2>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 3:{
Sim<CubeAdaptive<2,3>> sim(richards_config, grid_mapper, helper);
Sim<CubeAdaptive<2,3>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
......@@ -143,17 +143,17 @@ int main(int argc, char** argv)
Dune::Dorie::GridCreator<Dune::YaspGrid<2>> grid_creator(inifile, helper);
switch(FEorder){
case 1:{
Sim<Cube<2,1>> sim(richards_config, grid_mapper, helper);
Sim<Cube<2,1>> sim(richards_config, grid_creator, helper);
sim.run();
break;
}
case 2:{
Sim<Cube<2,2>> sim(richards_config, grid_mapper, helper);
Sim<Cube<2,2>> sim(richards_config, grid_creator, helper);
sim.run();
break;
}
case 3:{
Sim<Cube<2,3>> sim(richards_config, grid_mapper, helper);
Sim<Cube<2,3>> sim(richards_config, grid_creator, helper);
sim.run();
break;
}
......@@ -172,19 +172,19 @@ int main(int argc, char** argv)
Dune::Dorie::GridCreator<Dune::UGGrid<3>> grid_creator(inifile, helper);
switch(FEorder){
case 1:{
Sim<Simplex<3,1>> sim(richards_config, grid_mapper, helper);
Sim<Simplex<3,1>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 2:{
Sim<Simplex<3,2>> sim(richards_config, grid_mapper, helper);
Sim<Simplex<3,2>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 3:{
Sim<Simplex<3,3>> sim(richards_config, grid_mapper, helper);
Sim<Simplex<3,3>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
......@@ -198,19 +198,19 @@ int main(int argc, char** argv)
Dune::Dorie::GridCreator<Dune::UGGrid<3>> grid_creator(inifile, helper);
switch(FEorder){
case 1:{
Sim<CubeAdaptive<3,1>> sim(richards_config, grid_mapper, helper);
Sim<CubeAdaptive<3,1>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 2:{
Sim<CubeAdaptive<3,2>> sim(richards_config, grid_mapper, helper);
Sim<CubeAdaptive<3,2>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
}
case 3:{
Sim<CubeAdaptive<3,3>> sim(richards_config, grid_mapper, helper);
Sim<CubeAdaptive<3,3>> sim(richards_config, grid_creator, helper);
sim.set_policy(adapt_policy);
sim.run();
break;
......@@ -223,17 +223,17 @@ int main(int argc, char** argv)
Dune::Dorie::GridCreator<Dune::YaspGrid<3>> grid_creator(inifile, helper);
switch(FEorder){
case 1:{
Sim<Cube<3,1>> sim(richards_config, grid_mapper, helper);
Sim<Cube<3,1>> sim(richards_config, grid_creator, helper);
sim.run();
break;
}
case 2:{
Sim<Cube<3,2>> sim(richards_config, grid_mapper, helper);
Sim<Cube<3,2>> sim(richards_config, grid_creator, helper);
sim.run();
break;
}
case 3:{
Sim<Cube<3,3>> sim(richards_config, grid_mapper, helper);
Sim<Cube<3,3>> sim(richards_config, grid_creator, helper);
sim.run();
break;
}
......
......@@ -19,7 +19,7 @@
#include <dune/dorie/common/util.hh>
#include <dune/dorie/common/interpolator.hh>
#include <dune/dorie/common/time_controller.hh>
#include <dune/dorie/common/grid_mapper.hh>
#include <dune/dorie/common/grid_creator.hh>
#include <dune/dorie/common/grid_function_writer.hh>
#include <dune/dorie/common/cfl_condition.hh>
......
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