--- trunk/libf/phylmd/yoethf.f90	2010/12/21 15:45:48	37
+++ trunk/phylmd/yoethf.f90	2019/06/13 14:40:06	328
@@ -1,17 +1,22 @@
-module yoethf
+module yoethf_m
 
-  ! From phylmd/yoethf.inc,v 1.1.1.1 2004/05/19 12:53:09
-  ! DERIVED CONSTANTS SPECIFIC TO ECMWF THERMODYNAMICS
+  ! From phylmd/yoethf.inc, version 1.1.1.1 2004/05/19 12:53:09
+  ! Derived constants specific to ECMWF thermodynamics
 
-  implicit none
+  use SUPHEC_M, only: ratm, rcpd, rcpv, rd, restt, rtt, rv
 
-  REAL R2ES, R3LES, R3IES, R4LES, R4IES, R5LES, R5IES
-  ! CONSTANTS USED FOR COMPUTATION OF SATURATION MIXING RATIO OVER
-  ! LIQUID WATER (R_LES) OR ICE (R_IES)
+  implicit none
 
-  REAL RVTMP2 ! RCPV / RCPD - 1.
-  real RHOH2O ! DENSITY OF LIQUID WATER (RATM / 100.)
+  ! Constants used for computation of saturation mixing ratio over
+  ! liquid water (r.les) or ice (r.ies):
+  real, parameter:: R3LES = 17.269, R3IES = 21.875, R4LES = 35.86, R4IES = 7.66
+  real, parameter:: R5LES = R3LES * (RTT - R4LES)
+  real, parameter:: R5IES = R3IES * (RTT - R4IES)
+
+  real, parameter:: RVTMP2 = RCPV / RCPD - 1.
+  real, parameter:: RHOH2O = RATM / 100. ! density of liquid water
+  real, parameter:: R2ES = RESTT * RD / RV
 
-  save
+  private ratm, rcpd, rcpv, rd, restt, rtt, rv
 
-end module yoethf
+end module yoethf_m