[test][shallowwater] Use BoundaryTypes directly

test/freeflow/shallowwater/bowl/problem.hh

@@ -24,6 +24,7 @@
 #ifndef DUMUX_BOWL_TEST_PROBLEM_HH
 #define DUMUX_BOWL_TEST_PROBLEM_HH
 
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/freeflow/shallowwater/problem.hh>
 #include <dumux/freeflow/shallowwater/boundaryfluxes.hh>
 
@@ -74,7 +75,7 @@ class BowlProblem : public ShallowWaterProblem<TypeTag>
     using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
 
 
 public:

test/freeflow/shallowwater/dambreak/problem.hh

@@ -28,12 +28,12 @@
 #include <dumux/discretization/cctpfa.hh>
 #include "spatialparams.hh"
 
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/freeflow/shallowwater/model.hh>
 #include <dumux/freeflow/shallowwater/problem.hh>
 #include <dumux/flux/shallowwater/riemannproblem.hh>
 #include <dumux/flux/shallowwater/exactriemann.hh>
 
-
 namespace Dumux {
 
 /*!
@@ -110,7 +110,7 @@ class DamBreakProblem : public ShallowWaterProblem<TypeTag>
 {
     using ParentType = ShallowWaterProblem<TypeTag>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
     using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;

test/freeflow/shallowwater/roughchannel/problem.hh

@@ -28,6 +28,7 @@
 #include <dumux/discretization/cctpfa.hh>
 #include "spatialparams.hh"
 #include <dumux/common/parameters.hh>
+#include <dumux/common/boundarytypes.hh>
 
 #include <dumux/freeflow/shallowwater/model.hh>
 #include <dumux/freeflow/shallowwater/problem.hh>
@@ -113,7 +114,7 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
 {
     using ParentType = ShallowWaterProblem<TypeTag>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
     using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;