From 12cbaef5c188608492de9609b38c50fe61ee4b4f Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 23 Jul 2018 11:45:58 +0200
Subject: [PATCH] [io][vtk] fix condition in enable_if_t, adapt to changed
output names
---
dumux/io/loadsolution.hh | 4 ++--
dumux/porousmediumflow/2p/model.hh | 4 ++--
dumux/porousmediumflow/2p2c/model.hh | 8 ++++----
.../2p/implicit/incompressible/CMakeLists.txt | 11 ++++++-----
.../porousmediumflow/2p2c/implicit/test_2p2c_fv.input | 6 +++---
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh
index aa2cdd60c0..1043b8ce4a 100644
--- a/dumux/io/loadsolution.hh
+++ b/dumux/io/loadsolution.hh
@@ -138,10 +138,10 @@ auto loadSolutionFromVtkFile(const std::string fileName,
* \brief helper function to read from two files into a staggered solution vector
*/
template <class SolutionVector, class PvNamesFunc>
-auto loadStaggeredSolutionFromVtkFiles(const std::string fileName,
+auto loadStaggeredSolutionFromVtkFiles(const std::string baseFileName,
PvNamesFunc&& pvNamesFunc,
SolutionVector& sol)
--> typename std::enable_if_t<decltype(!isMultiTypeBlockVector<SolutionVector>())::value, void>
+-> typename std::enable_if_t<!decltype(isMultiTypeBlockVector<SolutionVector>())::value, void>
{}
/*!
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index 6f0d7a893d..8538caca45 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -102,9 +102,9 @@ struct TwoPModelTraits
static std::string primaryVariableName(int pvIdx, int state = 0)
{
if (priVarFormulation() == TwoPFormulation::p0s1)
- return pvIdx == 0 ? "pw" : "Sn";
+ return pvIdx == 0 ? "p_w" : "S_n";
else
- return pvIdx == 0 ? "pn" : "Sw";
+ return pvIdx == 0 ? "p_n" : "S_w";
}
};
diff --git a/dumux/porousmediumflow/2p2c/model.hh b/dumux/porousmediumflow/2p2c/model.hh
index 2ec91b72e7..91e8149308 100644
--- a/dumux/porousmediumflow/2p2c/model.hh
+++ b/dumux/porousmediumflow/2p2c/model.hh
@@ -108,12 +108,12 @@ struct TwoPTwoCModelTraits : public TwoPNCModelTraits</*numComps=*/2, useMol, /*
{
static const std::string xString = useMol ? "x" : "X";
static const std::array<std::string, 3> p0s1SwitchedPvNames = {{
- xString + "_" + FluidSystem::phaseName(0) + "^" + FluidSystem::componentName(1),
- xString + "_" + FluidSystem::phaseName(1) + "^" + FluidSystem::componentName(0),
+ xString + "^" + FluidSystem::componentName(1) + "_" + FluidSystem::phaseName(0),
+ xString + "^" + FluidSystem::componentName(0) + "_" + FluidSystem::phaseName(1),
"S_n"}};
static const std::array<std::string, 3> p1s0SwitchedPvNames = {{
- xString + "_" + FluidSystem::phaseName(0) + "^" + FluidSystem::componentName(1),
- xString + "_" + FluidSystem::phaseName(1) + "^" + FluidSystem::componentName(0),
+ xString + "^" + FluidSystem::componentName(1) + "_" + FluidSystem::phaseName(0),
+ xString + "^" + FluidSystem::componentName(0) + "_" + FluidSystem::phaseName(1),
"S_w"}};
switch (formulation)
diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
index b87adb52cc..f1398583cd 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
@@ -1,9 +1,11 @@
dune_symlink_to_source_files(FILES "test_2p.input")
# using tpfa
+add_executable(test_2p_incompressible_tpfa EXCLUDE_FROM_ALL test_2p_fv.cc)
+target_compile_definitions(test_2p_incompressible_tpfa PUBLIC TYPETAG=TwoPIncompressibleTpfa)
+
dune_add_test(NAME test_2p_incompressible_tpfa
- SOURCES test_2p_fv.cc
- COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa
+ TARGET test_2p_incompressible_tpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
@@ -12,13 +14,12 @@ dune_add_test(NAME test_2p_incompressible_tpfa
# using tpfa
dune_add_test(NAME test_2p_incompressible_tpfa_restart
- SOURCES test_2p_fv.cc
- COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa
+ TARGET test_2p_incompressible_tpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/2p_tpfa_restart-00003.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa_restart test_2p.input -Problem.Name 2p_tpfa_restart -TimeLoop.DtInitial 526.62 -Restart.Time 1859.95 -Restart.File 2p_tpfa-00005.vtu")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa test_2p.input -Problem.Name 2p_tpfa_restart -TimeLoop.DtInitial 526.62 -Restart.Time 1859.95 -Restart.File 2p_tpfa-00005.vtu")
# the restart test has to run after the test that produces the corresponding vtu file
set_tests_properties(test_2p_incompressible_tpfa_restart PROPERTIES DEPENDS test_2p_incompressible_tpfa)
diff --git a/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input b/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input
index 48f074e96d..88a7c7fbf8 100644
--- a/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input
+++ b/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input
@@ -21,6 +21,6 @@ TemperatureLow = 312.15 # [Pa] lower temperature limit for tabularization
TemperatureHigh = 314.15 # [Pa] upper temperature limit for tabularization
[LoadSolution]
-PriVarNamesState1 = pw x_w^N2
-PriVarNamesState2 = pw x_n^H2O
-PriVarNamesState3 = pw Sn
+PriVarNamesState1 = p_w x^N2_w
+PriVarNamesState2 = p_w x^H2O_n
+PriVarNamesState3 = p_w S_n
--
GitLab