From 7e6099ce1efd5a3098e9eb76323b214919cf3919 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Thu, 21 Feb 2019 11:45:32 +0100
Subject: [PATCH] [test][io][vtk][staggered] adapt the io test for vtkstaggered
output to fit to RANS interface
---
.../vtk/test_vtk_staggeredfreeflowpvnames.cc | 20 +------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
index c18b37759e..9a5a6b6473 100644
--- a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
+++ b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
@@ -113,31 +113,13 @@ template<class TypeTag>
struct Problem<TypeTag, TTag::StaggeredPVNamesTestTypeTag>
{
private:
- // use the ZeroEqProblem as base class for non-RANS models and for the ZeroEq model
- // use the the KEpsilonProblem as base class for all RANS models except the ZeroEq model
- // NOTE: this rather unpleasant hack will be removed once the RANS models have been unified
using MTraits = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr auto dim = MTraits::dim();
static constexpr auto nComp = MTraits::numFluidComponents();
static constexpr auto numEq = MTraits::numEq();
- using BaseTurbulentProblem = std::conditional_t<(std::is_same<typename MTraits::Indices, KOmegaIndices<dim, nComp>>::value ||
- std::is_same<typename MTraits::Indices, FreeflowNonIsothermalIndices<KOmegaIndices<dim, nComp>, numEq>>::value),
- KOmegaProblem<TypeTag>,
- std::conditional_t<(std::is_same<typename MTraits::Indices, KEpsilonIndices<dim, nComp>>::value ||
- std::is_same<typename MTraits::Indices, FreeflowNonIsothermalIndices<KEpsilonIndices<dim, nComp>, numEq>>::value),
- KEpsilonProblem<TypeTag>,
- std::conditional_t<(std::is_same<typename MTraits::Indices, LowReKEpsilonIndices<dim, nComp>>::value ||
- std::is_same<typename MTraits::Indices, FreeflowNonIsothermalIndices<LowReKEpsilonIndices<dim, nComp>, numEq>>::value),
- LowReKEpsilonProblem<TypeTag>, OneEqProblem<TypeTag>>>>;
-
- using BaseProblem = std::conditional_t<MTraits::usesTurbulenceModel() &&
- !std::is_same<MTraits, RANSModelTraits<dim>>::value &&
- !std::is_same<MTraits, FreeflowNIModelTraits<RANSModelTraits<dim>>>::value &&
- !std::is_same<MTraits, ZeroEqNCModelTraits<dim, nComp, false, 0>>::value &&
- !std::is_same<MTraits, FreeflowNIModelTraits<ZeroEqNCModelTraits<dim, nComp, false, 0>>>::value,
- BaseTurbulentProblem, ZeroEqProblem<TypeTag>>;
+ using BaseProblem = std::conditional_t<MTraits::usesTurbulenceModel(), RANSProblemImpl<TypeTag, MTraits::turbulenceModel()>, NavierStokesProblem<TypeTag>>;
template<class TTag>
class MockProblem : public BaseProblem
--
GitLab