Commit 8fb1401c authored by Martin Utz's avatar Martin Utz Committed by Timo Koch
Browse files

Remove template parameter PrimaryVariables

The parameter PrimaryVariables is not needed and can be therefore
removed.
parent 3159cda5
...@@ -57,8 +57,7 @@ static constexpr bool implementsFrictionLaw() ...@@ -57,8 +57,7 @@ static constexpr bool implementsFrictionLaw()
* by adding all surrounding shear stresses. * by adding all surrounding shear stresses.
* For now implemented strictly for 2D depth-averaged models (i.e. 3 equations) * For now implemented strictly for 2D depth-averaged models (i.e. 3 equations)
*/ */
template<class PrimaryVariables, class NumEqVector, template<class NumEqVector, typename std::enable_if_t<NumEqVector::size() == 3, int> = 0>
typename std::enable_if_t<NumEqVector::size() == 3, int> = 0>
class ShallowWaterViscousFlux class ShallowWaterViscousFlux
{ {
...@@ -87,7 +86,7 @@ public: ...@@ -87,7 +86,7 @@ public:
const ElementVolumeVariables& elemVolVars, const ElementVolumeVariables& elemVolVars,
const typename FVElementGeometry::SubControlVolumeFace& scvf) const typename FVElementGeometry::SubControlVolumeFace& scvf)
{ {
using Scalar = typename PrimaryVariables::value_type; using Scalar = typename NumEqVector::value_type;
NumEqVector localFlux(0.0); NumEqVector localFlux(0.0);
......
...@@ -161,7 +161,7 @@ struct AdvectionType<TypeTag, TTag::ShallowWater> ...@@ -161,7 +161,7 @@ struct AdvectionType<TypeTag, TTag::ShallowWater>
template<class TypeTag> template<class TypeTag>
struct ViscousFluxType<TypeTag, TTag::ShallowWater> struct ViscousFluxType<TypeTag, TTag::ShallowWater>
{ using type = ShallowWaterViscousFlux< GetPropType<TypeTag, Properties::PrimaryVariables>, Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>> >; }; { using type = ShallowWaterViscousFlux< Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>> >; };
} // end properties } // end properties
} // end namespace Dumux } // end namespace Dumux
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment