Skip to content
Snippets Groups Projects
Commit e5e03f6f authored by Martin Utz's avatar Martin Utz Committed by Timo Koch
Browse files

Remove template argument PrimaryVariables from ShallowWaterViscousFlux

parent 3159cda5
No related branches found
No related tags found
1 merge request!2858Remove template argument PrimaryVariables from ShallowWaterViscousFlux
......@@ -47,6 +47,7 @@ for (const auto& element : elements(gridGeometry.gridView()))
- `PengRobinsonMixture::computeMolarVolumes` has been removed without deprecation. It was used nowhere and did not translate.
- __Coupling managers__: The coupling managers now store shared_ptrs of the subdomain solutions to be able to manage memory outside. There is compatibility interface that is deprecated but it won't allow for assignments
of the form `this->curSol() = sol;` since curSol returns a MultiTypeVector of references. If assignment is needed for some reason, use a hybrid loop over all subdomain indices.
- __ShallowWaterViscousFlux__: The template argument `PrimaryVariables` has been removed without deprecation. It was not needed.
### Deprecated properties/classes/functions/files, to be removed after 3.5:
......
......@@ -57,8 +57,7 @@ static constexpr bool implementsFrictionLaw()
* by adding all surrounding shear stresses.
* For now implemented strictly for 2D depth-averaged models (i.e. 3 equations)
*/
template<class PrimaryVariables, class NumEqVector,
typename std::enable_if_t<NumEqVector::size() == 3, int> = 0>
template<class NumEqVector, typename std::enable_if_t<NumEqVector::size() == 3, int> = 0>
class ShallowWaterViscousFlux
{
......@@ -87,7 +86,7 @@ public:
const ElementVolumeVariables& elemVolVars,
const typename FVElementGeometry::SubControlVolumeFace& scvf)
{
using Scalar = typename PrimaryVariables::value_type;
using Scalar = typename NumEqVector::value_type;
NumEqVector localFlux(0.0);
......
......@@ -161,7 +161,7 @@ struct AdvectionType<TypeTag, TTag::ShallowWater>
template<class TypeTag>
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 namespace Dumux
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment