From 0d0e576f14de941c2bea9a222de2592b2c2953f2 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 11 Oct 2012 09:40:43 +0000
Subject: [PATCH] [co2ni] Remove not working UG, ALUGrid must be used. (thanks
for reporting this bug goes to tatomir, reviewed by vishal)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9274 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/boxmodels/co2/heterogeneousproblem.hh | 6 +-----
test/boxmodels/co2/test_co2.cc | 4 ++--
test/boxmodels/co2ni/heterogeneousproblemni.hh | 6 +-----
test/boxmodels/co2ni/test_co2ni.cc | 4 ++--
4 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/test/boxmodels/co2/heterogeneousproblem.hh b/test/boxmodels/co2/heterogeneousproblem.hh
index 5b9063a03e..1a64f551eb 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 33d5fad233..9d3b04f238 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 0687670161..909b8b2b09 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 e351710497..e8de18942a 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
--
GitLab