From f854f72eac11e38ea042e88e40d69509318f22a0 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 15 Oct 2012 12:08:09 +0000
Subject: [PATCH] box 3p3c: remove everything deprecated during 2.2-svn. This
includes removal of the model-specific problem, as well as several property,
parameter and member function names. Reviewed by Christoph
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9307 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/3p3c/3p3cfluxvariables.hh | 75 --------------------
dumux/boxmodels/3p3c/3p3cindices.hh | 9 +--
dumux/boxmodels/3p3c/3p3cmodel.hh | 16 -----
dumux/boxmodels/3p3c/3p3cproperties.hh | 4 --
dumux/boxmodels/3p3c/3p3cpropertydefaults.hh | 12 ++--
5 files changed, 7 insertions(+), 109 deletions(-)
diff --git a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
index c09c37acdb..a687fb3d64 100644
--- a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
+++ b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
@@ -278,114 +278,39 @@ private:
}
public:
- /*!
- * \brief Return the pressure potential multiplied with the
- * intrinsic permeability which goes from vertex i to
- * vertex j.
- *
- * Note that the length of the face's normal is the area of the
- * phase, so this is not the actual velocity by the integral of
- * the velocity over the face's area. Also note that the phase
- * mobility is not yet included here since this would require a
- * decision on the upwinding approach (which is done in the
- * actual model).
- */
- DUNE_DEPRECATED_MSG("use the methods of the base flux variables instead")
- Scalar KmvpNormal(int phaseIdx) const
- { return -this->kGradPNormal(phaseIdx); }
-
- /*!
- * \brief Return the pressure potential multiplied with the
- * intrinsic permeability as DimVector (for velocity output)
- */
- DUNE_DEPRECATED_MSG("use the methods of the base flux variables instead")
- DimVector Kmvp(int phaseIdx) const
- { return this->kGradP_[phaseIdx]; }
-
/*!
* \brief The diffusivity matrix
*/
Dune::FieldMatrix<Scalar, numPhases, numComponents> porousDiffCoeff() const
{ return porousDiffCoeff_; };
- /*!
- * \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use density instead")
- Scalar densityAtIP(int phaseIdx) const
- {
- density(phaseIdx);
- }
-
/*!
* \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase.
*/
Scalar density(int phaseIdx) const
{ return density_[phaseIdx]; }
- /*!
- * \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use molarDensity instead")
- Scalar molarDensityAtIP(int phaseIdx) const
- {
- molarDensity(phaseIdx);
- }
-
/*!
* \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase.
*/
Scalar molarDensity(int phaseIdx) const
{ return molarDensity_[phaseIdx]; }
- /*!
- * \brief The mass fraction gradients of the components in a phase.
- */
- DUNE_DEPRECATED_MSG("use massFractionCompWGrad instead")
- const DimVector &wConcentrationGrad(int phaseIdx) const
- { massFractionCompWGrad(phaseIdx); };
-
const DimVector &massFractionCompWGrad(int phaseIdx) const
{return massFractionCompWGrad_[phaseIdx];}
- DUNE_DEPRECATED_MSG("use massFractionCompNGrad instead")
- const DimVector &cConcentrationGrad(int phaseIdx) const
- { massFractionCompNGrad(phaseIdx); };
-
const DimVector &massFractionCompNGrad(int phaseIdx) const
{ return massFractionCompNGrad_[phaseIdx]; };
- DUNE_DEPRECATED_MSG("use massFractionCompGGrad instead")
- const DimVector &aConcentrationGrad(int phaseIdx) const
- { massFractionCompGGrad(phaseIdx); };
-
const DimVector &massFractionCompGGrad(int phaseIdx) const
{ return massFractionCompGGrad_[phaseIdx]; };
-
- /*!
- * \brief The molar concentration gradients of the components in a phase.
- */
- DUNE_DEPRECATED_MSG("use moleFractionCompWGrad instead")
- const DimVector &molarWConcGrad(int phaseIdx) const
- { moleFractionCompWGrad(phaseIdx); };
-
const DimVector &moleFractionCompWGrad(int phaseIdx) const
{ return moleFractionCompWGrad_[phaseIdx]; };
- DUNE_DEPRECATED_MSG("use moleFractionCompNGrad instead")
- const DimVector &molarCConcGrad(int phaseIdx) const
- { moleFractionCompNGrad(phaseIdx); };
-
const DimVector &moleFractionCompNGrad(int phaseIdx) const
{ return moleFractionCompNGrad_[phaseIdx]; };
- DUNE_DEPRECATED_MSG("use moleFractionCompGGrad instead")
- const DimVector &molarAConcGrad(int phaseIdx) const
- { moleFractionCompGGrad(phaseIdx); };
-
const DimVector &moleFractionCompGGrad(int phaseIdx) const
{ return moleFractionCompGGrad_[phaseIdx]; };
diff --git a/dumux/boxmodels/3p3c/3p3cindices.hh b/dumux/boxmodels/3p3c/3p3cindices.hh
index d71ca69d17..33935edd82 100644
--- a/dumux/boxmodels/3p3c/3p3cindices.hh
+++ b/dumux/boxmodels/3p3c/3p3cindices.hh
@@ -53,9 +53,6 @@ public:
static const int nCompIdx = FluidSystem::nCompIdx;
static const int gCompIdx = FluidSystem::gCompIdx;
- static const int cCompIdx = nCompIdx; //!< DEPRECATED index of the NAPL component
- static const int aCompIdx = gCompIdx; //!< DEPRECATED index of the air component
-
// present phases (-> 'pseudo' primary variable)
static const int threePhases = 1; //!< All three phases are present
static const int wPhaseOnly = 2; //!< Only the water phase is present
@@ -78,9 +75,9 @@ public:
static const int conti1EqIdx = conti0EqIdx + nCompIdx; //!< Index of the mass conservation equation for the contaminant component
static const int conti2EqIdx = conti0EqIdx + gCompIdx; //!< Index of the mass conservation equation for the gas component
- static const int contiWEqIdx = conti0EqIdx + wCompIdx; //!< DEPRECATED index of the mass conservation equation for the water component
- static const int contiCEqIdx = conti0EqIdx + cCompIdx; //!< DEPRECATED index of the mass conservation equation for the contaminant component
- static const int contiAEqIdx = conti0EqIdx + aCompIdx; //!< DEPRECATED index of the mass conservation equation for the air component
+ static const int contiWEqIdx = conti0EqIdx + wCompIdx; //!< index of the mass conservation equation for the water component
+ static const int contiNEqIdx = conti0EqIdx + nCompIdx; //!< index of the mass conservation equation for the contaminant component
+ static const int contiGEqIdx = conti0EqIdx + gCompIdx; //!< index of the mass conservation equation for the air component
};
}
diff --git a/dumux/boxmodels/3p3c/3p3cmodel.hh b/dumux/boxmodels/3p3c/3p3cmodel.hh
index 7064f4c6f2..c12cadbb93 100644
--- a/dumux/boxmodels/3p3c/3p3cmodel.hh
+++ b/dumux/boxmodels/3p3c/3p3cmodel.hh
@@ -31,7 +31,6 @@
#include "3p3cproperties.hh"
#include "3p3clocalresidual.hh"
-// #include "3p3cproblem.hh"
namespace Dumux
{
@@ -208,21 +207,6 @@ public:
resetPhasePresence_();
};
- /*!
- * \brief Returns the relative weight of a primary variable for
- * calculating relative errors.
- *
- * \param globalVertexIdx The global vertex index
- * \param pvIdx The primary variable index
- */
- DUNE_DEPRECATED
- Scalar primaryVarWeight(int globalVertexIdx, int pvIdx) const
- {
- if (Indices::pressureIdx == pvIdx)
- return std::min(1.0/this->prevSol()[globalVertexIdx][pvIdx], 1.0);
- return 1;
- }
-
/*!
* \brief Called by the problem if a time integration was
* successful, post processing of the solution is done and the
diff --git a/dumux/boxmodels/3p3c/3p3cproperties.hh b/dumux/boxmodels/3p3c/3p3cproperties.hh
index 4a3542776e..9c0e3b0a3d 100644
--- a/dumux/boxmodels/3p3c/3p3cproperties.hh
+++ b/dumux/boxmodels/3p3c/3p3cproperties.hh
@@ -47,20 +47,16 @@ NEW_TYPE_TAG(BoxThreePThreeC, INHERITS_FROM(BoxModel));
NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
NEW_PROP_TAG(NumComponents); //!< Number of fluid components in the system
-NEW_PROP_TAG(ThreePThreeCIndices); //!< DEPRECATED Enumerations for the 3p3c models
NEW_PROP_TAG(Indices); //!< Enumerations for the model
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters
NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
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(EnableGravity); //!< DEPRECATED 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(MassUpwindWeight); //!< DEPRECATED The value of the upwind parameter for the mobility
NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether a constraint solver should be used explicitly
NEW_PROP_TAG(BaseFluxVariables); //! The base flux variables
}
diff --git a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
index e3c77d2e12..833378df18 100644
--- a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
+++ b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
@@ -111,8 +111,7 @@ SET_TYPE_PROP(BoxThreePThreeC, FluxVariables, ThreePThreeCFluxVariables<TypeTag>
SET_TYPE_PROP(BoxThreePThreeC, BaseFluxVariables, BoxDarcyFluxVariables<TypeTag>);
//! the upwind factor for the mobility.
-SET_SCALAR_PROP(BoxThreePThreeC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, MassUpwindWeight));
-SET_SCALAR_PROP(BoxThreePThreeC, MassUpwindWeight, 1.0);
+SET_SCALAR_PROP(BoxThreePThreeC, ImplicitMassUpwindWeight, 1.0);
//! set default mobility upwind weight to 1.0, i.e. fully upwind
SET_SCALAR_PROP(BoxThreePThreeC, ImplicitMobilityUpwindWeight, 1.0);
@@ -121,17 +120,14 @@ SET_SCALAR_PROP(BoxThreePThreeC, ImplicitMobilityUpwindWeight, 1.0);
SET_BOOL_PROP(BoxThreePThreeC, UseConstraintSolver, false);
//! The indices required by the isothermal 3p3c model
-SET_TYPE_PROP(BoxThreePThreeC, Indices, typename GET_PROP_TYPE(TypeTag, ThreePThreeCIndices));
-SET_TYPE_PROP(BoxThreePThreeC, ThreePThreeCIndices, ThreePThreeCIndices<TypeTag, /*PVOffset=*/0>);//DEPRECATED
+SET_TYPE_PROP(BoxThreePThreeC, Indices, ThreePThreeCIndices<TypeTag, /*PVOffset=*/0>);
//! The spatial parameters to be employed.
//! Use BoxSpatialParams by default.
-SET_TYPE_PROP(BoxThreePThreeC, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
-SET_TYPE_PROP(BoxThreePThreeC, SpatialParameters, BoxSpatialParams<TypeTag>);//DEPRECATED
+SET_TYPE_PROP(BoxThreePThreeC, SpatialParams, BoxSpatialParams<TypeTag>);
// enable gravity by default
-SET_BOOL_PROP(BoxThreePThreeC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
-SET_BOOL_PROP(BoxThreePThreeC, EnableGravity, true);//DEPRECATED
+SET_BOOL_PROP(BoxThreePThreeC, ProblemEnableGravity, true);
}
}
--
GitLab