diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh
index 9886d82d92336cb84c0eab9cac95e66d84c3c7ed..92e3ed5ecaef1563f7b33a08b12e7ce92d005bf5 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh
@@ -65,7 +65,7 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
index d33d269af4af4fe5e8591ad0c9508f249ecd7dac..ed9289087d75b17c2c1178417778fa129cb6e1f1 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
@@ -54,7 +54,7 @@ class FVVelocity1P
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
index 3b816f3a31296abe78246026ec5d5f3693225bb4..22184122b734b41bdfe7005074d6c57ce2ab24de 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
@@ -128,7 +128,7 @@ template<class TypeTag> class FVPressure2P: public FVPressure<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
index b4aa4760cea0d996e35a22bffd4da764052a0089..0ed893cc8c178def711faffecff318f1bb6a30a6 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
@@ -71,7 +71,7 @@ class FVVelocity2P
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh
index c861763cc35c80e84e0276266add63d2655d1501..c0355d837a9b613566ed5edb85066988bf1c4260 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh
@@ -69,7 +69,7 @@ public:
using MBlockType = Dune::FieldMatrix<Scalar, m, m>; // one entry in the stiffness matrix
using VBlockType = Dune::FieldVector<Scalar, m>; // one entry in the global vectors
using BCBlockType = std::array<BoundaryConditions::Flags, m>; // componentwise boundary conditions
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
virtual ~LocalStiffness ()
{
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh
index a10ba8cbdffe385012495f59782c605545a803c2..4056d8f7037d01fdc636e8861de5cb6f1de78edf 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh
@@ -90,7 +90,7 @@ class MimeticTwoPLocalStiffness: public LocalStiffness<TypeTag, 1>
using Grid = typename GridView::Grid;
using Element = typename GridView::Traits::template Codim<0>::Entity;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh
index 84f3c381f123158a6022b2b537241a61f465ebc9..60585c6ccc2ff05c084c6718f1c64e829d5d1bb4 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh
@@ -92,7 +92,7 @@ class MimeticTwoPLocalStiffnessAdaptive: public LocalStiffness<TypeTag, 1>
using Grid = typename GridView::Grid;
using Element = typename GridView::Traits::template Codim<0>::Entity;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh
index cc46647410cbb120af95ad8af6ad77a917ab2ba0..ca84c4a800ac7d295890a0b0a7fcdc0d53bd6804 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh
@@ -60,7 +60,7 @@ class MimeticOperatorAssemblerTwoP: public CROperatorAssemblerTwoP<TypeTag>
using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh
index 434e52fd791bfe59920b8d94517dc4c0905eaf8c..d204e8af45dc7dc305dac41f949f733f8e5e715d 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh
@@ -62,7 +62,7 @@ class MimeticOperatorAssemblerTwoPAdaptive : public CROperatorAssemblerTwoPAdapt
using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
index 901e08561229b0258947cc4cf052ee58faaa5dfb..34c6c1fabbee46583ad257bc8c2853498cceb422 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
@@ -89,7 +89,7 @@ class FvMpfaL2dPressure2p: public FVPressure<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
index 137e313910d01477994582b26c88e7b67dceda89..e19b8d174061157570608baf227fc08bf82b694a 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
@@ -92,7 +92,7 @@ class FvMpfaL2dPressure2pAdaptive: public FVPressure<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh
index 6047876798e59ba75cb16d42bb2fedf7d5b4c666..59b40398247266434f7e834a16ecd959c0638fcc 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh
@@ -56,7 +56,7 @@ template<class TypeTag> class FvMpfaL2dPressureVelocity2p: public FvMpfaL2dPress
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh
index 1cee737ca0bb10083fb8c3c67f3cfc6bb7d02820..d4a741869292c5ddf4ede6a4017ba094f8f2740e 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh
@@ -58,7 +58,7 @@ template<class TypeTag> class FvMpfaL2dPressureVelocity2pAdaptive: public FvMpfa
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
index f53bbe651096334d30e92bd1a6d03d33d35a74e1..c7822502c6391cfd147bf084e0608ec33e31f682 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
@@ -73,7 +73,7 @@ template<class TypeTag> class FvMpfaL2dVelocity2p
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh
index 903def08d0bb8daa00f7541140dcb2d99f01c090..2fddf014ca55d706416d8bab54c12dd2bb8a06fb 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh
@@ -70,7 +70,7 @@ template<class TypeTag> class FvMpfaL2dVelocity2pAdaptive : public FvMpfaL2dVelo
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
index 882a5da5ef1027e189d4d48e74a789b37e7ab4af..a6e97c8122d26e4d27e717ea9815bdc15b0e21c9 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
@@ -57,7 +57,7 @@ class FvMpfaL3dInteractionVolumeContainer
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh
index 6cce644e5bc7405382b1afaae2a62075435e8167..68a418328fb95d7ce21e5f78e3cf7f9c56e007d9 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh
@@ -92,7 +92,7 @@ class FvMpfaL3dPressure2p: public FVPressure<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh
index ba6a5b38a5353eb3e3bcedb68147c15b48ed3f29..a5129ed870ea096794f3e1bf2936a2b572e1677a 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh
@@ -96,7 +96,7 @@ class FvMpfaL3dPressure2pAdaptive: public FvMpfaL3dPressure2p<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh
index 2cbdee37a46d85bcd08acf7a6d5369e3809eccde..025df282e2959caae797b596bf9dd99e97dcbfa7 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh
@@ -73,7 +73,7 @@ template<class TypeTag> class FvMpfaL3dPressureVelocity2p: public FvMpfaL3dPress
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using SpatialParams = GetPropType<TypeTag, Properties::SpatialParams>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh
index 3cf7202a1b371d14dac9500c1e9f15c3a4fe2a55..5782b15acf17d3b4e3bec7f2046b468e6dc51877 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh
@@ -75,7 +75,7 @@ template<class TypeTag> class FvMpfaL3dPressureVelocity2pAdaptive: public FvMpfa
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using SpatialParams = GetPropType<TypeTag, Properties::SpatialParams>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
index 0eee350450a27e9eb23f949b5ad0519ef76f5dd1..88bfcc94b37a6800ba898b9316800fa06a924065 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
@@ -70,7 +70,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2p
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh
index 9cfc94d42973722555f64140f31f7e199bf770c4..9aa9447370a29fdfb15e209433c24f3d04073764 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh
@@ -72,7 +72,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2pAdaptive: public FvMpfaL3dVeloc
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
index c45cdb41f32ac36ed3b2c7118cbe491f14ce6f5e..fe1b2e99703644bb228bdb06c0b2a259477c47f7 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
@@ -84,7 +84,7 @@ class FvMpfaO2dPressure2p: public FVPressure<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
index 2c2fb4a3d84450f3900395ed36dfaecf580968e5..a38f5e39d1f612ae3e307dd04d45b0b4c1a10ffd 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
@@ -55,7 +55,7 @@ template<class TypeTag> class FvMpfaO2dPressureVelocity2p: public FvMpfaO2dPress
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using CellData = GetPropType<TypeTag, Properties::CellData>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
index 25a3296cd7b89ce983b56c18a1700468b9d8f241..634ef6a40e8002c30fa2ff73dd02d77916d1965c 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
@@ -72,7 +72,7 @@ template<class TypeTag> class FvMpfaO2dVelocity2P
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh b/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh
index 26677437984aebc823243b7f1e9370720f948f55..e5a2818a843d602f97c5ff3af986f218d229b246 100644
--- a/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh
+++ b/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh
@@ -48,7 +48,7 @@ private:
using ScalarSolutionType = typename SolutionTypes::ScalarSolution;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh
index e0f7da9edf1d0007c7bc6ee3f0807019a8e692aa..4e50446756bcdb6b3aad9495fca7b06f0b62a08e 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh
@@ -61,7 +61,7 @@ private:
using CellData = GetPropType<TypeTag, Properties::CellData>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh
index 763a2c057b047348d568715e4d4c45404411ce86..75ef21c258c9b99e35213169e633d700b321d922 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh
@@ -49,7 +49,7 @@ private:
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
index 532b35683fbdb9fba6dd98ec4cab026033a54faa..cdb38fa7f6a90bc56deffbad90314c26b068c185 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
@@ -101,7 +101,7 @@ class FVSaturation2P: public FVTransport<TypeTag>
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
using CellData = GetPropType<TypeTag, Properties::CellData>;
diff --git a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
index 2b0248b33ad56e25350c3aabb2ce98e33c0654d4..e4cc63dfa1ad6395b78e807c9ae0cdb1bb863730 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
@@ -93,7 +93,7 @@ template<class TypeTag> class FV3dPressure2P2CAdaptive
using MaterialLaw = typename SpatialParams::MaterialLaw;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
diff --git a/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh
index 0d62ab64aca023f87abc96ae093bc0733657da86..4e505d0e7005d004fed613e271b99db00300462e 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh
@@ -60,7 +60,7 @@ class FV3dTransport2P2CAdaptive : public FVTransport2P2C<TypeTag>
using MaterialLaw = typename SpatialParams::MaterialLaw;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh
index c6cccc8f62cd89b2a3e9f388390a66203f1b4ae1..c22fdae5bd2370838216df30555d3acf9af0c18e 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh
@@ -56,7 +56,7 @@ class FvMpfaL3d2P2CInteractionVolumeContainerAdaptive : public FvMpfaL3dInteract
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using PrimaryVariables = typename GetProp<TypeTag, Properties::SolutionTypes>::PrimaryVariables;
using GridTypeIndices = GetPropType<TypeTag, Properties::GridTypeIndices>;
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
index b48b0b59483c47ba923e964b64c43f081f99f5f2..fc0040d606f6a498a93346f77e0cc50c50af881d 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
@@ -82,7 +82,7 @@ template<class TypeTag> class FVPressure2P2C
using MaterialLaw = typename SpatialParams::MaterialLaw;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh
index 8c49192fafe84ed0cd84f44fda469e9d1af663c9..ed873d286d9fed9e09f2fb6f4bb258965dee7b45 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh
@@ -78,7 +78,7 @@ class FVPressure2P2CMultiPhysics : public FVPressure2P2C<TypeTag>
using MaterialLaw = typename SpatialParams::MaterialLaw;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh b/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh
index 96df1dd835846ab62811639b6b8eacfb2fed6f4d..3cfb8a035d0e1a386fb314a7884708a6121d922b 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh
@@ -67,7 +67,7 @@ class FVTransport2P2C
using MaterialLaw = typename SpatialParams::MaterialLaw;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh
index 122115802b8c6ee6ed683105777a3d67e4499e15..d9808c44931a8bd24bb26c454b4a2d35d71a5795 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh
@@ -52,7 +52,7 @@ private:
using Element = typename GridView::template Codim<0>::Entity;
using ElementSeed = typename Grid::template Codim<0>::EntitySeed;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh
index 3bc8ce6b1395f080c217cdbd904e88b13b793249..605e3d84ba0b8b0934a67e8b8f8253d9f4e00a4e 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh
@@ -128,7 +128,7 @@ private:
using Element = typename GridView::template Codim<0>::Entity;
using ElementSeed = typename Grid::template Codim<0>::EntitySeed;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh
index 33a4d0220de0fe8007ec306901c965629b575a5f..553fd00e05d80c0096414e00a575c20e471b7c4b 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh
@@ -206,7 +206,7 @@ private:
using Element = typename GridView::template Codim<0>::Entity;
using ElementSeed = typename Grid::template Codim<0>::EntitySeed;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh
index 1ec9db12a147f52b6d5224c6b188cfb8586e417f..5e7d0128075abab3eaadfe9fb6ec35b6939ec2c8 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh
@@ -49,7 +49,7 @@ private:
using Element = typename GridView::template Codim<0>::Entity;
using ElementSeed = typename Grid::template Codim<0>::EntitySeed;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh b/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh
index 8e16148fd476ddaca02075dfbd964d00beec7a2a..82af602cfb298535f6bc15b0153661dad82eede2 100644
--- a/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh
+++ b/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh
@@ -49,7 +49,7 @@ private:
using AdaptionIndicator = GetPropType<TypeTag, Properties::AdaptionIndicator>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
enum
{
diff --git a/dumux/porousmediumflow/sequential/impetproblem.hh b/dumux/porousmediumflow/sequential/impetproblem.hh
index d4957a2052de1c5a64c862173f3bc59a7ee46bef..fc0f7276bafe985649eefe9eb15518d456e54b06 100644
--- a/dumux/porousmediumflow/sequential/impetproblem.hh
+++ b/dumux/porousmediumflow/sequential/impetproblem.hh
@@ -84,7 +84,7 @@ private:
using GridAdaptModel = GetPropType<TypeTag, Properties::GridAdaptModel>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
//private!! copy constructor
IMPETProblem(const IMPETProblem&)
diff --git a/dumux/porousmediumflow/sequential/onemodelproblem.hh b/dumux/porousmediumflow/sequential/onemodelproblem.hh
index bea9dc347d119014077ef13152c74566c459955b..840329ec37fca0f9e157f6ceb413de4044ea24b2 100644
--- a/dumux/porousmediumflow/sequential/onemodelproblem.hh
+++ b/dumux/porousmediumflow/sequential/onemodelproblem.hh
@@ -78,7 +78,7 @@ private:
using Intersection = typename GridView::Intersection;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
// private!! copy constructor
OneModelProblem(const OneModelProblem&)
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index c4e5ba1350bd9e6f366d79a681a8971b3aa136ff..d71b42371019aacc37fc73c6681f15959b6ff60d 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -62,6 +62,8 @@ template<class TypeTag, class MyTypeTag>
struct SolutionTypes { using type = UndefinedProperty; };
template<class TypeTag, class MyTypeTag>
struct Indices { using type = UndefinedProperty; };
+template<class TypeTag, class MyTypeTag>
+struct SequentialBoundaryTypes { using type = UndefinedProperty; };
// Some properties that have been removed from numeric model
template<class TypeTag, class MyTypeTag>
@@ -231,7 +233,7 @@ struct TimeManager<TypeTag, TTag::SequentialModel> { using type = Dumux::TimeMan
* \brief Boundary types at a single degree of freedom.
*/
template<class TypeTag>
-struct BoundaryTypes<TypeTag, TTag::SequentialModel>
+struct SequentialBoundaryTypes<TypeTag, TTag::SequentialModel>
{ private:
enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
public:
diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
index e452ec04d5c680a3dd6425e4dbd21954dfac1c48..e1c1e6a5845be5cd614c57a79babd272e96bbc3e 100644
--- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
@@ -89,7 +89,7 @@ class TestProblemOneP: public DiffusionProblem1P<TypeTag >
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
enum
{
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
index f26b4a1c9d811cea314b1271a3370d9d9b18f207..506cce2c398f5083a011667481bf2f4eb96d1804 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
@@ -139,7 +139,7 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
using WettingPhase = typename GetProp<TypeTag, Properties::FluidSystem>::WettingPhase;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
enum
{
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
index b64e03b6d264e556ca46bb854f1d28983130a5fa..b8987f1ae989e2ff59017e41c32f1dcd103e75a5 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
@@ -105,7 +105,7 @@ class TestDiffusion3DProblem: public DiffusionProblem2P<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
enum
{
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index 08a0fc48c12295268d441bf60a27dbd0f26610d0..2ebb57009d698ec9e84e39864cfbdec426179c46 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -130,7 +130,7 @@ using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using TimeManager = GetPropType<TypeTag, Properties::TimeManager>;
-using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using PrimaryVariables = typename GetProp<TypeTag, Properties::SolutionTypes>::PrimaryVariables;
enum
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
index 53d8ef29dd93638186c2af83632aba49567d4f74..2ecfd19a8e572944545a7332e073f0d39bd37f5c 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
@@ -122,7 +122,7 @@ class TestIMPESAdaptiveProblem: public IMPESProblem2P<TypeTag>
using Element = typename GridView::Traits::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/test/porousmediumflow/2p/sequential/test_impesproblem.hh b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
index 302ddd41f64df174fdeb0b81eac9a893459d8dcc..d80fd74372daab5ccb1d43b68593e6aaf037446b 100644
--- a/test/porousmediumflow/2p/sequential/test_impesproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
@@ -169,7 +169,7 @@ using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Element = typename GridView::Traits::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
-using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 101d0228ddd6b5939869003a6e4f6f1a8b6037e7..4d28a2ff4d528c092a6dcd21f5c01343e305981a 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -154,7 +154,7 @@ using WettingPhase = typename GetProp<TypeTag, Properties::FluidSystem>::Wetting
using TimeManager = GetPropType<TypeTag, Properties::TimeManager>;
-using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/test/porousmediumflow/2p/sequential/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
index ff8012fbba36726efebf22d674e5548b390f46ce..770a488dada96ee65be7c968d1ab0d4b26fed097 100644
--- a/test/porousmediumflow/2p/sequential/test_transportproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
@@ -103,7 +103,7 @@ class TestTransportProblem: public TransportProblem2P<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using TimeManager = GetPropType<TypeTag, Properties::TimeManager>;
- using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using SolutionTypes = GetProp<TypeTag, Properties::SolutionTypes>;
using PrimaryVariables = typename SolutionTypes::PrimaryVariables;
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index e86c548b17d5dcb6cb03a27a9e71c6feeb749f5e..0e4d3134944b095f000f6e2c1218c349713d5d84 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -125,7 +125,7 @@ using TimeManager = GetPropType<TypeTag, Properties::TimeManager>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
enum
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index e62cf2139cf4542dab9101ebc0b9a96c7bec3905..3fd1d97294f6fd17bc4ec1cb4bc108ac644286cd 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -125,7 +125,7 @@ using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using SpatialParams = GetPropType<TypeTag, Properties::SpatialParams>;
-using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
enum
{
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
index a35a5b11e114443f2e6532e255f7898618302733..6185aba4ecc5890f3c28605e061b619f92cf5db2 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
@@ -108,7 +108,7 @@ using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
enum
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
index e109a2121c0c55870b0c262a3c2db373e45e0def..147db58047c8c3a036e27e4afedca8e9b271b237 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
@@ -116,7 +116,7 @@ using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+using BoundaryTypes = GetPropType<TypeTag, Properties::SequentialBoundaryTypes>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
enum