From 934ab36883c1fc559e4b2451a57a1dbc3e93cd48 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de> Date: Fri, 3 Aug 2018 15:36:18 +0200 Subject: [PATCH] [test][stokes2c] Add test without caching --- test/freeflow/navierstokesnc/CMakeLists.txt | 10 ++++++++++ test/freeflow/navierstokesnc/channeltestproblem.hh | 12 ++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/test/freeflow/navierstokesnc/CMakeLists.txt b/test/freeflow/navierstokesnc/CMakeLists.txt index 70f8bfc2c1..9dfb78288b 100644 --- a/test/freeflow/navierstokesnc/CMakeLists.txt +++ b/test/freeflow/navierstokesnc/CMakeLists.txt @@ -47,6 +47,16 @@ dune_add_test(NAME test_stokes2c_advection ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00009.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c test_stokes2c_advection.input") +dune_add_test(NAME test_stokes2c_advection_no_caching + SOURCES test_channel.cc + CMAKE_GUARD HAVE_UMFPACK + COMPILE_DEFINITIONS ENABLECACHING=0 + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-advection.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00009.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c_advection_no_caching test_stokes2c_advection.input") + add_executable(test_stokes2cni EXCLUDE_FROM_ALL test_channel.cc) target_compile_definitions(test_stokes2cni PUBLIC "NONISOTHERMAL=1") diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh index 67d91ec520..ae5e3460ac 100644 --- a/test/freeflow/navierstokesnc/channeltestproblem.hh +++ b/test/freeflow/navierstokesnc/channeltestproblem.hh @@ -24,6 +24,10 @@ #ifndef DUMUX_CHANNEL_NC_TEST_PROBLEM_HH #define DUMUX_CHANNEL_NC_TEST_PROBLEM_HH +#ifndef ENABLECACHING +#define ENABLECACHING 1 +#endif + #include <dune/grid/yaspgrid.hh> #include <dumux/material/components/simpleh2o.hh> @@ -64,10 +68,10 @@ SET_TYPE_PROP(ChannelNCTestTypeTag, Grid, Dune::YaspGrid<2>); // Set the problem property SET_TYPE_PROP(ChannelNCTestTypeTag, Problem, Dumux::ChannelNCTestProblem<TypeTag> ); -SET_BOOL_PROP(ChannelNCTestTypeTag, EnableFVGridGeometryCache, true); - -SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridFluxVariablesCache, true); -SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridVolumeVariablesCache, true); +SET_BOOL_PROP(ChannelNCTestTypeTag, EnableFVGridGeometryCache, ENABLECACHING); +SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridFluxVariablesCache, ENABLECACHING); +SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridVolumeVariablesCache, ENABLECACHING); +SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridFaceVariablesCache, ENABLECACHING); // Use mole fraction formulation #if USE_MASS -- GitLab