Commit efff7df1 authored by Timo Koch's avatar Timo Koch
Browse files

[test] Make dim<dimworld tests use dune-foamgrid instead of alberta

parent a863d74f
...@@ -82,17 +82,17 @@ NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem)); ...@@ -82,17 +82,17 @@ NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem));
SET_TYPE_PROP(OnePTestBoxProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> ); SET_TYPE_PROP(OnePTestBoxProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> );
SET_TYPE_PROP(OnePTestCCProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> ); SET_TYPE_PROP(OnePTestCCProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> );
// if AlbertaGrid is available, test for dim < dimWorld // if FoamGrid is available, test for dim < dimWorld
#if HAVE_ALBERTA #if HAVE_DUNE_FOAMGRID
NEW_TYPE_TAG(OnePOneDThreeDTestProblem, INHERITS_FROM(OnePTestProblem)); NEW_TYPE_TAG(OnePOneDThreeDTestProblem, INHERITS_FROM(OnePTestProblem));
NEW_TYPE_TAG(OnePOneDThreeDTestBoxProblem, INHERITS_FROM(BoxModel, OnePOneDThreeDTestProblem)); NEW_TYPE_TAG(OnePOneDThreeDTestBoxProblem, INHERITS_FROM(BoxModel, OnePOneDThreeDTestProblem));
NEW_TYPE_TAG(OnePOneDThreeDTestCCProblem, INHERITS_FROM(CCModel, 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(OnePTwoDThreeDTestProblem, INHERITS_FROM(OnePTestProblem));
NEW_TYPE_TAG(OnePTwoDThreeDTestBoxProblem, INHERITS_FROM(BoxModel, OnePTwoDThreeDTestProblem)); NEW_TYPE_TAG(OnePTwoDThreeDTestBoxProblem, INHERITS_FROM(BoxModel, OnePTwoDThreeDTestProblem));
NEW_TYPE_TAG(OnePTwoDThreeDTestCCProblem, INHERITS_FROM(CCModel, 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 #endif
// Enable gravity // Enable gravity
......
...@@ -63,14 +63,13 @@ add_dumux_test(test_cc1pniconvection test_cc1pniconvection test_cc1pniconvection ...@@ -63,14 +63,13 @@ add_dumux_test(test_cc1pniconvection test_cc1pniconvection test_cc1pniconvection
${CMAKE_CURRENT_BINARY_DIR}/cc1pniconvection-00011.vtu ${CMAKE_CURRENT_BINARY_DIR}/cc1pniconvection-00011.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pniconvection") --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 add_dumux_test(test_box1p1d3d test_box1p1d3d test_box1p1d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py python ${CMAKE_SOURCE_DIR}/bin/runtest.py
--script fuzzy --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox1d3d-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox1d3d-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/1ptestbox1d3d-00002.vtp ${CMAKE_CURRENT_BINARY_DIR}/1ptestbox1d3d-00002.vtp
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p1d3d") --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 add_dumux_test(test_box1p2d3d test_box1p2d3d test_box1p2d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py python ${CMAKE_SOURCE_DIR}/bin/runtest.py
...@@ -78,7 +77,6 @@ add_dumux_test(test_box1p2d3d test_box1p2d3d test_box1p2d3d.cc ...@@ -78,7 +77,6 @@ add_dumux_test(test_box1p2d3d test_box1p2d3d test_box1p2d3d.cc
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox2d3d-reference.vtu --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox2d3d-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestbox2d3d-00002.vtu ${CMAKE_CURRENT_BINARY_DIR}/1ptestbox2d3d-00002.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p2d3d") --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 add_dumux_test(test_cc1p1d3d test_cc1p1d3d test_cc1p1d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py python ${CMAKE_SOURCE_DIR}/bin/runtest.py
...@@ -86,7 +84,6 @@ add_dumux_test(test_cc1p1d3d test_cc1p1d3d test_cc1p1d3d.cc ...@@ -86,7 +84,6 @@ add_dumux_test(test_cc1p1d3d test_cc1p1d3d test_cc1p1d3d.cc
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc1d3d-reference.vtp --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc1d3d-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/1ptestcc1d3d-00002.vtp ${CMAKE_CURRENT_BINARY_DIR}/1ptestcc1d3d-00002.vtp
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p1d3d") --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 add_dumux_test(test_cc1p2d3d test_cc1p2d3d test_cc1p2d3d.cc
python ${CMAKE_SOURCE_DIR}/bin/runtest.py python ${CMAKE_SOURCE_DIR}/bin/runtest.py
...@@ -94,7 +91,6 @@ add_dumux_test(test_cc1p2d3d test_cc1p2d3d test_cc1p2d3d.cc ...@@ -94,7 +91,6 @@ add_dumux_test(test_cc1p2d3d test_cc1p2d3d test_cc1p2d3d.cc
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc2d3d-reference.vtu --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc2d3d-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestcc2d3d-00002.vtu ${CMAKE_CURRENT_BINARY_DIR}/1ptestcc2d3d-00002.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p2d3d") --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p2d3d")
add_dune_alberta_flags(test_cc1p2d3d GRIDDIM 2 WORLDDIM 3)
#install sources #install sources
......
...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg) ...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
#if HAVE_ALBERTA #if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePOneDThreeDTestBoxProblem) ProblemTypeTag; typedef TTAG(OnePOneDThreeDTestBoxProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage); return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else #else
#warning External grid Alberta needed to run this example. #warning External grid module dune-foamgrid needed to run this example.
std::cerr << "Test skipped, it needs Alberta!" << std::endl; std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77; return 77;
#endif #endif
} }
...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg) ...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
#if HAVE_ALBERTA #if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePTwoDThreeDTestBoxProblem) ProblemTypeTag; typedef TTAG(OnePTwoDThreeDTestBoxProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage); return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else #else
#warning External grid Alberta needed to run this example. #warning External grid module dune-foamgrid needed to run this example.
std::cerr << "Test skipped, it needs Alberta!" << std::endl; std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77; return 77;
#endif #endif
} }
...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg) ...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
#if HAVE_ALBERTA #if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePOneDThreeDTestCCProblem) ProblemTypeTag; typedef TTAG(OnePOneDThreeDTestCCProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage); return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else #else
#warning External grid Alberta needed to run this example. #warning External grid module dune-foamgrid needed to run this example.
std::cerr << "Test skipped, it needs Alberta!" << std::endl; std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77; return 77;
#endif #endif
} }
...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg) ...@@ -59,12 +59,12 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
#if HAVE_ALBERTA #if HAVE_DUNE_FOAMGRID
typedef TTAG(OnePTwoDThreeDTestCCProblem) ProblemTypeTag; typedef TTAG(OnePTwoDThreeDTestCCProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage); return Dumux::start<ProblemTypeTag>(argc, argv, usage);
#else #else
#warning External grid Alberta needed to run this example. #warning External grid module dune-foamgrid needed to run this example.
std::cerr << "Test skipped, it needs Alberta!" << std::endl; std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
return 77; return 77;
#endif #endif
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment