From ab6ff4c08f140776b84664f77975a68e449e0ce0 Mon Sep 17 00:00:00 2001
From: Kilian <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Fri, 5 Jun 2020 08:45:36 +0200
Subject: [PATCH] [test][md][embedded] Use BoundaryTypes directly
---
test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh | 3 ++-
test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh | 3 ++-
test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh | 3 ++-
test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh | 3 ++-
test/multidomain/embedded/1d3d/1p_richards/problem_root.hh | 3 ++-
test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh | 3 ++-
test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh | 3 ++-
test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh | 3 ++-
8 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
index 8b659d619b..3e770f22d0 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
@@ -28,6 +28,7 @@
#include <dune/foamgrid/foamgrid.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/cctpfa.hh>
@@ -107,7 +108,7 @@ class RootProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
using SourceValues = 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 GridView = typename GridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
index 322a7dda40..01bad91ee9 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
@@ -31,6 +31,7 @@
#include <dune/grid/uggrid.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
@@ -124,7 +125,7 @@ class SoilProblem : public PorousMediumFlowProblem<TypeTag>
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
index f76fee4aee..548804630f 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
@@ -28,6 +28,7 @@
#include <dune/foamgrid/foamgrid.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/cctpfa.hh>
@@ -111,7 +112,7 @@ class BloodFlowProblem : public PorousMediumFlowProblem<TypeTag>
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using GridView = typename GridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
index 4202ca8346..125ea6fec7 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
@@ -31,6 +31,7 @@
#include <dune/geometry/quadraturerules.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
@@ -123,7 +124,7 @@ class TissueProblem : public PorousMediumFlowProblem<TypeTag>
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
index 23a22ebd58..fd2cf05928 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
@@ -28,6 +28,7 @@
#include <dune/foamgrid/foamgrid.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/cctpfa.hh>
@@ -107,7 +108,7 @@ class RootProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NeumannFluxes = 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 GridView = typename GridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
index 4257a04421..8976cd1845 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
@@ -30,6 +30,7 @@
#include <dune/geometry/quadraturerules.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
@@ -105,7 +106,7 @@ class SoilProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
index 4edbdfe0ec..dd9f314f2d 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
@@ -27,6 +27,7 @@
#include <dune/foamgrid/foamgrid.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/cctpfa.hh>
@@ -106,7 +107,7 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
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 GridView = typename GridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
index 4e18bf1a61..9669305f34 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
@@ -29,6 +29,7 @@
#include <dune/grid/yaspgrid.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dumux/common/boundarytypes.hh>
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
@@ -115,7 +116,7 @@ class MatrixProblem : public PorousMediumFlowProblem<TypeTag>
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
--
GitLab