Changeset 881 for LMDZ4/trunk/libf/phylmd

Timestamp:

Jan 23, 2008, 4:44:26 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Modif sur physiq.F pour pouvoir tourner sans convection
Correction sur create_make_gcm pour bien recopier les *mod où il faut
LF

File:

• LMDZ4/trunk/libf/phylmd/physiq.F (modified) (3 diffs)

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -2350 +2350 @@
       END IF 
 
+c =================================================================== c
+c   Calcul de Qsat
+
+      DO k = 1, klev
+      DO i = 1, klon
+         zx_t = t_seri(i,k)
+         IF (thermcep) THEN
+            zdelta = MAX(0.,SIGN(1.,rtt-zx_t))
+            zx_qs  = r2es * FOEEW(zx_t,zdelta)/pplay(i,k)
+            zx_qs  = MIN(0.5,zx_qs)
+            zcor   = 1./(1.-retv*zx_qs)
+            zx_qs  = zx_qs*zcor
+         ELSE
+           IF (zx_t.LT.t_coup) THEN
+              zx_qs = qsats(zx_t)/pplay(i,k)
+           ELSE
+              zx_qs = qsatl(zx_t)/pplay(i,k)
+           ENDIF
+         ENDIF
+         zqsat(i,k)=zx_qs
+      ENDDO
+      ENDDO
+
+      if (1.eq.1) then
+      write(lunout,*) 'L   qsat (g/kg) avant clouds_gno'
+      write(lunout,'(i4,f15.4)') (k,1000.*zqsat(igout,k),k=1,klev)
+      endif
 c
 c Appeler la convection (au choix)
@@ -2524 +2551 @@
 c Calcul des proprietes des nuages convectifs
 c
-      DO k = 1, klev
-      DO i = 1, klon
-         zx_t = t_seri(i,k)
-         IF (thermcep) THEN
-            zdelta = MAX(0.,SIGN(1.,rtt-zx_t))
-            zx_qs  = r2es * FOEEW(zx_t,zdelta)/pplay(i,k)
-            zx_qs  = MIN(0.5,zx_qs)
-            zcor   = 1./(1.-retv*zx_qs)
-            zx_qs  = zx_qs*zcor
-         ELSE
-           IF (zx_t.LT.t_coup) THEN
-              zx_qs = qsats(zx_t)/pplay(i,k)
-           ELSE
-              zx_qs = qsatl(zx_t)/pplay(i,k)
-           ENDIF
-         ENDIF
-         zqsat(i,k)=zx_qs
-      ENDDO
-      ENDDO
 
 c   calcul des proprietes des nuages convectifs
@@ -2568 +2576 @@
             ema_cbmf(i) = ema_workcbmf(i)
           ENDDO      
+      ELSE IF (iflag_con.eq.0) THEN
+          write(lunout,*) 'On n appelle pas la convection'
+          clwcon0=0.
+          rnebcon0=0.
+          d_t_con=0.
+          d_q_con=0.
+          d_u_con=0.
+          d_v_con=0.
+          rain_con=0.
+          snow_con=0.
+          bas=1
+          top=1
       ELSE
           WRITE(lunout,*) "iflag_con non-prevu", iflag_con