From ab52ae45430618a0a53d68bcaa23c1422f59fbed Mon Sep 17 00:00:00 2001 From: ackerm <sina.ackermann@iws.uni-stuttgart.de> Date: Wed, 29 May 2019 12:07:11 +0200 Subject: [PATCH] Adapt CMakeLists.txt, use ALUGRID * test passes --- examples/2pinfiltration/CMakeLists.txt | 4 ++-- examples/2pinfiltration/problem.hh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/2pinfiltration/CMakeLists.txt b/examples/2pinfiltration/CMakeLists.txt index bd36d9517a..2f716f7239 100644 --- a/examples/2pinfiltration/CMakeLists.txt +++ b/examples/2pinfiltration/CMakeLists.txt @@ -9,5 +9,5 @@ dune_add_test(NAME test_2p_pointsource_adaptive COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_pointsource_adaptive_tpfa-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_2p_pointsource_adaptive_tpfa-00001.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_pointsource_adaptive_tpfa params.input -Problem.Name test_2p_pointsource_adaptive_tpfa") + ${CMAKE_CURRENT_BINARY_DIR}/test_2p_pointsource_adaptive-00001.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_pointsource_adaptive params.input -Problem.Name test_2p_pointsource_adaptive") diff --git a/examples/2pinfiltration/problem.hh b/examples/2pinfiltration/problem.hh index 96a3ef7c74..be80d9bbd0 100644 --- a/examples/2pinfiltration/problem.hh +++ b/examples/2pinfiltration/problem.hh @@ -54,13 +54,13 @@ namespace Dumux { } // end namespace TTag //! Use non-conforming refinement - // #if HAVE_DUNE_ALUGRID TODO - // template<class TypeTag> - // struct Grid<TypeTag, TTag::TwoPAdaptivePointSource> { using type = Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>; }; - // #else + #if HAVE_DUNE_ALUGRID + template<class TypeTag> + struct Grid<TypeTag, TTag::TwoPAdaptivePointSource> { using type = Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>; }; + #else template<class TypeTag> struct Grid<TypeTag, TTag::TwoPAdaptivePointSource> { using type = Dune::YaspGrid<2>; }; - // #endif + #endif template<class TypeTag> struct Problem<TypeTag, TTag::TwoPAdaptivePointSource> { using type = PointSourceTestProblem<TypeTag>; }; -- GitLab