Commit 0d7749c5 authored by Sina Ackermann's avatar Sina Ackermann Committed by Timo Koch

[exercise-fluidsystem] Use only yaspgrid

parent 64b31b59
......@@ -60,16 +60,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>);
// 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>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// The fluid system property
template<class TypeTag>
......@@ -115,9 +107,6 @@ public:
: ParentType(fvGridGeometry)
, 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
FluidSystem::init();
......
......@@ -30,14 +30,8 @@
// The box discretization
#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
// The grid manager
#include <dune/grid/yaspgrid.hh>
#endif
// The porous media base problem
#include <dumux/porousmediumflow/problem.hh>
......@@ -83,16 +77,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>);
// 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>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// we use the immiscible fluid system here
template<class TypeTag>
......@@ -154,9 +140,6 @@ public:
: ParentType(fvGridGeometry)
, 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
Components::TabulatedComponent<Components::H2O<Scalar>>::init(/*tempMin=*/273.15,
......
......@@ -60,16 +60,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoPTwoC, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>);
// 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>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoPTwoC> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// The fluid system property
template<class TypeTag>
......@@ -115,10 +107,6 @@ public:
: ParentType(fvGridGeometry)
, 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
FluidSystem::init();
......
......@@ -30,14 +30,8 @@
// The box discretization
#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
// The grid manager
#include <dune/grid/yaspgrid.hh>
#endif
// The porous media base problem
#include <dumux/porousmediumflow/problem.hh>
......@@ -83,16 +77,8 @@ SET_TYPE_PROP(ExerciseFluidsystemTwoP, SpatialParams,
GetPropType<TypeTag, Properties::Scalar>>);
// 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>
struct Grid<TypeTag, TTag::ExerciseFluidsystemTwoP> { using type = Dune::YaspGrid<2>; };
#endif // HAVE_DUNE_ALUGRID
// we use the immiscible fluid system here
template<class TypeTag>
......@@ -154,10 +140,6 @@ public:
: ParentType(fvGridGeometry)
, 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
std::cout << "Initializing the tables for the water properties" << std::endl;
Components::TabulatedComponent<Components::H2O<Scalar>>::init(/*tempMin=*/273.15,
......
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