From 370c2d19830a90eefdc8237ddf367c92b2d1966c Mon Sep 17 00:00:00 2001
From: Kilian <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 4 Jun 2020 20:03:11 +0200
Subject: [PATCH] [test][porousmediumflow][3p] Use BoundaryTypes directly
---
test/porousmediumflow/3p/implicit/conduction/problem.hh | 4 +++-
test/porousmediumflow/3p/implicit/convection/problem.hh | 4 +++-
test/porousmediumflow/3p/implicit/infiltration/problem.hh | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/test/porousmediumflow/3p/implicit/conduction/problem.hh b/test/porousmediumflow/3p/implicit/conduction/problem.hh
index 88804e0f72..2b3d3c7421 100644
--- a/test/porousmediumflow/3p/implicit/conduction/problem.hh
+++ b/test/porousmediumflow/3p/implicit/conduction/problem.hh
@@ -29,6 +29,8 @@
#include <cmath>
#include <dune/grid/yaspgrid.hh>
+#include <dumux/common/boundarytypes.hh>
+
#include <dumux/discretization/elementsolution.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dumux/discretization/ccmpfa.hh>
@@ -115,7 +117,7 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using ThermalConductivityModel = GetPropType<TypeTag, Properties::ThermalConductivityModel>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/porousmediumflow/3p/implicit/convection/problem.hh b/test/porousmediumflow/3p/implicit/convection/problem.hh
index d712c39d1d..8d670db6b7 100644
--- a/test/porousmediumflow/3p/implicit/convection/problem.hh
+++ b/test/porousmediumflow/3p/implicit/convection/problem.hh
@@ -28,6 +28,8 @@
#include <cmath>
#include <dune/grid/yaspgrid.hh>
+#include <dumux/common/boundarytypes.hh>
+
#include <dumux/discretization/elementsolution.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dumux/discretization/ccmpfa.hh>
@@ -119,7 +121,7 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/porousmediumflow/3p/implicit/infiltration/problem.hh b/test/porousmediumflow/3p/implicit/infiltration/problem.hh
index 0fe922bfcf..79cb2e8974 100644
--- a/test/porousmediumflow/3p/implicit/infiltration/problem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration/problem.hh
@@ -27,6 +27,8 @@
#include <dune/grid/yaspgrid.hh>
+#include <dumux/common/boundarytypes.hh>
+
#include <dumux/discretization/cctpfa.hh>
#include <dumux/discretization/box.hh>
#include <dumux/discretization/method.hh>
@@ -139,7 +141,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
--
GitLab