Commit 2a81724d authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'cleanup/use-only-yaspgrid' into 'master'

Cleanup/use only yaspgrid

Closes #11

See merge request !61
parents 64b31b59 70b3afaa
Pipeline #754 canceled with stage
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef DUMUX_EX_BASIC_PROBLEM_2P2C_HH #ifndef DUMUX_EX_BASIC_PROBLEM_2P2C_HH
#define DUMUX_EX_BASIC_PROBLEM_2P2C_HH #define DUMUX_EX_BASIC_PROBLEM_2P2C_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/porousmediumflow/2p2c/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH #ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH
#define DUMUX_EX_BASIC_PROBLEM_2PNI_HH #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef DUMUX_EX_BASIC_PROBLEM_2P_HH #ifndef DUMUX_EX_BASIC_PROBLEM_2P_HH
#define DUMUX_EX_BASIC_PROBLEM_2P_HH #define DUMUX_EX_BASIC_PROBLEM_2P_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef DUMUX_EXERCISE_FOUR_PROBLEM_HH #ifndef DUMUX_EXERCISE_FOUR_PROBLEM_HH
#define DUMUX_EXERCISE_FOUR_PROBLEM_HH #define DUMUX_EXERCISE_FOUR_PROBLEM_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2pncmin/model.hh> #include <dumux/porousmediumflow/2pncmin/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
...@@ -62,16 +64,8 @@ template<class TypeTag> ...@@ -62,16 +64,8 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; }; struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
//! Set grid and the grid creator to be used //! Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
#elif HAVE_UG
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::UGGrid<2>; };
#else
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
//! Set the fluid system type //! Set the fluid system type
template<class TypeTag> template<class TypeTag>
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
#ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH #ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
#define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH #define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
// The grid manager
#include <dune/grid/yaspgrid.hh>
// The numerical model // The numerical model
#include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/porousmediumflow/2p2c/model.hh>
...@@ -60,16 +63,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams, ...@@ -60,16 +63,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>); GetPropType<TypeTag, Properties::Scalar>>);
// Set grid and the grid creator to be used // Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
#elif HAVE_UG
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::UGGrid<2>; };
#else
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// The fluid system property // The fluid system property
template<class TypeTag> template<class TypeTag>
...@@ -115,9 +110,6 @@ public: ...@@ -115,9 +110,6 @@ public:
: ParentType(fvGridGeometry) : ParentType(fvGridGeometry)
, eps_(3e-6) , eps_(3e-6)
{ {
#if !(HAVE_DUNE_ALUGRID || HAVE_UG)
std::cout << "If you want to use simplices instead of cubes, install and use dune-ALUGrid or UGGrid." << std::endl;
#endif // !(HAVE_DUNE_ALUGRID || HAVE_UG)
// initialize the fluid system // initialize the fluid system
FluidSystem::init(); FluidSystem::init();
......
...@@ -24,21 +24,15 @@ ...@@ -24,21 +24,15 @@
#ifndef DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH #ifndef DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH
#define DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH #define DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH
// The grid manager
#include <dune/grid/yaspgrid.hh>
// The numerical model // The numerical model
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
// The box discretization // The box discretization
#include <dumux/discretization/box.hh> #include <dumux/discretization/box.hh>
// The grid managers
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#elif HAVE_UG
#include <dune/grid/uggrid.hh>
#else
#include <dune/grid/yaspgrid.hh>
#endif
// The porous media base problem // The porous media base problem
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
...@@ -83,16 +77,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams, ...@@ -83,16 +77,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>); GetPropType<TypeTag, Properties::Scalar>>);
// Set grid to be used // Set grid to be used
#if HAVE_DUNE_ALUGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
#elif HAVE_UG
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::UGGrid<2>; };
#else
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// we use the immiscible fluid system here // we use the immiscible fluid system here
template<class TypeTag> template<class TypeTag>
...@@ -154,9 +140,6 @@ public: ...@@ -154,9 +140,6 @@ public:
: ParentType(fvGridGeometry) : ParentType(fvGridGeometry)
, eps_(3e-6) , eps_(3e-6)
{ {
#if !(HAVE_DUNE_ALUGRID || HAVE_UG)
std::cout << "If you want to use simplices instead of cubes, install and use dune-ALUGrid or UGGrid." << std::endl;
#endif // !(HAVE_DUNE_ALUGRID || HAVE_UG)
// initialize the tables for the water properties // initialize the tables for the water properties
Components::TabulatedComponent<Components::H2O<Scalar>>::init(/*tempMin=*/273.15, Components::TabulatedComponent<Components::H2O<Scalar>>::init(/*tempMin=*/273.15,
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH #ifndef DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH
#define DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH #ifndef DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
#define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH #ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH
#define DUMUX_EX_BASIC_PROBLEM_2PNI_HH #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef DUMUX_EXERCISE_FOUR_PROBLEM_HH #ifndef DUMUX_EXERCISE_FOUR_PROBLEM_HH
#define DUMUX_EXERCISE_FOUR_PROBLEM_HH #define DUMUX_EXERCISE_FOUR_PROBLEM_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2pncmin/model.hh> #include <dumux/porousmediumflow/2pncmin/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
...@@ -63,16 +65,8 @@ template<class TypeTag> ...@@ -63,16 +65,8 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; }; struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
//! Set grid and the grid creator to be used //! Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
#elif HAVE_UG
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::UGGrid<2>; };
#else
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
//! Set the fluid system type //! Set the fluid system type
template<class TypeTag> template<class TypeTag>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <dune/common/parallel/mpihelper.hh> #include <dune/common/parallel/mpihelper.hh>
#include <dune/istl/io.hh> #include <dune/istl/io.hh>
#include <dune/grid/yaspgrid.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
#ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH #ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
#define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH #define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
// The grid manager
#include <dune/grid/yaspgrid.hh>
// The numerical model // The numerical model
#include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/porousmediumflow/2p2c/model.hh>
...@@ -60,16 +63,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams, ...@@ -60,16 +63,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>); GetPropType<TypeTag, Properties::Scalar>>);
// Set grid and the grid creator to be used // Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
#elif HAVE_UG
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::UGGrid<2>; };
#else
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// The fluid system property // The fluid system property
template<class TypeTag> template<class TypeTag>
...@@ -115,10 +110,6 @@ public: ...@@ -115,10 +110,6 @@ public:
: ParentType(fvGridGeometry) : ParentType(fvGridGeometry)
, eps_(3e-6) , eps_(3e-6)
{ {
#if !(HAVE_DUNE_ALUGRID || HAVE_UG)
std::cout << "If you want to use simplices instead of cubes, install and use dune-ALUGrid or UGGrid." << std::endl;
#endif // !(HAVE_DUNE_ALUGRID || HAVE_UG)
// initialize the fluid system // initialize the fluid system
FluidSystem::init(); FluidSystem::init();
......
...@@ -24,21 +24,15 @@ ...@@ -24,21 +24,15 @@
#ifndef DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH #ifndef DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH
#define DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH #define DUMUX_EXERCISE_FLUIDSYSTEM_A_PROBLEM_HH
// The grid manager
#include <dune/grid/yaspgrid.hh>
// The numerical model // The numerical model
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
// The box discretization // The box discretization
#include <dumux/discretization/box.hh> #include <dumux/discretization/box.hh>
// The grid managers
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#elif HAVE_UG
#include <dune/grid/uggrid.hh>
#else
#include <dune/grid/yaspgrid.hh>
#endif
// The porous media base problem // The porous media base problem
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
...@@ -83,16 +77,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams, ...@@ -83,16 +77,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>); GetPropType<TypeTag, Properties::Scalar>>);
// Set grid to be used // Set grid to be used
#if HAVE_DUNE_ALUGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
#elif HAVE_UG
template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::UGGrid<2>; };
#else
template<class TypeTag> template<class TypeTag>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::YaspGrid<2>; }; struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// we use the immiscible fluid system here // we use the immiscible fluid system here
template<class TypeTag> template<class TypeTag>
...@@ -154,10 +140,6 @@ public: ...@@ -154,10 +140,6 @@ public:
: ParentType(fvGridGeometry) : ParentType(fvGridGeometry)
, eps_(3e-6) , eps_(3e-6)
{ {
#if !(HAVE_DUNE_ALUGRID || HAVE_UG)
std::cout << "If you want to use simplices instead of cubes, install and use dune-ALUGrid or UGGrid." << std::endl;
#endif // !(HAVE_DUNE_ALUGRID || HAVE_UG)
// initialize the tables for the water properties // initialize the tables for the water properties
std::cout << "Initializing the tables for the water properties" << std::endl; std::cout << "Initializing the tables for the water properties" << std::endl;
Components::TabulatedComponent<Components::H2O<Scalar>>::init(/*tempMin=*/273.15, Components::TabulatedComponent<Components::H2O<Scalar>>::init(/*tempMin=*/273.15,
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH #ifndef DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH
#define DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH #ifndef DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
#define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
......
Supports Markdown
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