Commit 4440f032 authored by Timo Koch's avatar Timo Koch
Browse files

[cleanup] Remove deprecated diffcoeff interfaces in volvars

parent 6eb95bad
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
......@@ -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$.
*/
......
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