deprecate R4

pyXSteam/Constants.py

@@ -48,6 +48,19 @@
 __CRITICAL_TEMPERATURE_IAPWS_R15_11__ = 647.096  # K
 __CRITICAL_DENSITY_IAPWS_R15_11__ = 322.0  # kg m^-1
 
+# IAPWS R17 and IAPWS R18
+__REFERENCE_TEMPERATURE_D20_R17_R18__ = 643.847  # T* in K
+__REFERENCE_PREASSURE_D20_R17_R18__ = 21.6618  # p* in MPa
+__REFERENCE_DENSITY_D20_R17_R18__ = 356.0  # ρ* in kg m-3
+__REFERENCE_VISCOSITY_D20_R17_R18__ = 1.00e-6  # μ* Pa s
+__REFERENCE_THERMAL_CONDUCTIVITY_D20_R18__ = 1e-3  #  λ* in W m-1 K-1
+__SPECIFIC_GAS_CONSTANT_D20_R17_R18__ = 0.41515199  # R in kJ kg-1 K-1
+
+
+# https://doi.org/10.1063/1.5053993
+__TRIPLE_POINT_TEMPERATURE_D2O_RESHW_2018__ = 276.969  # K
+__TRIPLE_POINT_PRESSURE_D20_RESHW_2018__ = 0.00061159  # MPa
+
 
 class UnitSystem(IntEnum):
     """enum for supported unit systems"""

pyXSteam/IAPWS_R4.py

@@ -11,6 +11,10 @@
 logger = logging.getLogger(__name__)
 
 
+def myHW_rhoT(rho: float, T: float) -> float:
+    pass
+
+
 def myHW_rhoT_R4(rho: float, T: float) -> float:
     """
     Viscosity as a function of density and temperature for heavy water substance.
@@ -21,6 +25,7 @@ def myHW_rhoT_R4(rho: float, T: float) -> float:
 
     :return: viscosity µ or NaN if arguments are out of range, in [Pa s]
     """
+    raise DeprecationWarning("R4-84 was superseeded by R17 and R18!")
     logger.debug("calculating 'viscosity of heavy water' for ρ=%f and T=%f", rho, T)
 
     T_star = 643.847  # K
@@ -78,6 +83,7 @@ def tcHW_rhoT_R4(rho: float, T: float) -> float:
 
     :return: thermal conductivity λ or NaN, in [W / (m * K)]
     """
+    raise DeprecationWarning("R4-84 was superseeded by R17 and R18!")
     logger.debug("calculating 'thermal conductivity of heavy water' for ρ=%f and T=%f", rho, T)
 
     T_star = 643.847  # K