Changeset 1279 for LMDZ4/trunk/libf/phylmd/fisrtilp.F

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/fisrtilp.F (modified) (8 diffs)

LMDZ4/trunk/libf/phylmd/fisrtilp.F

@@ -54 +54 @@
       REAL frac_impa(klon,klev)
       REAL frac_nucl(klon,klev)
-      real zct(klon),zcl(klon)
+      real zct      ,zcl
 cAA
 c
@@ -87 +87 @@
       REAL ztglace, zt(klon)
       INTEGER nexpo ! exponentiel pour glace/eau
-      REAL zdz(klon),zrho(klon),ztot(klon), zrhol(klon)
-      REAL zchau(klon),zfroi(klon),zfice(klon),zneb(klon)
+      REAL zdz(klon),zrho(klon),ztot      , zrhol(klon)
+      REAL zchau      ,zfroi      ,zfice(klon),zneb(klon)
 c
       LOGICAL appel1er
@@ -150 +150 @@
 cAA Initialisation a 1 des coefs des fractions lessivees 
 c
+!cdir collapse
       DO k = 1, klev
        DO i = 1, klon
@@ -161 +162 @@
 c
 cMAf Initialisation a 0 de zoliq
-       DO i = 1, klon
-          zoliq(i)=0.
-       ENDDO 
+c      DO i = 1, klon
+c         zoliq(i)=0.
+c      ENDDO 
 c Determiner les nuages froids par leur temperature
 c  nexpo regle la raideur de la transition eau liquide / eau glace.
@@ -173 +174 @@
 c Initialiser les sorties:
 c
+!cdir collapse
       DO k = 1, klev+1
       DO i = 1, klon
@@ -180 +182 @@
       ENDDO
 
+!cdir collapse
       DO k = 1, klev
       DO i = 1, klon
@@ -194 +197 @@
          rain(i) = 0.0
          snow(i) = 0.0
-      ENDDO
+         zoliq(i)=0.
+c     ENDDO
 c
 c Initialiser le flux de precipitation a zero
 c
-      DO i = 1, klon
+c     DO i = 1, klon
          zrfl(i) = 0.0
          zneb(i) = seuil_neb
@@ -441 +445 @@
          zrhol(i) = zrho(i) * zoliq(i) / zneb(i)
 
-         if (ptconv(i,k)) then
-            zcl(i)=cld_lc_con
-            zct(i)=1./cld_tau_con
-         else
-            zcl(i)=cld_lc_lsc
-            zct(i)=1./cld_tau_lsc
-         endif
-c  quantit�d'eau ��minier.
-         zchau(i) = zct(i)*dtime/FLOAT(ninter) * zoliq(i)
-     .         *(1.0-EXP(-(zoliq(i)/zneb(i)/zcl(i))**2)) *(1.-zfice(i))
-c  meme chose pour la glace.
-         if (ptconv(i,k)) then
-            zfroi(i) = dtime/FLOAT(ninter)/zdz(i)*zoliq(i)
+         IF (zneb(i).EQ.seuil_neb) THEN
+             ztot = 0.0
+         ELSE
+c  quantite d'eau a eliminer: zchau
+c  meme chose pour la glace: zfroi
+             if (ptconv(i,k)) then
+                zcl   =cld_lc_con
+                zct   =1./cld_tau_con
+                zfroi    = dtime/FLOAT(ninter)/zdz(i)*zoliq(i)
      .              *fallvc(zrhol(i)) * zfice(i)
-         else
-            zfroi(i) = dtime/FLOAT(ninter)/zdz(i)*zoliq(i)
+             else
+                zcl   =cld_lc_lsc
+                zct   =1./cld_tau_lsc
+                zfroi    = dtime/FLOAT(ninter)/zdz(i)*zoliq(i)
      .              *fallvs(zrhol(i)) * zfice(i)
-         endif
-         ztot(i) = zchau(i) + zfroi(i)
-         IF (zneb(i).EQ.seuil_neb) ztot(i) = 0.0
-         ztot(i) = MIN(MAX(ztot(i),0.0),zoliq(i))
-         zoliq(i) = MAX(zoliq(i)-ztot(i), 0.0)
+             endif
+             zchau    = zct   *dtime/FLOAT(ninter) * zoliq(i)
+     .         *(1.0-EXP(-(zoliq(i)/zneb(i)/zcl   )**2)) *(1.-zfice(i))
+             ztot    = zchau    + zfroi
+             ztot    = MAX(ztot   ,0.0)
+         ENDIF
+         ztot    = MIN(ztot,zoliq(i))
+         zoliq(i) = MAX(zoliq(i)-ztot   , 0.0)
          radliq(i,k) = radliq(i,k) + zoliq(i)/FLOAT(ninter+1)
       ENDIF