--- trunk/Sources/phylmd/cv_thermo.f	2016/04/14 15:15:56	190
+++ trunk/phylmd/cv_thermo.f	2018/02/05 10:39:38	254
@@ -1,48 +1,19 @@
 module cv_thermo_m
 
   ! From LMDZ4/libf/phylmd/cvthermo.h, version 1.1.1.1 2004/05/19 12:53:09
-  ! Thermodynamical constants for convectL
+  ! Thermodynamical constants for cv_driver
+
+  use SUPHEC_M, only: rd, rg, rcpd, rcpv, rcw, rv
 
   implicit none
 
-  real cpd, cpv, cl, rrv, rrd, lv0, g, rowl, t0
-  real clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl
-  real eps, epsi, epsim1
-  real ginv, hrd
-  real grav
-
-contains
-
-  SUBROUTINE cv_thermo
-
-    ! Set thermodynamical constants for convectL
-
-    use SUPHEC_M, only: rcpd, rcpv, rcw, rd, rg, rlvtt, rv
-
-    !-----------------------------------------------------
-
-    cpd = RCPD
-    cpv = RCPV
-    cl  = RCW
-    rrv = RV
-    rrd = RD
-    lv0 = RLVTT
-    g   = RG
-    t0  = 273.15
-    grav= g
-
-    rowl=1000. ! (\`A quelle variable de SUPHEC_M cela correspond-il ?)
-    clmcpv=cl-cpv
-    clmcpd=cl-cpd
-    cpdmcp=cpd-cpv
-    cpvmcpd=cpv-cpd
-    cpvmcl=cl-cpv
-    eps=rrd/rrv
-    epsi=1.0/eps
-    epsim1=epsi-1.0
-    ginv=1.0/grav
-    hrd=0.5*rrd
+  real, parameter:: rowl = 1000., t0 = 273.15
+  real, parameter:: clmcpv = rcw - rcpv, clmcpd = rcw - rcpd
+  real, parameter:: cpdmcp = rcpd - rcpv
+  real, parameter:: cpvmcpd = rcpv - rcpd, cpvmcl = rcw - rcpv
+  real, parameter:: eps = rd / rv, epsi = 1. / eps, epsim1 = epsi - 1.
+  real, parameter:: ginv = 1. / rg, hrd = 0.5 * rd
 
-  end SUBROUTINE cv_thermo
+  private rd, rg, rcpd, rcpv, rcw, rv
 
 end module cv_thermo_m