diff --git a/test/boxmodels/co2/heterogeneousproblem.hh b/test/boxmodels/co2/heterogeneousproblem.hh index 5b9063a03e6308db461efd9b2506ef47bbff30d1..1a64f551eb6d5a051327f3e80a5f82c2db64d30c 100644 --- a/test/boxmodels/co2/heterogeneousproblem.hh +++ b/test/boxmodels/co2/heterogeneousproblem.hh @@ -27,10 +27,8 @@ #if HAVE_ALUGRID #include <dune/grid/alugrid/2d/alugrid.hh> -#elif HAVE_UG -#include <dune/grid/io/file/dgfparser/dgfug.hh> #else -#warning UG or ALUGrid necessary for this test. +#warning ALUGrid is necessary for this test. #endif #include <dune/grid/io/file/dgfparser/dgfs.hh> @@ -68,8 +66,6 @@ NEW_TYPE_TAG(HeterogeneousProblem, INHERITS_FROM(BoxTwoPTwoC, HeterogeneousSpati // Set the grid type #if HAVE_ALUGRID SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>); -#elif HAVE_UG -SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::UGGrid<2>); #else SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::YaspGrid<2>); #endif diff --git a/test/boxmodels/co2/test_co2.cc b/test/boxmodels/co2/test_co2.cc index 33d5fad2332e11fb6162e3056cbeb502cf67e71a..9d3b04f2381db43146fd73dcb4506af15f658769 100644 --- a/test/boxmodels/co2/test_co2.cc +++ b/test/boxmodels/co2/test_co2.cc @@ -66,11 +66,11 @@ void usage(const char *progName, const std::string &errorMsg) int main(int argc, char** argv) { -#if HAVE_ALUGRID || HAVE_UG +#if HAVE_ALUGRID typedef TTAG(HeterogeneousProblem) ProblemTypeTag; return Dumux::start<ProblemTypeTag>(argc, argv, usage); #else - std::cout << "Test skipped, it needs ALUGrid or UG." << std::endl; + std::cout << "Test skipped, it needs ALUGrid." << std::endl; return 77; #endif diff --git a/test/boxmodels/co2ni/heterogeneousproblemni.hh b/test/boxmodels/co2ni/heterogeneousproblemni.hh index 0687670161284832bd85d42f173e2ff38daa8b45..909b8b2b09245c2360e0ef055f86784b5a025282 100644 --- a/test/boxmodels/co2ni/heterogeneousproblemni.hh +++ b/test/boxmodels/co2ni/heterogeneousproblemni.hh @@ -26,10 +26,8 @@ #if HAVE_ALUGRID #include <dune/grid/alugrid/2d/alugrid.hh> -#elif HAVE_UG -#include <dune/grid/io/file/dgfparser/dgfug.hh> #else -#warning UG or ALUGrid necessary for this test. +#warning ALUGrid is necessary for this test. #endif #include <dune/grid/io/file/dgfparser/dgfs.hh> @@ -59,8 +57,6 @@ NEW_TYPE_TAG(HeterogeneousProblem, INHERITS_FROM(BoxTwoPTwoCNI, HeterogeneousSpa // Set the grid type #if HAVE_ALUGRID SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>); -#elif HAVE_UG -SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::UGGrid<2>); #else SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::YaspGrid<2>); #endif diff --git a/test/boxmodels/co2ni/test_co2ni.cc b/test/boxmodels/co2ni/test_co2ni.cc index e35171049724f1fc3d41ca6a4a2c6ce6b76d3aea..e8de18942a939338ca9171bd1e75d4f42aee6f84 100644 --- a/test/boxmodels/co2ni/test_co2ni.cc +++ b/test/boxmodels/co2ni/test_co2ni.cc @@ -65,11 +65,11 @@ void usage(const char *progName, const std::string &errorMsg) int main(int argc, char** argv) { -#if HAVE_ALUGRID || HAVE_UG +#if HAVE_ALUGRID typedef TTAG(HeterogeneousProblem) ProblemTypeTag; return Dumux::start<ProblemTypeTag>(argc, argv, usage); #else - std::cout << "Test skipped, it needs ALUGrid or UG." << std::endl; + std::cout << "Test skipped, it needs ALUGrid." << std::endl; return 77; #endif