--- trunk/Sources/phylmd/cv_thermo.f	2016/05/23 13:50:39	196
+++ trunk/Sources/phylmd/cv_thermo.f	2016/05/31 16:17:35	198
@@ -3,13 +3,18 @@
   ! From LMDZ4/libf/phylmd/cvthermo.h, version 1.1.1.1 2004/05/19 12:53:09
   ! Thermodynamical constants for cv_driver
 
+  use SUPHEC_M, only: rd, rg, rcpd, rcpv, rcw
+
   implicit none
 
-  real cpd, cpv, cl, rrv, rrd, lv0, g, rowl, t0
-  real clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl
+  real cpd, cpv, cl, rrv, rrd, rowl, t0
+  real, parameter:: clmcpv = rcw - rcpv, clmcpd = rcw - rcpd
+  real, parameter:: cpdmcp = rcpd - rcpv
+  real, parameter:: cpvmcpd = rcpv - rcpd, cpvmcl = rcw - rcpv
   real eps, epsi, epsim1
-  real ginv, hrd
-  real grav
+  real, parameter:: ginv = 1. / rg, hrd = 0.5 * rd
+
+  private rd, rg, rcpd, rcpv, rcw
 
 contains
 
@@ -17,7 +22,7 @@
 
     ! Set thermodynamical constants for cv_driver
 
-    use SUPHEC_M, only: rcpd, rcpv, rcw, rd, rg, rlvtt, rv
+    use SUPHEC_M, only: rlvtt, rv
 
     !-----------------------------------------------------
 
@@ -26,22 +31,12 @@
     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
+    rowl = 1000. ! (\`A quelle variable de SUPHEC_M cela correspond-il ?)
+    eps = rd/rrv
+    epsi = 1.0/eps
+    epsim1 = epsi - 1.0
 
   end SUBROUTINE cv_thermo