From efff7df19371faf43ca0803cf1bae95f83039f8a Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Tue, 2 Feb 2016 10:05:46 +0100
Subject: [PATCH] [test] Make dim<dimworld tests use dune-foamgrid instead of
alberta
---
test/porousmediumflow/1p/implicit/1ptestproblem.hh | 8 ++++----
test/porousmediumflow/1p/implicit/CMakeLists.txt | 6 +-----
test/porousmediumflow/1p/implicit/test_box1p1d3d.cc | 6 +++---
test/porousmediumflow/1p/implicit/test_box1p2d3d.cc | 6 +++---
test/porousmediumflow/1p/implicit/test_cc1p1d3d.cc | 6 +++---
test/porousmediumflow/1p/implicit/test_cc1p2d3d.cc | 6 +++---
6 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/test/porousmediumflow/1p/implicit/1ptestproblem.hh b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
index 18ceeeb454..0c6d2e0760 100644
--- a/test/porousmediumflow/1p/implicit/1ptestproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
@@ -82,17 +82,17 @@ NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem));
SET_TYPE_PROP(OnePTestBoxProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> );
SET_TYPE_PROP(OnePTestCCProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> );
-// if AlbertaGrid is available, test for dim < dimWorld
-#if HAVE_ALBERTA
+// if FoamGrid is available, test for dim < dimWorld
+#if HAVE_DUNE_FOAMGRID
NEW_TYPE_TAG(OnePOneDThreeDTestProblem, INHERITS_FROM(OnePTestProblem));
NEW_TYPE_TAG(OnePOneDThreeDTestBoxProblem, INHERITS_FROM(BoxModel, OnePOneDThreeDTestProblem));
NEW_TYPE_TAG(OnePOneDThreeDTestCCProblem, INHERITS_FROM(CCModel, OnePOneDThreeDTestProblem));
-SET_TYPE_PROP(OnePOneDThreeDTestProblem, Grid, Dune::AlbertaGrid<1, 3>);
+SET_TYPE_PROP(OnePOneDThreeDTestProblem, Grid, Dune::FoamGrid<1, 3>);
NEW_TYPE_TAG(OnePTwoDThreeDTestProblem, INHERITS_FROM(OnePTestProblem));
NEW_TYPE_TAG(OnePTwoDThreeDTestBoxProblem, INHERITS_FROM(BoxModel, OnePTwoDThreeDTestProblem));
NEW_TYPE_TAG(OnePTwoDThreeDTestCCProblem, INHERITS_FROM(CCModel, OnePTwoDThreeDTestProblem));
-SET_TYPE_PROP(OnePTwoDThreeDTestProblem, Grid, Dune::AlbertaGrid<2, 3>);
+SET_TYPE_PROP(OnePTwoDThreeDTestProblem, Grid, Dune::FoamGrid<2, 3>);
#endif
// Enable gravity
diff --git a/test/porousmediumflow/1p/implicit/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt
index 2648932a4a..ae6d385d03 100644
--- a/test/porousmediumflow/1p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/CMakeLists.txt
@@ -63,14 +63,13 @@ add_dumux_test(test_cc1pniconvection test_cc1pniconvection test_cc1pniconvection
${CMAKE_CURRENT_BINARY_DIR}/cc1pniconvection-00011.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pniconvection")
-# dim < dimWorld tests
+# dim < dimWorld tests with foamgrid
add_dumux_test(test_box1p1d3d test_box1p1d3d test_box1p1d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox1d3d-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/1ptestbox1d3d-00002.vtp
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p1d3d")
-add_dune_alberta_flags(test_box1p1d3d GRIDDIM 1 WORLDDIM 3)
add_dumux_test(test_box1p2d3d test_box1p2d3d test_box1p2d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py
@@ -78,7 +77,6 @@ add_dumux_test(test_box1p2d3d test_box1p2d3d test_box1p2d3d.cc
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox2d3d-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestbox2d3d-00002.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p2d3d")
-add_dune_alberta_flags(test_box1p2d3d GRIDDIM 2 WORLDDIM 3)
add_dumux_test(test_cc1p1d3d test_cc1p1d3d test_cc1p1d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py
@@ -86,7 +84,6 @@ add_dumux_test(test_cc1p1d3d test_cc1p1d3d test_cc1p1d3d.cc
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc1d3d-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/1ptestcc1d3d-00002.vtp
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p1d3d")
-add_dune_alberta_flags(test_cc1p1d3d GRIDDIM 1 WORLDDIM 3)
add_dumux_test(test_cc1p2d3d test_cc1p2d3d test_cc1p2d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py
@@ -94,7 +91,6 @@ add_dumux_test(test_cc1p2d3d test_cc1p2d3d test_cc1p2d3d.cc
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc2d3d-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestcc2d3d-00002.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p2d3d")
-add_dune_alberta_flags(test_cc1p2d3d GRIDDIM 2 WORLDDIM 3)
#install sources
diff --git a/test/porousmediumflow/1p/implicit/test_box1p1d3d.cc b/test/porousmediumflow/1p/implicit/test_box1p1d3d.cc
index ead71ba7cf..0da90bc7d5 100644
--- a/test/porousmediumflow/1p/implicit/test_box1p1d3d.cc
+++ b/test/porousmediumflow/1p/implicit/test_box1p1d3d.cc
@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
-#if HAVE_ALBERTA
+#if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePOneDThreeDTestBoxProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else
-#warning External grid Alberta needed to run this example.
- std::cerr << "Test skipped, it needs Alberta!" << std::endl;
+#warning External grid module dune-foamgrid needed to run this example.
+ std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77;
#endif
}
diff --git a/test/porousmediumflow/1p/implicit/test_box1p2d3d.cc b/test/porousmediumflow/1p/implicit/test_box1p2d3d.cc
index 2b3c60193a..ad262e065c 100644
--- a/test/porousmediumflow/1p/implicit/test_box1p2d3d.cc
+++ b/test/porousmediumflow/1p/implicit/test_box1p2d3d.cc
@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
-#if HAVE_ALBERTA
+#if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePTwoDThreeDTestBoxProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else
-#warning External grid Alberta needed to run this example.
- std::cerr << "Test skipped, it needs Alberta!" << std::endl;
+#warning External grid module dune-foamgrid needed to run this example.
+ std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77;
#endif
}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1p1d3d.cc b/test/porousmediumflow/1p/implicit/test_cc1p1d3d.cc
index 322d0ed5e3..0ed1566786 100644
--- a/test/porousmediumflow/1p/implicit/test_cc1p1d3d.cc
+++ b/test/porousmediumflow/1p/implicit/test_cc1p1d3d.cc
@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
-#if HAVE_ALBERTA
+#if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePOneDThreeDTestCCProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else
-#warning External grid Alberta needed to run this example.
- std::cerr << "Test skipped, it needs Alberta!" << std::endl;
+#warning External grid module dune-foamgrid needed to run this example.
+ std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77;
#endif
}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1p2d3d.cc b/test/porousmediumflow/1p/implicit/test_cc1p2d3d.cc
index a33ad5ffbe..2a7d1e6e5a 100644
--- a/test/porousmediumflow/1p/implicit/test_cc1p2d3d.cc
+++ b/test/porousmediumflow/1p/implicit/test_cc1p2d3d.cc
@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
-#if HAVE_ALBERTA
+#if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePTwoDThreeDTestCCProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else
-#warning External grid Alberta needed to run this example.
- std::cerr << "Test skipped, it needs Alberta!" << std::endl;
+#warning External grid module dune-foamgrid needed to run this example.
+ std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77;
#endif
}
--
GitLab