From 50024bc246273eb9ddedc2ad9dba50f68c9ad115 Mon Sep 17 00:00:00 2001 From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de> Date: Mon, 4 Jun 2012 12:15:32 +0000 Subject: [PATCH] Richardslens test: Changed from UG or SGrid to YaspGrid. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8426 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- test/boxmodels/richards/richardslensproblem.hh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh index 5765a6292d..8ca5f62ba4 100644 --- a/test/boxmodels/richards/richardslensproblem.hh +++ b/test/boxmodels/richards/richardslensproblem.hh @@ -30,11 +30,7 @@ #ifndef DUMUX_RICHARDS_LENSPROBLEM_HH #define DUMUX_RICHARDS_LENSPROBLEM_HH -#if HAVE_UG -#include <dune/grid/io/file/dgfparser/dgfug.hh> -#endif -#include <dune/grid/io/file/dgfparser/dgfs.hh> -#include <dune/grid/io/file/dgfparser/dgfyasp.hh> +#include <dune/grid/io/file/dgfparser.hh> #include <dumux/boxmodels/richards/richardsmodel.hh> #include <dumux/material/components/simpleh2o.hh> @@ -55,13 +51,8 @@ namespace Properties { NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(BoxRichards, RichardsLensSpatialParams)); -// Set the grid type. Use UG if available, else SGrid -#if HAVE_UG -SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::UGGrid<2>); -#else -SET_PROP(RichardsLensProblem, Grid) { typedef Dune::SGrid<2, 2> type; }; -//SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>); -#endif +// Use 2d YaspGrid +SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>); // Set the physical problem to be solved SET_PROP(RichardsLensProblem, Problem) -- GitLab