From a0d7df05b8665c1871aa3bda1c9e5bd7997db2e4 Mon Sep 17 00:00:00 2001
From: Kilian <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Fri, 5 Jun 2020 08:44:12 +0200
Subject: [PATCH] [test][rans] Use BoundaryTypes directly
---
test/freeflow/rans/problem.hh | 27 +++++++++++++++++----------
test/freeflow/ransnc/problem.hh | 8 +++++---
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/test/freeflow/rans/problem.hh b/test/freeflow/rans/problem.hh
index 9f1ff50c56..32fd52316f 100644
--- a/test/freeflow/rans/problem.hh
+++ b/test/freeflow/rans/problem.hh
@@ -28,24 +28,31 @@
#define DUMUX_PIPE_LAUFER_PROBLEM_HH
#include <dune/grid/yaspgrid.hh>
-#include <dune/common/hybridutilities.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
+
+#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/turbulenceproperties.hh>
+#include <dumux/freeflow/turbulencemodel.hh>
+
#include <dumux/freeflow/rans/problem.hh>
-#include <dumux/material/fluidsystems/1pgas.hh>
-#include <dumux/material/components/air.hh>
-#include <dumux/freeflow/rans/zeroeq/model.hh>
-#include <dumux/freeflow/turbulencemodel.hh>
#include <dumux/freeflow/rans/oneeq/problem.hh>
#include <dumux/freeflow/rans/oneeq/model.hh>
+
+#include <dumux/freeflow/rans/twoeq/kepsilon/model.hh>
+#include <dumux/freeflow/rans/twoeq/kepsilon/problem.hh>
+
+#include <dumux/freeflow/rans/twoeq/komega/model.hh>
+#include <dumux/freeflow/rans/twoeq/komega/problem.hh>
+
#include <dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh>
#include <dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh>
-#include <dumux/freeflow/rans/twoeq/komega/problem.hh>
-#include <dumux/freeflow/rans/twoeq/komega/model.hh>
-#include <dumux/freeflow/rans/twoeq/kepsilon/problem.hh>
-#include <dumux/freeflow/rans/twoeq/kepsilon/model.hh>
+
+#include <dumux/freeflow/rans/zeroeq/model.hh>
+
+#include <dumux/material/components/air.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
namespace Dumux {
@@ -111,7 +118,7 @@ class PipeLauferProblem : public RANSProblem<TypeTag>
{
using ParentType = RANSProblem<TypeTag>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/freeflow/ransnc/problem.hh b/test/freeflow/ransnc/problem.hh
index e5eb177b19..8689a34f1b 100644
--- a/test/freeflow/ransnc/problem.hh
+++ b/test/freeflow/ransnc/problem.hh
@@ -26,9 +26,9 @@
#include <dune/grid/yaspgrid.hh>
+#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
-#include <dumux/material/fluidsystems/1padapter.hh>
-#include <dumux/material/fluidsystems/h2oair.hh>
+
#include <dumux/freeflow/turbulenceproperties.hh>
#include <dumux/freeflow/rans/zeroeq/problem.hh>
@@ -46,6 +46,8 @@
#include <dumux/freeflow/rans/twoeq/kepsilon/problem.hh>
#include <dumux/freeflow/compositional/kepsilonncmodel.hh>
+#include <dumux/material/fluidsystems/1padapter.hh>
+#include <dumux/material/fluidsystems/h2oair.hh>
namespace Dumux {
@@ -119,7 +121,7 @@ class FlatPlateNCTestProblem : public RANSProblem<TypeTag>
{
using ParentType = RANSProblem<TypeTag>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
--
GitLab