From 41af18818d5cd094b7b50a15c3964147c5018f4e Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Mon, 11 Mar 2013 14:26:45 +0000
Subject: [PATCH] [Stokes] Remove deprecated stuff related to heatConductivity
and molarDensity. (reviewed by klaus)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10383 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/freeflow/stokes/stokesfluxvariables.hh | 13 -------------
dumux/freeflow/stokes/stokesvolumevariables.hh | 10 ----------
dumux/freeflow/stokes2c/stokes2cfluxvariables.hh | 6 +++---
.../stokes2cni/stokes2cnifluxvariables.hh | 4 ----
.../stokes2cni/stokes2cnivolumevariables.hh | 16 ++++++----------
5 files changed, 9 insertions(+), 40 deletions(-)
diff --git a/dumux/freeflow/stokes/stokesfluxvariables.hh b/dumux/freeflow/stokes/stokesfluxvariables.hh
index ca78e7c249..b9370e872f 100644
--- a/dumux/freeflow/stokes/stokesfluxvariables.hh
+++ b/dumux/freeflow/stokes/stokesfluxvariables.hh
@@ -84,7 +84,6 @@ protected:
DimVector tmp(0.0);
density_ = Scalar(0);
- molarDensity_ = Scalar(0);
viscosity_ = Scalar(0);
pressure_ = Scalar(0);
normalvelocity_ = Scalar(0);
@@ -100,8 +99,6 @@ protected:
// phase density and viscosity at IP
density_ += elemVolVars[idx].density() *
face().shapeValue[idx];
- molarDensity_ += elemVolVars[idx].molarDensity()*
- face().shapeValue[idx];
viscosity_ += elemVolVars[idx].viscosity() *
face().shapeValue[idx];
pressure_ += elemVolVars[idx].pressure() *
@@ -192,15 +189,6 @@ public:
Scalar density() const
{ return density_; }
- /*!
- * \brief Return the molar density \f$ \mathrm{[mol/m^3]} \f$ at the integration point.
- * \deprecated Use molarDensity() from Stokes2c model because it does not belong
- * to this model.
- */
- DUNE_DEPRECATED_MSG("Use molarDensity() from Stokes2c model")
- const Scalar molarDensity() const
- { return molarDensity_; }
-
/*!
* \brief Return the dynamic viscosity \f$ \mathrm{[Pa\cdot s]} \f$ at the integration
* point.
@@ -273,7 +261,6 @@ protected:
// values at the integration point
Scalar density_;
- Scalar molarDensity_; //!< \deprecated Does not belong to this model but to Stokes2c
Scalar viscosity_;
Scalar pressure_;
Scalar normalvelocity_;
diff --git a/dumux/freeflow/stokes/stokesvolumevariables.hh b/dumux/freeflow/stokes/stokesvolumevariables.hh
index 7d3e8b6ae4..0c3a045023 100644
--- a/dumux/freeflow/stokes/stokesvolumevariables.hh
+++ b/dumux/freeflow/stokes/stokesvolumevariables.hh
@@ -144,16 +144,6 @@ public:
Scalar density() const
{ return fluidState_.density(phaseIdx); }
- /*!
- * \brief Returns the molar density \f$\mathrm{[mol/m^3]}\f$ of the fluid within the
- * sub-control volume.
- * \deprecated Use molarDensity() from Stokes2c model because it does not belong
- * to this model.
- */
- DUNE_DEPRECATED_MSG("Use molarDensity() from Stokes2c model")
- Scalar molarDensity() const
- { return fluidState_.density(phaseIdx) / fluidState_.averageMolarMass(phaseIdx); }
-
/*!
* \brief Returns the fluid pressure \f$\mathrm{[Pa]}\f$ within
* the sub-control volume.
diff --git a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
index 511029f246..357e944a88 100644
--- a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
@@ -115,7 +115,7 @@ protected:
const Element &element,
const ElementVolumeVariables &elemVolVars)
{
- this->molarDensity_ = Scalar(0);
+ molarDensity_ = Scalar(0);
massFraction_ = Scalar(0);
diffusionCoeff_ = Scalar(0);
moleFractionGrad_ = Scalar(0);
@@ -125,7 +125,7 @@ protected:
idx < this->fvGeometry_.numVertices;
idx++) // loop over vertices of the element
{
- this->molarDensity_ += elemVolVars[idx].molarDensity()*
+ molarDensity_ += elemVolVars[idx].molarDensity()*
this->face().shapeValue[idx];
massFraction_ += elemVolVars[idx].fluidState().massFraction(phaseIdx, transportCompIdx) *
this->face().shapeValue[idx];
@@ -146,7 +146,7 @@ protected:
Valgrind::CheckDefined(moleFractionGrad_);
}
- // Scalar molarDensity_; //Use this variable after the deprecated one from StokesFluxVariables is removed + remove this-> before uses of molarDensity_ in this file
+ Scalar molarDensity_;
Scalar massFraction_;
Scalar diffusionCoeff_;
DimVector moleFractionGrad_;
diff --git a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
index 7c27b1d3c8..12b7a017a8 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
@@ -76,10 +76,6 @@ public:
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m*K)]}\f$ at the integration point.
*/
const Scalar thermalConductivity() const
- { return thermalConductivity_; }
-
- DUNE_DEPRECATED_MSG("use thermalConductivity() instead")
- const Scalar heatConductivity() const
{ return thermalConductivity_; }
/*!
diff --git a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
index 00931e6ef5..612d5f51c0 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
@@ -76,34 +76,30 @@ public:
fvGeometry,
scvIdx,
isOldSol);
- };
+ }
/*!
* \brief Returns the total internal energy of the fluid phase in the
* sub-control volume.
*/
Scalar internalEnergy() const
- { return this->fluidState_.internalEnergy(phaseIdx); };
+ { return this->fluidState_.internalEnergy(phaseIdx); }
/*!
* \brief Returns the total enthalpy of the fluid phase in the sub-control
* volume.
*/
Scalar enthalpy() const
- { return this->fluidState_.enthalpy(phaseIdx); };
+ { return this->fluidState_.enthalpy(phaseIdx); }
/*!
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m*K)]}\f$
* of the fluid phase in the sub-control volume.
*/
Scalar thermalConductivity() const
- {
- return FluidSystem::thermalConductivity(this->fluidState_, phaseIdx);
- };
-
- DUNE_DEPRECATED_MSG("use thermalConductivity() instead")
- Scalar heatConductivity() const
- { return thermalConductivity(); };
+ {
+ return FluidSystem::thermalConductivity(this->fluidState_, phaseIdx);
+ }
protected:
--
GitLab