From 4440f0328ee6edd36bd0ece83ae09685f6726778 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Mon, 13 Apr 2020 18:52:52 +0200
Subject: [PATCH] [cleanup] Remove deprecated diffcoeff interfaces in volvars
---
.../freeflow/compositional/volumevariables.hh | 24 -------------------
.../porousmediumflow/1pnc/volumevariables.hh | 7 ------
.../porousmediumflow/2p2c/volumevariables.hh | 7 ------
.../porousmediumflow/2pnc/volumevariables.hh | 13 ----------
.../porousmediumflow/3p3c/volumevariables.hh | 12 ----------
.../3pwateroil/volumevariables.hh | 7 ------
dumux/porousmediumflow/co2/volumevariables.hh | 12 ----------
.../porousmediumflow/mpnc/volumevariables.hh | 24 -------------------
.../richards/volumevariables.hh | 13 ----------
.../richardsnc/volumevariables.hh | 10 --------
.../tracer/volumevariables.hh | 7 ------
11 files changed, 136 deletions(-)
diff --git a/dumux/freeflow/compositional/volumevariables.hh b/dumux/freeflow/compositional/volumevariables.hh
index f35e1305d9..6b6f096b80 100644
--- a/dumux/freeflow/compositional/volumevariables.hh
+++ b/dumux/freeflow/compositional/volumevariables.hh
@@ -249,36 +249,12 @@ public:
Scalar averageMolarMass(const int phaseIdx = 0) const
{ return fluidState_.averageMolarMass(phaseIdx); }
- /*!
- * \brief Returns the diffusion coefficient \f$\mathrm{[m^2/s]}\f$
- *
- * \param compIIdx the index of the component which diffusive
- * \param compJIdx the index of the component with respect to which compIIdx diffuses
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int compIIdx, int compJIdx = 0) const
- {
- if (compIIdx == compJIdx)
- DUNE_THROW(Dune::InvalidStateException, "Diffusion coefficient called for compIIdx = compJIdx");
- return diffCoefficient_(0, compIIdx, compJIdx);
- }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
Scalar diffusionCoefficient(int phaseIdx, int compIIdx, int compJIdx) const
{ return diffCoefficient_(0, compIIdx, compJIdx); }
- /*!
- * \brief Returns the effective diffusion coefficient \f$\mathrm{[m^2/s]}\f$
- *
- * \param compIIdx the index of the component which diffusive
- * \param compJIdx the index of the component with respect to which compIIdx diffuses
- */
- [[deprecated("Signature deprecated. Use effectiveDiffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar effectiveDiffusivity(int compIIdx, int compJIdx = 0) const
- { return diffusionCoefficient(compIIdx, compJIdx); }
-
/*!
* \brief Returns the effective diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/1pnc/volumevariables.hh b/dumux/porousmediumflow/1pnc/volumevariables.hh
index d23e1508c5..58e84c9ba0 100644
--- a/dumux/porousmediumflow/1pnc/volumevariables.hh
+++ b/dumux/porousmediumflow/1pnc/volumevariables.hh
@@ -311,13 +311,6 @@ public:
Scalar porosity() const
{ return solidState_.porosity(); }
- /*!
- * \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- { return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx); }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/2p2c/volumevariables.hh b/dumux/porousmediumflow/2p2c/volumevariables.hh
index d37485441d..e1d2f4a301 100644
--- a/dumux/porousmediumflow/2p2c/volumevariables.hh
+++ b/dumux/porousmediumflow/2p2c/volumevariables.hh
@@ -370,13 +370,6 @@ public:
const PermeabilityType& permeability() const
{ return permeability_; }
- /*!
- * \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- { return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx); }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/2pnc/volumevariables.hh b/dumux/porousmediumflow/2pnc/volumevariables.hh
index 564571423c..adca768233 100644
--- a/dumux/porousmediumflow/2pnc/volumevariables.hh
+++ b/dumux/porousmediumflow/2pnc/volumevariables.hh
@@ -435,19 +435,6 @@ public:
const PermeabilityType& permeability() const
{ return permeability_; }
-
- /*!
- * \brief Returns the diffusion coefficient
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- {
- if (compIdx != phaseIdx)
- return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx);
- else
- DUNE_THROW(Dune::InvalidStateException, "Diffusion coefficient called for phaseIdx = compIdx");
- }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/3p3c/volumevariables.hh b/dumux/porousmediumflow/3p3c/volumevariables.hh
index 3347dbd3ed..02858fbb7b 100644
--- a/dumux/porousmediumflow/3p3c/volumevariables.hh
+++ b/dumux/porousmediumflow/3p3c/volumevariables.hh
@@ -705,18 +705,6 @@ public:
const PermeabilityType& permeability() const
{ return permeability_; }
- /*!
- * \brief Returns the diffusion coefficient
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- {
- if (compIdx != phaseIdx)
- return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx);
- else
- DUNE_THROW(Dune::InvalidStateException, "Diffusion coefficient called for phaseIdx = compIdx");
- }
-
/*
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/3pwateroil/volumevariables.hh b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
index 7af61a9a95..a97072432a 100644
--- a/dumux/porousmediumflow/3pwateroil/volumevariables.hh
+++ b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
@@ -894,13 +894,6 @@ public:
Scalar permeability() const
{ return permeability_; }
- /*!
- * \brief Returns the diffusion coefficient
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- { return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx); }
-
/*
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/co2/volumevariables.hh b/dumux/porousmediumflow/co2/volumevariables.hh
index 0e0b80d7c3..5102cc0abc 100644
--- a/dumux/porousmediumflow/co2/volumevariables.hh
+++ b/dumux/porousmediumflow/co2/volumevariables.hh
@@ -453,18 +453,6 @@ public:
const PermeabilityType& permeability() const
{ return permeability_; }
- /*!
- * \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- {
- if (phaseIdx == compIdx)
- DUNE_THROW(Dune::InvalidStateException, "Diffusion coefficient called for phaseIdx = compIdx");
- else
- return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx);
- }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/mpnc/volumevariables.hh b/dumux/porousmediumflow/mpnc/volumevariables.hh
index 2e994c6b12..6a8266bc13 100644
--- a/dumux/porousmediumflow/mpnc/volumevariables.hh
+++ b/dumux/porousmediumflow/mpnc/volumevariables.hh
@@ -419,18 +419,6 @@ public:
>= 0;
}
- /*!
- * \brief Returns the diffusion coefficient
- */
- [[deprecated("Signature deprecated. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- {
- if (compIdx != phaseIdx)
- return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx);
- else
- DUNE_THROW(Dune::InvalidStateException, "Diffusion coefficient called for phaseIdx = compIdx");
- }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
@@ -926,18 +914,6 @@ public:
>= 0;
}
- /*!
- * \brief Returns the diffusion coefficient
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- {
- if (compIdx != phaseIdx)
- return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx);
- else
- DUNE_THROW(Dune::InvalidStateException, "Diffusion coefficient called for phaseIdx = compIdx");
- }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/richards/volumevariables.hh b/dumux/porousmediumflow/richards/volumevariables.hh
index 7fe5a2f6bd..bba813fb30 100644
--- a/dumux/porousmediumflow/richards/volumevariables.hh
+++ b/dumux/porousmediumflow/richards/volumevariables.hh
@@ -474,19 +474,6 @@ public:
return molarDensity_[phaseIdx];
}
- /*!
- * \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
- *
- * \param phaseIdx The phase index
- * \param compIdx The component index
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- {
- assert(enableWaterDiffusionInAir() && phaseIdx == FluidSystem::gasPhaseIdx && compIdx == FluidSystem::comp0Idx);
- return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx);
- }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/richardsnc/volumevariables.hh b/dumux/porousmediumflow/richardsnc/volumevariables.hh
index cd4dbdead4..0463346001 100644
--- a/dumux/porousmediumflow/richardsnc/volumevariables.hh
+++ b/dumux/porousmediumflow/richardsnc/volumevariables.hh
@@ -394,16 +394,6 @@ public:
Scalar molarity(const int phaseIdx, const int compIdx) const
{ return phaseIdx == 0 ? this->fluidState_.molarity(phaseIdx, compIdx) : 0.0; }
- /*!
- * \brief Returns the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ in the fluid.
- *
- * \param phaseIdx The index of the phase.
- * \param compIdx The index of the component
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(const int phaseIdx, const int compIdx) const
- { return diffusionCoefficient(phaseIdx, FluidSystem::getMainComponent(phaseIdx), compIdx);}
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
diff --git a/dumux/porousmediumflow/tracer/volumevariables.hh b/dumux/porousmediumflow/tracer/volumevariables.hh
index e0dff54ff3..1dc93f5c3c 100644
--- a/dumux/porousmediumflow/tracer/volumevariables.hh
+++ b/dumux/porousmediumflow/tracer/volumevariables.hh
@@ -185,13 +185,6 @@ public:
Scalar molarity(int phaseIdx, int compIdx) const
{ return moleFraction(phaseIdx, compIdx)*molarDensity(); }
- /*!
- * \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
- */
- [[deprecated("Will be removed after release 3.2. Use diffusionCoefficient(phaseIdx, compIIdx, compJIdx)!")]]
- Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
- { return diffCoeff_[compIdx]; }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
--
GitLab