Commit a6a27b1e authored by Timo Koch's avatar Timo Koch
Browse files

[grid] Remove UGGrid from lecture

parent 6a409898
......@@ -45,11 +45,7 @@ namespace Properties
NEW_TYPE_TAG(LensOnePTwoCProblem, INHERITS_FROM(BoxOnePTwoC));
// Set the grid type
#if HAVE_UG
SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
SET_TYPE_PROP(LensOnePTwoCProblem, Problem, Dumux::LensOnePTwoCProblem<TypeTag>);
......
......@@ -45,11 +45,7 @@ namespace Properties
NEW_TYPE_TAG(LensTwoPTwoCProblem, INHERITS_FROM(BoxTwoPTwoC, Lens2pSpatialParams));
// Set the grid type
#if HAVE_UG
SET_TYPE_PROP(LensTwoPTwoCProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensTwoPTwoCProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
SET_TYPE_PROP(LensTwoPTwoCProblem, Problem, Dumux::LensTwoPTwoCProblem<TypeTag>);
......
......@@ -49,11 +49,7 @@ namespace Properties
NEW_TYPE_TAG(LensTwoPProblem, INHERITS_FROM(BoxTwoP, Lens2pSpatialParams));
// Set the grid type
#if HAVE_UG
SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem<TypeTag>);
......
......@@ -45,11 +45,7 @@ namespace Properties
NEW_TYPE_TAG(LensOnePTwoCProblem, INHERITS_FROM(BoxOnePTwoC));
// Set the grid type
#if HAVE_UG
SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
SET_TYPE_PROP(LensOnePTwoCProblem, Problem, Dumux::LensOnePTwoCProblem<TypeTag>);
......
......@@ -47,11 +47,7 @@ namespace Properties
NEW_TYPE_TAG(LensTwoPProblem, INHERITS_FROM(BoxTwoP, Lens2pSpatialParams));
// Set the grid type
#if HAVE_UG
SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem<TypeTag>);
......
......@@ -48,11 +48,7 @@ namespace Properties
NEW_TYPE_TAG(LensTwoPProblem, INHERITS_FROM(BoxTwoP, Lens2pSpatialParams));
// Set the grid type
#if HAVE_UG
SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem<TypeTag>);
......
......@@ -41,21 +41,10 @@ namespace Properties
NEW_TYPE_TAG(Henry1p2cProblem, INHERITS_FROM(BoxOnePTwoC));
// Set the grid type
SET_PROP(Henry1p2cProblem, Grid)
{
#if HAVE_UG
typedef Dune::UGGrid<2> type;
#else
typedef Dune::YaspGrid<2> type;
#endif
};
SET_TYPE_PROP(Henry1p2cProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_PROP(Henry1p2cProblem, Problem)
{
typedef Dumux::Henry1p2cProblem<TTAG(Henry1p2cProblem)> type;
};
SET_TYPE_PROP(Henry1p2cProblem, Problem, Dumux::Henry1p2cProblem<TypeTag>);
SET_TYPE_PROP(Henry1p2cProblem, FluidSystem, WaterSaltFluidSystem<TypeTag>);
......
......@@ -50,11 +50,7 @@ namespace Properties
NEW_TYPE_TAG(Henry2pProblem, INHERITS_FROM(BoxTwoP, Henry2pSpatialParams));
// Set the grid type
#if HAVE_UG
SET_TYPE_PROP(Henry2pProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(Henry2pProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
SET_TYPE_PROP(Henry2pProblem, Problem, Dumux::Henry2pProblem<TypeTag>);
......
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