Commit a8d51db4 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

box common: remove everything deprecated during 2.2-svn. This mainly includes...

box common: remove everything deprecated during 2.2-svn. This mainly includes property, parameter and member function names. Reviewed by Christoph

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9314 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 6d1811ec
......@@ -305,16 +305,6 @@ protected:
return *elemPtr_;
};
/*!
* \brief Returns a reference to the element.
*/
DUNE_DEPRECATED_MSG("use element_() instead")
const Element &elem_() const
{
Valgrind::CheckDefined(elemPtr_);
return *elemPtr_;
};
/*!
* \brief Returns a reference to the model.
*/
......
......@@ -624,13 +624,6 @@ protected:
return *elemPtr_;
}
/*!
* \brief Returns a reference to the current element.
*/
DUNE_DEPRECATED_MSG("use element_ instead")
const Element &elem_() const
{ return element_();}
/*!
* \brief Returns a reference to the current element's finite
* volume geometry.
......@@ -641,14 +634,6 @@ protected:
return *fvElemGeomPtr_;
}
/*!
* \brief Returns a reference to the current element's finite
* volume geometry.
*/
DUNE_DEPRECATED_MSG("use fvGeometry_ instead")
const FVElementGeometry &fvElemGeom_() const
{ return fvGeometry_(); }
/*!
* \brief Returns a reference to the primary variables of
* the last time step of the i'th
......@@ -659,17 +644,6 @@ protected:
return prevVolVars_(i).priVars();
}
/*!
* \brief Returns a reference to the primary variables of
* the last time step of the i'th
* sub-control volume of the current element.
*/
DUNE_DEPRECATED_MSG("use prevPriVars_ instead")
const PrimaryVariables &prevPrimaryVars_(const int i) const
{
return prevPriVars_(i);
}
/*!
* \brief Returns a reference to the primary variables of the i'th
* sub-control volume of the current element.
......@@ -679,16 +653,6 @@ protected:
return curVolVars_(i).priVars();
}
/*!
* \brief Returns a reference to the primary variables of the i'th
* sub-control volume of the current element.
*/
DUNE_DEPRECATED_MSG("use curPriVars_ instead")
const PrimaryVariables &curPrimaryVars_(const int i) const
{
return curPriVars_(i);
}
/*!
* \brief Returns the j'th primary of the i'th sub-control volume
* of the current element.
......@@ -698,16 +662,6 @@ protected:
return curVolVars_(i).priVar(j);
}
/*!
* \brief Returns the j'th primary of the i'th sub-control volume
* of the current element.
*/
DUNE_DEPRECATED_MSG("use curPriVar_ instead")
Scalar curPrimaryVar_(const int i, const int j) const
{
return curPriVar_(i, j);
}
/*!
* \brief Returns a reference to the current volume variables of
* all sub-control volumes of the current element.
......
......@@ -352,19 +352,6 @@ public:
const LocalResidual &localResidual() const
{ return localJacobian().localResidual(); }
/*!
* \brief Returns the relative weight of a primary variable for
* calculating relative errors.
*
* \param vertIdx The global index of the control volume
* \param pvIdx The index of the primary variable
*/
DUNE_DEPRECATED
Scalar primaryVarWeight(const int vertIdx, const int pvIdx) const
{
return 1.0/std::max(std::abs(this->prevSol()[vertIdx][pvIdx]), 1.0);
}
/*!
* \brief Returns the relative error between two vectors of
* primary variables.
......
......@@ -90,21 +90,18 @@ NEW_PROP_TAG(NewtonController); //!< The type of the newton controller
//! Specify whether the jacobian matrix of the last iteration of a
//! time step should be re-used as the jacobian of the first iteration
//! of the next time step.
NEW_PROP_TAG(EnableJacobianRecycling);//DEPRECATED
NEW_PROP_TAG(ImplicitEnableJacobianRecycling);
//! Specify whether the jacobian matrix should be only reassembled for
//! elements where at least one vertex is above the specified
//! tolerance
NEW_PROP_TAG(ImplicitEnablePartialReassemble);
NEW_PROP_TAG(EnablePartialReassemble);//DEPRECATED
/*!
* \brief Specify the maximum size of a time integration [s].
*
* The default is to not limit the step size.
*/
NEW_PROP_TAG(TimeManagerMaxTimeStepSize);
NEW_PROP_TAG(MaxTimeStepSize);//DEPRECATED
/*!
* \brief Specify which kind of method should be used to numerically
......@@ -114,7 +111,7 @@ NEW_PROP_TAG(MaxTimeStepSize);//DEPRECATED
* forward differences. By default we use central differences.
*/
NEW_PROP_TAG(ImplicitNumericDifferenceMethod);
NEW_PROP_TAG(NumericDifferenceMethod);//DEPRECATED
/*!
* \brief Specify whether to use the already calculated solutions as
* starting values of the volume variables.
......@@ -124,7 +121,6 @@ NEW_PROP_TAG(NumericDifferenceMethod);//DEPRECATED
* solver converges faster).
*/
NEW_PROP_TAG(ImplicitEnableHints);
NEW_PROP_TAG(EnableHints);//DEPRECATED
//! indicates whether two-point flux should be used
NEW_PROP_TAG(ImplicitUseTwoPointFlux);
......
......@@ -157,30 +157,19 @@ SET_TYPE_PROP(BoxModel,
SET_TYPE_PROP(BoxModel, JacobianAssembler, Dumux::BoxAssembler<TypeTag>);
//! use an unlimited time step size by default
#if 0
// requires GCC 4.6 and above to call the constexpr function of
// numeric_limits
SET_SCALAR_PROP(BoxModel, MaxTimeStepSize, std::numeric_limits<Scalar>::infinity());//DEPRECATED
#else
SET_SCALAR_PROP(BoxModel, MaxTimeStepSize, 1e100);//DEPRECATED
#endif
SET_SCALAR_PROP(BoxModel, TimeManagerMaxTimeStepSize, GET_PROP_VALUE(TypeTag, MaxTimeStepSize));
SET_SCALAR_PROP(BoxModel, TimeManagerMaxTimeStepSize, 1e100);
//! use forward differences to calculate the jacobian by default
SET_INT_PROP(BoxModel, ImplicitNumericDifferenceMethod, GET_PROP_VALUE(TypeTag, NumericDifferenceMethod));
SET_INT_PROP(BoxModel, NumericDifferenceMethod, +1);//DEPRECATED
SET_INT_PROP(BoxModel, ImplicitNumericDifferenceMethod, +1);
//! do not use hints by default
SET_BOOL_PROP(BoxModel, ImplicitEnableHints, GET_PROP_VALUE(TypeTag, EnableHints));
SET_BOOL_PROP(BoxModel, EnableHints, false);//DEPRECATED
SET_BOOL_PROP(BoxModel, ImplicitEnableHints, false);
// disable jacobian matrix recycling by default
SET_BOOL_PROP(BoxModel, ImplicitEnableJacobianRecycling, GET_PROP_VALUE(TypeTag, EnableJacobianRecycling));
SET_BOOL_PROP(BoxModel, EnableJacobianRecycling, false);//DEPRECATED
SET_BOOL_PROP(BoxModel, ImplicitEnableJacobianRecycling, false);
// disable partial reassembling by default
SET_BOOL_PROP(BoxModel, ImplicitEnablePartialReassemble, GET_PROP_VALUE(TypeTag, EnablePartialReassemble));
SET_BOOL_PROP(BoxModel, EnablePartialReassemble, false);//DEPRECATED
SET_BOOL_PROP(BoxModel, ImplicitEnablePartialReassemble, false);
// disable two-point-flux by default
SET_BOOL_PROP(BoxModel, ImplicitUseTwoPointFlux, false);
......
......@@ -136,13 +136,6 @@ public:
const PrimaryVariables &priVars() const
{ return priVars_; }
/*!
* \brief Return the vector of primary variables
*/
DUNE_DEPRECATED_MSG("use priVars instead")
const PrimaryVariables &primaryVars() const
{ return priVars(); }
/*!
* \brief Return a component of primary variable vector
*
......@@ -153,17 +146,6 @@ public:
return priVars_[pvIdx];
}
/*!
* \brief Return a component of primary variable vector
*
* \param pvIdx The index of the primary variable of interest
*/
DUNE_DEPRECATED_MSG("use priVar instead")
Scalar primaryVar(const int pvIdx) const
{
return priVar(pvIdx);
}
/*!
* \brief Return how much the sub-control volume is extruded.
*
......
......@@ -34,7 +34,6 @@ namespace Properties
{
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters object
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
}
/*!
......@@ -170,20 +169,12 @@ public:
SpatialParams &spatialParams()
{ return *spatialParams_; }
DUNE_DEPRECATED_MSG("use spatialParams instead")
SpatialParams &spatialParameters()
{ return spatialParams(); }
/*!
* \brief Returns the spatial parameters object.
*/
const SpatialParams &spatialParams() const
{ return *spatialParams_; }
DUNE_DEPRECATED_MSG("use spatialParams instead")
const SpatialParams &spatialParameters() const
{ return spatialParams(); }
// \}
protected:
......
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