From 0bc5c9abfd8d560373ebcdec70858331cd728392 Mon Sep 17 00:00:00 2001
From: Kilian <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 4 Jun 2020 20:06:21 +0200
Subject: [PATCH] [test][porousmediumflow][mpnc] Use BoundaryTypes directly
---
test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh | 4 +++-
test/porousmediumflow/mpnc/implicit/kinetic/problem.hh | 4 +++-
test/porousmediumflow/mpnc/implicit/obstacle/problem.hh | 4 +++-
.../mpnc/implicit/thermalnonequilibrium/problem.hh | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
index 9985deec4b..b97fd347eb 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
@@ -29,6 +29,8 @@
#include <dune/common/parametertreeparser.hh>
#include <dune/grid/yaspgrid.hh>
+#include <dumux/common/boundarytypes.hh>
+
#include <dumux/discretization/box.hh>
#include <dumux/discretization/cctpfa.hh>
@@ -110,7 +112,7 @@ class MPNCComparisonProblem
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
index 52162374b2..92a34e8a35 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
@@ -37,7 +37,9 @@
#include <dune/grid/yaspgrid.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
+
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/mpnc/model.hh>
@@ -132,7 +134,7 @@ class EvaporationAtmosphereProblem: public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
index 84c813cdb3..35b9d03dab 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
@@ -31,6 +31,8 @@
#include <dune/common/parametertreeparser.hh>
#include <dune/grid/yaspgrid.hh>
+#include <dumux/common/boundarytypes.hh>
+
#include <dumux/discretization/box.hh>
#include <dumux/discretization/cctpfa.hh>
@@ -130,7 +132,7 @@ class ObstacleProblem
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
index 1764f4c3b7..34a04be27e 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
@@ -32,6 +32,8 @@
#include <dune/grid/onedgrid.hh>
+#include <dumux/common/boundarytypes.hh>
+
#include <dumux/discretization/box.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -173,7 +175,7 @@ class CombustionProblemOneComponent: public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
--
GitLab