From 23488530093d20f97fd86041851eb8f4f02c43fd Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 22 Oct 2013 08:48:39 +0000
Subject: [PATCH] remove deprecated stuff from dumux/material/components
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11761 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/material/components/iapws/region1.hh | 48 ---------------------
dumux/material/components/iapws/region2.hh | 49 ----------------------
2 files changed, 97 deletions(-)
diff --git a/dumux/material/components/iapws/region1.hh b/dumux/material/components/iapws/region1.hh
index b5aadcf13f..6fd3942f2f 100644
--- a/dumux/material/components/iapws/region1.hh
+++ b/dumux/material/components/iapws/region1.hh
@@ -98,12 +98,6 @@ public:
static Scalar dTau_dt(Scalar temperature)
{ return - 1386.0 / (temperature*temperature); }
- DUNE_DEPRECATED_MSG("use dTau_dt() instead")
- static Scalar dtau_dT(Scalar temperature)
- {
- return dTau_dt(temperature);
- }
-
/*!
* \brief Returns the reduced pressure for IAPWS region 1.
*
@@ -121,12 +115,6 @@ public:
static Scalar dPi_dp(Scalar pressure)
{ return 1.0 / 16.53e6; }
- DUNE_DEPRECATED_MSG("use dPi_dp() (capitalization) instead")
- static Scalar dpi_dp(Scalar pressure)
- {
- return dPi_dp(pressure);
- }
-
/*!
* \brief Returns the derivative of the pressure to the
* reduced pressure for IAPWS region 1 in \f$\mathrm{[Pa]}\f$.
@@ -136,12 +124,6 @@ public:
static Scalar dp_dPi(Scalar pressure)
{ return 16.53e6; }
- DUNE_DEPRECATED_MSG("use dp_dPi() (capitalization) instead")
- static Scalar dp_dpi(Scalar pressure)
- {
- return dp_dPi(pressure);
- }
-
/*!
* \brief The Gibbs free energy (dimensionless) for IAPWS region 1 (i.e. liquid)
*
@@ -194,12 +176,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use dGamma_dTau() (capitalization) instead")
- static Scalar dgamma_dtau(Scalar temperature, Scalar pressure)
- {
- return dGamma_dTau(temperature, pressure);
- }
-
/*!
* \brief The partial derivative of the Gibbs free energy to the
* normalized pressure for IAPWS region 1 (i.e. liquid) dimensionless).
@@ -228,12 +204,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use dGamma_dPi() (capitalization) instead")
- static Scalar dgamma_dpi(Scalar temperature, Scalar pressure)
- {
- return dGamma_dPi(temperature, pressure);
- }
-
/*!
* \brief The partial derivative of the Gibbs free energy to the
* normalized pressure and to the normalized temperature
@@ -264,12 +234,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use ddGamma_dTaudPi() (capitalization) instead")
- static Scalar ddgamma_dtaudpi(Scalar temperature, Scalar pressure)
- {
- return ddGamma_dTaudPi(temperature, pressure);
- }
-
/*!
* \brief The second partial derivative of the Gibbs free energy
* to the normalized pressure for IAPWS region 1
@@ -300,12 +264,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use ddGamma_ddPi() (capitalization) instead")
- static Scalar ddgamma_ddpi(Scalar temperature, Scalar pressure)
- {
- return ddGamma_ddPi(temperature, pressure);
- }
-
/*!
* \brief The second partial derivative of the Gibbs free energy to the
* normalized temperature for IAPWS region 1 (i.e. liquid) (dimensionless).
@@ -335,12 +293,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use ddGamma_ddTau() (capitalization) instead")
- static Scalar ddgamma_ddtau(Scalar temperature, Scalar pressure)
- {
- return ddGamma_ddTau(temperature, pressure);
- }
-
private:
static Scalar n(int i)
{
diff --git a/dumux/material/components/iapws/region2.hh b/dumux/material/components/iapws/region2.hh
index 1f39b9a433..81a1d8ac64 100644
--- a/dumux/material/components/iapws/region2.hh
+++ b/dumux/material/components/iapws/region2.hh
@@ -96,12 +96,6 @@ public:
static Scalar dTau_dt(Scalar temperature)
{ return - 540.0 / (temperature*temperature); }
- DUNE_DEPRECATED_MSG("use dTau_dt() instead")
- static Scalar dtau_dT(Scalar temperature)
- {
- return dTau_dt(temperature);
- }
-
/*!
* \brief Returns the reduced pressure (dimensionless) for IAPWS region 2.
*
@@ -119,12 +113,6 @@ public:
static Scalar dPi_dp(Scalar pressure)
{ return 1.0 / 1e6; }
- DUNE_DEPRECATED_MSG("use dPi_dp() (capitalization) instead")
- static Scalar dpi_dp(Scalar pressure)
- {
- return dPi_dp(pressure);
- }
-
/*!
* \brief Returns the derivative of the pressure to the
* reduced pressure for IAPWS region 2 (dimensionless).
@@ -134,12 +122,6 @@ public:
static Scalar dp_dPi(Scalar pressure)
{ return 1e6; }
- DUNE_DEPRECATED_MSG("use dp_dPi() (capitalization) instead")
- static Scalar dp_dpi(Scalar pressure)
- {
- return dp_dPi(pressure);
- }
-
/*!
* \brief The Gibbs free energy for IAPWS region 2 (i.e. sub-critical
* steam) (dimensionless).
@@ -210,12 +192,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use dGamma_dTau() (capitalization) instead")
- static Scalar dgamma_dtau(Scalar temperature, Scalar pressure)
- {
- return dGamma_dTau(temperature, pressure);
- }
-
/*!
* \brief The partial derivative of the Gibbs free energy to the
* normalized pressure for IAPWS region 2 (i.e. sub-critical
@@ -248,12 +224,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use dGamma_dPi() (capitalization) instead")
- static Scalar dgamma_dpi(Scalar temperature, Scalar pressure)
- {
- return dGamma_dPi(temperature, pressure);
- }
-
/*!
* \brief The partial derivative of the Gibbs free energy to the
* normalized pressure and to the normalized temperature
@@ -287,12 +257,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use ddGamma_dTaudPi() (capitalization) instead")
- static Scalar ddgamma_dtaudpi(Scalar temperature, Scalar pressure)
- {
- return ddGamma_dTaudPi(temperature, pressure);
- }
-
/*!
* \brief The second partial derivative of the Gibbs free energy
* to the normalized pressure for IAPWS region 2
@@ -326,12 +290,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use ddGamma_ddPi() (capitalization) instead")
- static Scalar ddgamma_ddpi(Scalar temperature, Scalar pressure)
- {
- return ddGamma_ddPi(temperature, pressure);
- }
-
/*!
* \brief The second partial derivative of the Gibbs free energy to the
* normalized temperature for IAPWS region 2 (i.e. sub-critical
@@ -372,13 +330,6 @@ public:
return result;
}
- DUNE_DEPRECATED_MSG("use ddGamma_ddTau() (capitalization) instead")
- static Scalar ddgamma_ddtau(Scalar temperature, Scalar pressure)
- {
- return ddGamma_ddTau(temperature, pressure);
- }
-
-
private:
static Scalar n_g(int i)
{
--
GitLab