From 2f93b06fc3fcaf9fefd3159ba4e5d9c71106784c Mon Sep 17 00:00:00 2001 From: Alexander Kissinger <alexander.kissinger@iws.uni-stuttgart.de> Date: Tue, 25 Aug 2015 13:54:28 +0000 Subject: [PATCH] - Included HAVE_UG macro in fuelcellproblem.hh when declaring GridManager. - Removed UG as grid manager for dissolutionproblem.hh, it uses YaspGrid instead now. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15359 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- test/implicit/2pnc/fuelcellproblem.hh | 4 ++-- test/implicit/2pncmin/dissolutionproblem.hh | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/implicit/2pnc/fuelcellproblem.hh b/test/implicit/2pnc/fuelcellproblem.hh index 47127cd1f3..5f5b30e007 100644 --- a/test/implicit/2pnc/fuelcellproblem.hh +++ b/test/implicit/2pnc/fuelcellproblem.hh @@ -24,8 +24,6 @@ #ifndef DUMUX_FUELCELL_PROBLEM_HH #define DUMUX_FUELCELL_PROBLEM_HH -#include <dune/grid/uggrid.hh> - #include <dumux/io/cubegridcreator.hh> #include <dumux/implicit/2pnc/2pncmodel.hh> #include <dumux/implicit/common/implicitporousmediaproblem.hh> @@ -48,7 +46,9 @@ NEW_TYPE_TAG(FuelCellBoxProblem, INHERITS_FROM(BoxModel, FuelCellProblem)); NEW_TYPE_TAG(FuelCellCCProblem, INHERITS_FROM(CCModel, FuelCellProblem)); // Set the grid type +#if HAVE_UG SET_TYPE_PROP(FuelCellProblem, Grid, Dune::UGGrid<2>); +#endif // Set the grid creator SET_TYPE_PROP(FuelCellProblem, GridCreator, Dumux::CubeGridCreator<TypeTag>); // Set the problem property diff --git a/test/implicit/2pncmin/dissolutionproblem.hh b/test/implicit/2pncmin/dissolutionproblem.hh index de9337f847..5394006e9d 100644 --- a/test/implicit/2pncmin/dissolutionproblem.hh +++ b/test/implicit/2pncmin/dissolutionproblem.hh @@ -24,8 +24,6 @@ #ifndef DUMUX_DISSOLUTION_PROBLEM_HH #define DUMUX_DISSOLUTION_PROBLEM_HH -#include <dune/grid/io/file/dgfparser/dgfyasp.hh> - #include <dumux/implicit/2pncmin/2pncminmodel.hh> #include <dumux/implicit/common/implicitporousmediaproblem.hh> #include<dumux/material/fluidsystems/brineairfluidsystem.hh> @@ -45,7 +43,7 @@ NEW_TYPE_TAG(DissolutionBoxProblem, INHERITS_FROM(BoxModel, DissolutionProblem)) NEW_TYPE_TAG(DissolutionCCProblem, INHERITS_FROM(CCModel, DissolutionProblem)); // Set the grid type -SET_TYPE_PROP(DissolutionProblem, Grid, Dune::UGGrid<2>); +SET_TYPE_PROP(DissolutionProblem, Grid, Dune::YaspGrid<2>); // Set the problem property SET_TYPE_PROP(DissolutionProblem, Problem, Dumux::DissolutionProblem<TypeTag>); -- GitLab