--- trunk/Sources/phylmd/cv_thermo.f 2016/03/15 17:51:30 181 +++ trunk/Sources/phylmd/cv_thermo.f 2016/03/16 11:11:27 182 @@ -2,7 +2,6 @@ ! Set thermodynamical constants for convectL - use clesphys2, only: iflag_con use SUPHEC_M use cvthermo @@ -10,38 +9,22 @@ !----------------------------------------------------- - ! original set from convect: - if (iflag_con.eq.4) then - cpd=1005.7 - cpv=1870.0 - cl=4190.0 - rrv=461.5 - rrd=287.04 - lv0=2.501E6 - g=9.8 - t0=273.15 - grav=g - endif - - ! constants consistent with LMDZ: - if (iflag_con.eq.3) then - cpd = RCPD - cpv = RCPV - cl = RCW - rrv = RV - rrd = RD - lv0 = RLVTT - g = RG ! not used in convect3 - t0 = 273.15 ! convect3 (RTT=273.16) - grav= g ! implicitely or explicitely used in convect3 - endif + cpd = RCPD + cpv = RCPV + cl = RCW + rrv = RV + rrd = RD + lv0 = RLVTT + g = RG + t0 = 273.15 + grav= g rowl=1000.0 !(a quelle variable de SUPHEC_M cela correspond-il?) clmcpv=cl-cpv clmcpd=cl-cpd cpdmcp=cpd-cpv cpvmcpd=cpv-cpd - cpvmcl=cl-cpv ! for convect3 + cpvmcl=cl-cpv eps=rrd/rrv epsi=1.0/eps epsim1=epsi-1.0