From 6d0c6f0398275d9d5484bae51d7870b7a79912dc Mon Sep 17 00:00:00 2001 From: Melanie Darcis <mdarcis@gmx.de> Date: Tue, 7 Aug 2012 17:31:10 +0000 Subject: [PATCH] Introduced ImplicitMobilityUpwindWeight property which is now needed by BoxDarcyFluxVariables for the volumeFlux calculation. Reviewed by Markus git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8811 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/boxmodels/1p/1pproperties.hh | 5 +++-- dumux/boxmodels/1p/1ppropertydefaults.hh | 8 +++++--- dumux/boxmodels/2p/2pproperties.hh | 3 ++- dumux/boxmodels/2p/2ppropertydefaults.hh | 3 ++- dumux/boxmodels/mpnc/mpncproperties.hh | 4 +++- dumux/boxmodels/mpnc/mpncpropertydefaults.hh | 3 ++- dumux/boxmodels/richards/richardsproperties.hh | 3 +++ dumux/boxmodels/richards/richardspropertydefaults.hh | 5 +++-- 8 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dumux/boxmodels/1p/1pproperties.hh b/dumux/boxmodels/1p/1pproperties.hh index a09f219302..7ae5311363 100644 --- a/dumux/boxmodels/1p/1pproperties.hh +++ b/dumux/boxmodels/1p/1pproperties.hh @@ -61,9 +61,10 @@ 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(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem -NEW_PROP_TAG(UpwindWeight); //!< DEPRECATED Returns weight of the upwind cell when calculating fluxes +NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED Returns weight of the upwind cell when calculating fluxes NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes -NEW_PROP_TAG(MobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation +NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation +NEW_PROP_TAG(MobilityUpwindWeight); //!< DEPRECATED Weight for the upwind mobility in the velocity calculation // \} } diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh index 88d6cb3c88..128ed46097 100644 --- a/dumux/boxmodels/1p/1ppropertydefaults.hh +++ b/dumux/boxmodels/1p/1ppropertydefaults.hh @@ -81,11 +81,13 @@ SET_TYPE_PROP(BoxOneP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, Spatia //! The weight of the upwind control volume when calculating //! fluxes. Use central differences by default. -SET_SCALAR_PROP(BoxOneP, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, UpwindWeight)); -SET_SCALAR_PROP(BoxOneP, UpwindWeight, 0.5);//DEPRECATED +SET_SCALAR_PROP(BoxOneP, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight)); +SET_SCALAR_PROP(BoxOneP, MassUpwindWeight, 0.5);//DEPRECATED //! weight for the upwind mobility in the velocity calculation -SET_SCALAR_PROP(BoxOneP, MobilityUpwindWeight, 1.0); +//! fluxes. Use central differences by default. +SET_SCALAR_PROP(BoxOneP, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTag, MobilityUpwindWeight)); +SET_SCALAR_PROP(BoxOneP, MobilityUpwindWeight, 0.5);//DEPRECATED //! The fluid system to use by default SET_TYPE_PROP(BoxOneP, FluidSystem, Dumux::FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>); diff --git a/dumux/boxmodels/2p/2pproperties.hh b/dumux/boxmodels/2p/2pproperties.hh index fb825fd8f5..24a891c0d2 100644 --- a/dumux/boxmodels/2p/2pproperties.hh +++ b/dumux/boxmodels/2p/2pproperties.hh @@ -63,7 +63,8 @@ NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered i NEW_PROP_TAG(EnableGravity); //!< DEPRECATED 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(MassUpwindWeight); //!< DEPRECATED The value of the weight of the upwind direction in the mass conservation equations -NEW_PROP_TAG(MobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation +NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation +NEW_PROP_TAG(MobilityUpwindWeight); //!< DEPRECATED Weight for the upwind mobility in the velocity calculation NEW_PROP_TAG(Formulation); //!< The formulation of the model NEW_PROP_TAG(TwoPIndices); //!< DEPRECATED Enumerations for the 2p models NEW_PROP_TAG(Indices); //!< Enumerations for the model diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh index 538c8b8ac2..ab5491813f 100644 --- a/dumux/boxmodels/2p/2ppropertydefaults.hh +++ b/dumux/boxmodels/2p/2ppropertydefaults.hh @@ -80,7 +80,8 @@ SET_SCALAR_PROP(BoxTwoP, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassU SET_SCALAR_PROP(BoxTwoP, MassUpwindWeight, 1.0);//DEPRECATED //! weight for the upwind mobility in the velocity calculation -SET_SCALAR_PROP(BoxTwoP, MobilityUpwindWeight, 1.0); +SET_SCALAR_PROP(BoxTwoP, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTag, MobilityUpwindWeight)); +SET_SCALAR_PROP(BoxTwoP, MobilityUpwindWeight, 1.0);//DEPRECATED //! The indices required by the isothermal 2p model SET_TYPE_PROP(BoxTwoP, diff --git a/dumux/boxmodels/mpnc/mpncproperties.hh b/dumux/boxmodels/mpnc/mpncproperties.hh index b6eb373363..7ed6ab2f1e 100644 --- a/dumux/boxmodels/mpnc/mpncproperties.hh +++ b/dumux/boxmodels/mpnc/mpncproperties.hh @@ -147,7 +147,9 @@ NEW_PROP_TAG(EnableSmoothUpwinding);//DEPRECATED NEW_PROP_TAG(MassUpwindWeight); //!< DEPRECATED The value of the weight of the upwind direction in the mass conservation equations NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations -NEW_PROP_TAG(MobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation + +NEW_PROP_TAG(MobilityUpwindWeight); //!< DEPRECATED Weight for the upwind mobility in the velocity calculation +NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation //! Chop the Newton update at the beginning of the non-linear solver? NEW_PROP_TAG(NewtonEnableChop); diff --git a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh index 76f22e6803..863d1d70ff 100644 --- a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh +++ b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh @@ -173,7 +173,8 @@ SET_SCALAR_PROP(BoxMPNC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassU SET_SCALAR_PROP(BoxMPNC, MassUpwindWeight, 1.0);//DEPRECATED //! weight for the upwind mobility in the velocity calculation -SET_SCALAR_PROP(BoxMPNC, MobilityUpwindWeight, 1.0); +SET_SCALAR_PROP(BoxMPNC, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTag, MobilityUpwindWeight)); +SET_SCALAR_PROP(BoxMPNC, MobilityUpwindWeight, 1.0);//DEPRECATED //! DEPRECATED MPNCIndices property SET_TYPE_PROP(BoxMPNC, MPNCIndices, typename GET_PROP_TYPE(TypeTag, Indices)); diff --git a/dumux/boxmodels/richards/richardsproperties.hh b/dumux/boxmodels/richards/richardsproperties.hh index 130c52dd5e..1d83d73022 100644 --- a/dumux/boxmodels/richards/richardsproperties.hh +++ b/dumux/boxmodels/richards/richardsproperties.hh @@ -65,6 +65,9 @@ NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered i NEW_PROP_TAG(EnableGravity); //!< DEPRECATED 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(MassUpwindWeight); //!< DEPRECATED The value of the weight of the upwind direction in the mass conservation equations +NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< The value of the weight for the upwind mobility in the velocity calculation +NEW_PROP_TAG(MobilityUpwindWeight); //!< DEPRECATED The value of the weight for the upwind mobility in the velocity calculation + // \} } diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh index d74afad16b..b9b29dfa50 100644 --- a/dumux/boxmodels/richards/richardspropertydefaults.hh +++ b/dumux/boxmodels/richards/richardspropertydefaults.hh @@ -74,10 +74,11 @@ SET_TYPE_PROP(BoxRichards, NewtonController, RichardsNewtonController<TypeTag>); //! The upwind weight for the mass conservation equations SET_SCALAR_PROP(BoxRichards, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight)); -SET_SCALAR_PROP(BoxRichards, MassUpwindWeight, 1.0); +SET_SCALAR_PROP(BoxRichards, MassUpwindWeight, 1.0);// DEPRECATED //! weight for the upwind mobility in the velocity calculation -SET_SCALAR_PROP(BoxRichards, MobilityUpwindWeight, 1.0); +SET_SCALAR_PROP(BoxRichards, ImplicitMobilityUpwindWeight, GET_PROP_VALUE(TypeTag, MobilityUpwindWeight)); +SET_SCALAR_PROP(BoxRichards, MobilityUpwindWeight, 1.0);// DEPRECATED //! The class with all index definitions for the model SET_TYPE_PROP(BoxRichards, Indices, RichardsIndices<TypeTag>); -- GitLab