Commit 9df94ce9 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Deprecate tortuosity and CellData2P2Cmultiphysics.

They were only deprecated by a comment, now warnings
are emitted.
(reviewed by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13750 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 0ef11e1b
Differences Between DuMuX 2.6 and DuMuX 2.7
===================================================
* Deprecated CLASSES/FILES, to be removed after 2.6:
- CellData2P2Cmultiphysics, replaced by CellData2P2CMultiPhysics
* Deprecated MEMBER FUNCTIONS, to be removed after 2.6:
- The 1p2c volume variables no longer use the method tortuosity() from
spatial params class, the value is now calculated within the effective
diffusivity model. Thus the method is deprecated in the spacial params
classes FVSpatialParamsOneP and ImplicitSpatialParamsOneP.
* DELETED classes/files, property names, constants/enums,
member functions, which have been deprecated in DuMuX 2.6:
......
......@@ -38,7 +38,7 @@ namespace Dumux
* @tparam TypeTag The Type Tag
*/
template<class TypeTag>
class CellData2P2CAdaptive: public CellData2P2Cmultiphysics<TypeTag>
class CellData2P2CAdaptive: public CellData2P2CMultiPhysics<TypeTag>
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
......@@ -106,7 +106,7 @@ public:
//! Constructs an adaptive CellData object
CellData2P2CAdaptive() : CellData2P2Cmultiphysics<TypeTag>()
CellData2P2CAdaptive() : CellData2P2CMultiPhysics<TypeTag>()
{
for (int i = 0; i < numPhases;i++)
upwindError_[i] = 0;
......
......@@ -19,6 +19,8 @@
#ifndef DUMUX_ELEMENTDATA2P2C_MULTYPHYSICS_HH
#define DUMUX_ELEMENTDATA2P2C_MULTYPHYSICS_HH
#include <dune/common/deprecated.hh>
#include "2p2cproperties.hh"
#include "celldata2p2c.hh"
#include <dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh>
......@@ -317,10 +319,11 @@ public:
};
template<class TypeTag>
class CellData2P2Cmultiphysics : public CellData2P2CMultiPhysics<TypeTag>
class DUNE_DEPRECATED_MSG("Use CellData2P2CMultiPhysics instead")
CellData2P2Cmultiphysics : public CellData2P2CMultiPhysics<TypeTag>
{
public:
//! DEPRECATED!! Constructor for a local storage object
//! Constructor for a local storage object
CellData2P2Cmultiphysics() : CellData2P2CMultiPhysics<TypeTag>()
{}
};
......
......@@ -91,13 +91,6 @@ public:
completeFluidState(priVars, problem, element, fvGeometry, scvIdx, fluidState_);
porosity_ = problem.spatialParams().porosity(element, fvGeometry, scvIdx);
tortuosity_ = problem.spatialParams().tortuosity(element, fvGeometry, scvIdx);
if (tortuosity_ > 0)
{
std::cerr << "ERROR: You are still using the tortuosity method in your spatialParams, which is not used anymore.\n"
<< "Please remove it, the calculation is done within the effective diffusivity model.\n";
exit(1);
}
dispersivity_ = problem.spatialParams().dispersivity(element, fvGeometry, scvIdx);
......@@ -281,7 +274,6 @@ protected:
{ }
Scalar porosity_; //!< Effective porosity within the control volume
Scalar tortuosity_;
GlobalPosition dispersivity_;
Scalar diffCoeff_;
FluidState fluidState_;
......
......@@ -31,6 +31,7 @@
#include <dumux/common/basicproperties.hh>
#include <dune/common/deprecated.hh>
#include <dune/common/fmatrix.hh>
namespace Dumux
......@@ -199,8 +200,7 @@ public:
"a porosityAtPos() method.");
}
// PRELIMINARY FUNCTION! DEPRECATED WHEN CREATED
double tortuosity(const Element &element) const
double DUNE_DEPRECATED tortuosity(const Element &element) const
{
return -1;
}
......
......@@ -31,6 +31,7 @@
#include <dumux/implicit/common/implicitproperties.hh>
#include <dune/common/deprecated.hh>
#include <dune/common/fmatrix.hh>
namespace Dumux {
......@@ -198,8 +199,7 @@ public:
}
}
// PRELIMINARY FUNCTION! DEPRECATED WHEN CREATED
double tortuosity(const Element &element,
double DUNE_DEPRECATED tortuosity(const Element &element,
const FVElementGeometry &fvGeometry,
const int scvIdx) const
{
......
Markdown is supported
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