diff --git a/dumux/freeflow/compositional/volumevariables.hh b/dumux/freeflow/compositional/volumevariables.hh index f35e1305d9f347a5631b438a77c27c1024537156..6b6f096b8031cf72e1489b13f9c990f07ce07fb1 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 d23e1508c550ded9b63066528974d7c6e09b88bd..58e84c9ba00799d972111150e765a3047eb09c51 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 d37485441dbc0e180d03fa313955fb3ae815b02f..e1d2f4a3018b5b9a7b2ffe24016724fb62b3e743 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 564571423c1e179ac20c335a2439c2e672cf48b7..adca768233fe9237a4bdaf4ccee486f700808b5c 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 3347dbd3eddebc7a6c9bf033efbd212a02bef722..02858fbb7b1dfbeeccd8f13b5c375482672c9acb 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 7af61a9a95713d7a61c843ce5791202c522bc11b..a97072432a8eac297ae9822d81d515d6248af331 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 0e0b80d7c3ccf1d73dd791c22dcb09c867c8be51..5102cc0abcb1b24fa9071750882f1380a8a1ced8 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 2e994c6b122da91d1ee0cbbbddc45e549c4e8044..6a8266bc13d7b084d06cb5d0fc27400a28968d25 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 7fe5a2f6bdbf97ee30620be247fbd563c4d28aa8..bba813fb30b9e1758d83f39e1242331de4204351 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 cd4dbdead440052a902431a904dd96743db88262..0463346001c9f195bba8836ca956943705521014 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 e0dff54ff39d7791361879e91111aaa87f923213..1dc93f5c3c3b4118dc747ef17d5b3418cf1c9d6a 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$. */