Changeset 165

Timestamp:

Nov 17, 2000, 2:34:28 PM (24 years ago)

Author:

lmdz

Message:

Petite correction "physique" dans la correction precedente. O.Boucher & J.Quaas
LF

File:

• LMDZ.3.3/trunk/libf/phylmd/conflx.F (modified) (5 diffs)

LMDZ.3.3/trunk/libf/phylmd/conflx.F

@@ -1043 +1043 @@
 cjq The variable maxpdmfdp(klon) has been introduced by Olivier Boucher
 cjq 14/11/00 to fix the problem with the negative precipitation.      
-      REAL pdmfdp(klon,klev), maxpdmfdp(klon) 
+      REAL pdmfdp(klon,klev), maxpdmfdp(klon,klev) 
       REAL prfl(klon), psfl(klon)
       REAL pmflxr(klon,klev+1), pmflxs(klon,klev+1)
       INTEGER  kcbot(klon), kctop(klon), ktype(klon)
       LOGICAL  ldland(klon), ldcum(klon)
-      INTEGER k, i
+      INTEGER k, kp, i
       REAL zcons1, zcons2, zcucov, ztmelp2
       REAL pdtime, zdp, zzp, zfac, zsnmlt, zrfl, zrnew
@@ -1173 +1173 @@
 c        panache descendant pour eliminer la negativite
          IF ((pmflxr(i,k+1)+pmflxs(i,k+1)).LT.0.0) THEN
-cjq            write (*,*) 'total precip negative. rain ',pmflxr(i,k+1),
-cjq     .                  'snow ',pmflxs(i,k+1) 
             pdmfdp(i,k) = -pmflxr(i,k)-pmflxs(i,k)-pdmfup(i,k)
             pmflxr(i,k+1) = 0.0
@@ -1192 +1190 @@
 cjq as well as the evaporation.
 cjq      
+      DO k = 1, klev
       DO i = 1, klon 
-         maxpdmfdp(i)=0.0
-      ENDDO
-      DO k = ktopm2, klev
-         DO i = 1, klon
-         if (k.GE.kcbot(i)) then
-         maxpdmfdp(i)=maxpdmfdp(i)+pdmfdp(i,k)
-         endif
-         ENDDO
+         maxpdmfdp(i,k)=0.0
+      ENDDO
+      ENDDO
+      DO k = 1, klev
+       DO kp = k, klev
+        DO i = 1, klon
+         maxpdmfdp(i,k)=maxpdmfdp(i,k)+pdmfdp(i,kp)
+        ENDDO
+       ENDDO
       ENDDO
 cjq End of initialization
@@ -1221 +1221 @@
 cjq be evaporated (surely the evaporation can't be positive):            
             zdrfl=MAX(zdrfl,
-     .            MIN(-pmflxr(i,k)-pmflxs(i,k)-maxpdmfdp(i),0.0))
+     .            MIN(-pmflxr(i,k)-pmflxs(i,k)-maxpdmfdp(i,k),0.0))
 cjq End of insertion
 c            
@@ -1242 +1242 @@
             pdmfdp(i,k) = 0.0
             pdpmel(i,k) = 0.0
-         ENDIF
+         ENDIF         
+         if (pmflxr(i,k) + pmflxs(i,k).lt.-1.e-26) 
+     .    write(*,*) 'precip. < 1e-16 ',pmflxr(i,k) + pmflxs(i,k)
       ENDIF
       ENDDO