[implicit] Unify Mass/MobUpwindWeight -> UpwindWeight

* Set the property for ImplicitBase and define default of 1.0.
* Remove any obsolete declarations from all ported models

dumux/discretization/fluxvariablesbase.hh

@@ -31,7 +31,7 @@ namespace Dumux
 namespace Properties
 {
 // forward declaration
-NEW_PROP_TAG(ImplicitMassUpwindWeight);
+NEW_PROP_TAG(ImplicitUpwindWeight);
 }
 
 /*!
@@ -72,7 +72,7 @@ public:
         // retrieve the upwind weight for the mass conservation equations. Use the value
         // specified via the property system as default, and overwrite
         // it by the run-time parameter from the Dune::ParameterTree
-        upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
+        upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
     }
 
     const Problem& problem() const

dumux/implicit/properties.hh

@@ -145,6 +145,9 @@ NEW_PROP_TAG(ImplicitMaxTimeStepDivisions);
 //! indicate whether discretization is box or not
 NEW_PROP_TAG(ImplicitIsBox);
 
+//! the upwind weight for the advective term
+NEW_PROP_TAG(ImplicitUpwindWeight);
+
 //! the local fem space used for the AMG backend
 NEW_PROP_TAG(ImplicitLocalFemMap);
 

dumux/implicit/propertydefaults.hh

@@ -198,6 +198,9 @@ SET_BOOL_PROP(ImplicitBase, EnableEnergyBalance, false);
 
 SET_TYPE_PROP(ImplicitBase, EnergyLocalResidual, EnergyLocalResidual<TypeTag> );
 
+//! Set the upwind weight for the advective term
+SET_SCALAR_PROP(ImplicitBase, ImplicitUpwindWeight, 1.0);
+
 //! vtk output
 SET_BOOL_PROP(ImplicitBase, VtkAddVelocity, false); //!< Don't reconstruct velocity per default
 

dumux/porousmediumflow/1p/implicit/properties.hh

@@ -64,8 +64,6 @@ NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use
 NEW_PROP_TAG(Fluid); //!< The fluid used for the default fluid system
 NEW_PROP_TAG(FluidState); //!< The type of the fluid state to use
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
 // \}
 }

dumux/porousmediumflow/1p/implicit/propertydefaults.hh

@@ -78,14 +78,6 @@ SET_TYPE_PROP(OneP, Indices, OnePIndices);
 //! Use ImplicitSpatialParamsOneP by default.
 SET_TYPE_PROP(OneP, SpatialParams, ImplicitSpatialParamsOneP<TypeTag>);
 
-//! The weight of the upwind control volume when calculating
-//! fluxes. Use central differences by default.
-SET_SCALAR_PROP(OneP, ImplicitMassUpwindWeight, 1.0);
-
-//! weight for the upwind mobility in the velocity calculation
-//! fluxes. Use central differences by default.
-SET_SCALAR_PROP(OneP, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The fluid system to use by default
 SET_TYPE_PROP(OneP, FluidSystem, FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
 

dumux/porousmediumflow/1p2c/implicit/properties.hh

@@ -66,8 +66,6 @@ NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
 NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
 NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
 NEW_PROP_TAG(FluidState); //!< Type of the fluid state to be used
-NEW_PROP_TAG(ImplicitMassUpwindWeight);   //!< The default value of the upwind weight
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
 NEW_PROP_TAG(UseMoles); //!< Defines whether mole (true) or mass (false) fractions are used
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient

dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh

@@ -83,12 +83,6 @@ SET_PROP(OnePTwoC, FluidState){
         typedef CompositionalFluidState<Scalar, FluidSystem> type;
 };
 
-//! set default upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(OnePTwoC, ImplicitMassUpwindWeight, 1.0);
-
-//! weight for the upwind mobility in the velocity calculation
-SET_SCALAR_PROP(OnePTwoC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! Set the indices used by the 1p2c model
 SET_TYPE_PROP(OnePTwoC, Indices, OnePTwoCIndices<TypeTag>);
 //! The spatial parameters to be employed.

dumux/porousmediumflow/2p/implicit/properties.hh

@@ -65,8 +65,6 @@ NEW_TYPE_TAG(CCTwoPNI, INHERITS_FROM(CCModel, TwoPNI));
 
 NEW_PROP_TAG(NumPhases);   //!< Number of fluid phases in the system
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(Formulation);   //!< The formulation of the model
 NEW_PROP_TAG(Indices); //!< Enumerations for the model
 NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters

dumux/porousmediumflow/2p/implicit/propertydefaults.hh

@@ -81,12 +81,6 @@ SET_BOOL_PROP(TwoP, EnableMolecularDiffusion, false);
 //! Isothermal model by default
 SET_BOOL_PROP(TwoP, EnableEnergyBalance, false);
 
-//! the upwind weight for the mass conservation equations.
-SET_SCALAR_PROP(TwoP, ImplicitMassUpwindWeight, 1.0);
-
-//! weight for the upwind mobility in the velocity calculation
-SET_SCALAR_PROP(TwoP, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The indices required by the isothermal 2p model
 SET_TYPE_PROP(TwoP,
               Indices,

dumux/porousmediumflow/2p2c/implicit/properties.hh

@@ -72,8 +72,6 @@ NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered i
 NEW_PROP_TAG(UseMoles); //!< Defines whether mole (true) or mass (false) fractions are used
 NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether the constraint solver should be used
 
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind weight for the mass conservation equations
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(ReplaceCompEqIdx); //!< The index of the total mass balance equation,
                                 //!< if one component balance is replaced (ReplaceCompEqIdx < NumComponents)
 NEW_PROP_TAG(BaseFluxVariables); //!< The base flux variables

dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh

@@ -144,12 +144,6 @@ SET_TYPE_PROP(TwoPTwoC, PrimaryVariableSwitch, TwoPTwoCPrimaryVariableSwitch<Typ
 //! Use the 2p2c VolumeVariables
 SET_TYPE_PROP(TwoPTwoC, VolumeVariables, TwoPTwoCVolumeVariables<TypeTag>);
 
-//! Set the upwind weight for the mass conservation equations
-SET_SCALAR_PROP(TwoPTwoC, ImplicitMassUpwindWeight, 1.0);
-
-//! Set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(TwoPTwoC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! Set the indices required by the isothermal 2p2c
 SET_TYPE_PROP(TwoPTwoC, Indices, TwoPTwoCIndices <TypeTag, /*PVOffset=*/0>);
 

