Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cvltr_noscav.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/cvltr_noscav.F90 (modified) (3 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cvltr_noscav.F90

@@ -39 +39 @@
   INTEGER                         :: i,k,j 
   REAL                            :: pdtimeRG
-  REAL                            :: smallest_mp
   real conserv
   real smfd
@@ -48 +47 @@
 ! calcul des tendances liees au downdraft
 ! =========================================
-!
-  smallest_mp = tiny(mp(1,1))
 !cdir collapse
   qfeed(:,it) = 0.
@@ -88 +85 @@
      DO j=k-1,1,-1
         DO i=1,klon
-!!           if(mp(i,j+1).ne.0) then
-!!              zmd(i,j,k)=zmd(i,j+1,k)*min(1.,mp(i,j)/mp(i,j+1))
-!!           ENDif
-           zmd(i,j,k)=zmd(i,j+1,k)*mp(i,j)/max(mp(i,j),mp(i,j+1),smallest_mp)
+           if(mp(i,j+1).ne.0) then
+              zmd(i,j,k)=zmd(i,j+1,k)*min(1.,mp(i,j)/mp(i,j+1))
+           ENDif
         END DO
      END DO