From f700d104b91c2c4eff0fc44b1e493bc171b51399 Mon Sep 17 00:00:00 2001 From: Kilian <kilian.weishaupt@iws.uni-stuttgart.de> Date: Thu, 4 Jun 2020 20:03:53 +0200 Subject: [PATCH] [test][porousmediumflow][3p3c] Use BoundaryTypes directly --- test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh | 4 +++- test/porousmediumflow/3p3c/implicit/infiltration/problem.hh | 4 +++- test/porousmediumflow/3p3c/implicit/kuevette/problem.hh | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh index e643887e05..8b8f4e73a1 100644 --- a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh @@ -33,6 +33,8 @@ #include <dumux/material/solidsystems/1csolid.hh> #include <dumux/material/components/constant.hh> +#include <dumux/common/boundarytypes.hh> + #include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/box.hh> #include <dumux/porousmediumflow/3p3c/model.hh> @@ -157,7 +159,7 @@ class ColumnProblem : 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 Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh index e2ee00aef8..c710cf2b9b 100644 --- a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh @@ -28,6 +28,8 @@ #include <dune/grid/yaspgrid.hh> +#include <dumux/common/boundarytypes.hh> + #include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/box.hh> #include <dumux/porousmediumflow/problem.hh> @@ -137,7 +139,7 @@ class InfiltrationThreePThreeCProblem : 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 GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using Element = typename GridView::template Codim<0>::Entity; diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh index 9bc7fc2b4a..e206e9af4a 100644 --- a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh @@ -32,6 +32,8 @@ #include <dumux/material/fluidsystems/h2oairmesitylene.hh> #include <dumux/material/components/constant.hh> +#include <dumux/common/boundarytypes.hh> + #include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/box.hh> #include <dumux/porousmediumflow/3p3c/model.hh> @@ -143,7 +145,7 @@ class KuevetteProblem : 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 Element = typename GridView::template Codim<0>::Entity; using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; -- GitLab