dumux/porousmediumflow/2pnc/implicit/properties.hh

@@ -73,8 +73,6 @@ NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computa
 
 NEW_PROP_TAG(ReplaceCompEqIdx); //!< The index of the total mass balance equation, if one component balance is replaced (ReplaceCompEqIdx < NumComponents)
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind weight for the mass conservation equations
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< The value of the upwind parameter for the mobility
 NEW_PROP_TAG(BaseFluxVariables); //! The base flux variables
 }
 }

dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh

@@ -166,12 +166,6 @@ SET_TYPE_PROP(TwoPNC, PrimaryVariableSwitch, TwoPNCPrimaryVariableSwitch<TypeTag
 //! the VolumeVariables property
 SET_TYPE_PROP(TwoPNC, VolumeVariables, TwoPNCVolumeVariables<TypeTag>);
 
-//! the upwind weight for the mass conservation equations.
-SET_SCALAR_PROP(TwoPNC, ImplicitMassUpwindWeight, 1.0);
-
-//! Set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(TwoPNC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The indices required by the isothermal 2pnc model
 SET_TYPE_PROP(TwoPNC, Indices, TwoPNCIndices <TypeTag, /*PVOffset=*/0>);
 

dumux/porousmediumflow/3p/implicit/properties.hh

@@ -64,8 +64,6 @@ NEW_PROP_TAG(MaterialLaw);   //!< The material law which ought to be used (extra
 NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extracted from the spatial parameters)
 
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
 }
 }

dumux/porousmediumflow/3p/implicit/propertydefaults.hh

@@ -95,12 +95,6 @@ SET_TYPE_PROP(ThreeP, Model, ThreePModel<TypeTag>);
 //! the VolumeVariables property
 SET_TYPE_PROP(ThreeP, VolumeVariables, ThreePVolumeVariables<TypeTag>);
 
-//! the upwind factor for the mobility.
-SET_SCALAR_PROP(ThreeP, ImplicitMassUpwindWeight, 1.0);
-
-//! set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(ThreeP, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The indices required by the isothermal 3p model
 SET_TYPE_PROP(ThreeP, Indices, ThreePIndices<TypeTag,/*PVOffset=*/0>);
 

dumux/porousmediumflow/3p3c/implicit/properties.hh

@@ -70,8 +70,6 @@ NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extrac
 NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
 
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether a constraint solver should be used explicitly
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
 NEW_PROP_TAG(TauTortuosity); //!< Tortuosity value (tau) used in macroscopic diffusion

dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh

@@ -132,12 +132,6 @@ SET_TYPE_PROP(ThreePThreeC, PrimaryVariableSwitch, ThreePThreeCPrimaryVariableSw
 //! the VolumeVariables property
 SET_TYPE_PROP(ThreePThreeC, VolumeVariables, ThreePThreeCVolumeVariables<TypeTag>);
 
-//! the upwind factor for the mobility.
-SET_SCALAR_PROP(ThreePThreeC, ImplicitMassUpwindWeight, 1.0);
-
-//! set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(ThreePThreeC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! Determines whether a constraint solver should be used explicitly
 SET_BOOL_PROP(ThreePThreeC, UseConstraintSolver, false);
 

dumux/porousmediumflow/nonisothermal/implicit/properties.hh

@@ -61,7 +61,6 @@ NEW_PROP_TAG(NiOutputLevel);
 // forward declaration of other property tags
 NEW_PROP_TAG(Indices);
 NEW_PROP_TAG(NumPhases);
-NEW_PROP_TAG(ImplicitMassUpwindWeight);
 NEW_PROP_TAG(FluidSystem);
 
 }

test/porousmediumflow/2p/implicit/test_fracture_cc2p.input

@@ -9,4 +9,4 @@ File = grids/fracture.msh
 Name = fracturecc # name passed to the output routines
 
 [Implicit]
-MassUpwindWeight = 1.0
+UpwindWeight = 1.0

test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input

@@ -9,4 +9,4 @@ File = grids/fracture.msh
 Name = fractureccmpfa # name passed to the output routines
 
 [Implicit]
-MassUpwindWeight = 1.0
+UpwindWeight = 1.0