Changeset 1864 for LMDZ5/branches/testing/libf/phylmd/cv_driver.F

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cv_driver.F (modified) (6 diffs)

LMDZ5/branches/testing/libf/phylmd/cv_driver.F

@@ -341 +341 @@
 ! --- SET CONSTANTS AND PARAMETERS
 !-------------------------------------------------------------------
-      print *, '-> cv_driver'      !jyg
+!      print *, '-> cv_driver'      !jyg
 c -- set simulation flags:
 c   (common cvflag)
 
-       CALL cv_flag
+       CALL cv_flag(0)
 
 c -- set thermodynamical constants:
@@ -494 +494 @@
  400  continue
 
-         print*,'cv_driver : klon, ncum = ',len,ncum
+!         print*,'cv_driver : klon, ncum = ',len,ncum
 
       IF (ncum.gt.0) THEN
@@ -696 +696 @@
 9999  continue
 
-      print *, 'fin cv_driver ->'      !jyg
+!      print *, 'fin cv_driver ->'      !jyg
       return
       end
 
 !==================================================================
-      SUBROUTINE cv_flag
+      SUBROUTINE cv_flag(iflag_ice_thermo)
       implicit none
+
+c Argument : iflag_ice_thermo : ice thermodynamics is taken into account if
+c                               iflag_ice_thermo >=1
+      INTEGER iflag_ice_thermo
 
 #include "cvflag.h"
@@ -709 +713 @@
 c differente de 10.0 dans convect3: 
       cvflag_grav = .TRUE.
+      cvflag_ice = iflag_ice_thermo .GE. 1
 
       return
@@ -744 +749 @@
        cpv = RCPV
        cl  = RCW
+       ci  = RCS
        rrv = RV
        rrd = RD
        lv0 = RLVTT
+       lf0 = RLSTT-RLVTT
        g   = RG     ! not used in convect3
 c ori      t0  = RTT
@@ -758 +765 @@
       clmcpv=cl-cpv
       clmcpd=cl-cpd
+      clmci=cl-ci
       cpdmcp=cpd-cpv
       cpvmcpd=cpv-cpd