Changeset 884 for trunk/LMDZ.MARS/libf

Timestamp:

Feb 15, 2013, 2:56:00 PM (12 years ago)

Author:

tnavarro

Message:

corrected bug without CO2 condensation

File:

• trunk/LMDZ.MARS/libf/phymars/vdifc.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/vdifc.F

@@ -279 +279 @@
 c     --------------------------------------------------------------------
 
-      DO ilev=1,nlay
-         DO ig=1,ngrid
-            ztcond(ig,ilev)=
-     &         1./(bcond-acond*log(.01*vmr_co2(ig,ilev)*pplay(ig,ilev)))
-            if (pplay(ig,ilev).lt.1e-4) ztcond(ig,ilev)=0.0 !mars Monica
-         ENDDO
-      ENDDO
-
-      ztcond(:,nlay+1)=ztcond(:,nlay)
-
       if (callcond) then 
         DO ilev=1,nlay
           DO ig=1,ngrid
+              ztcond(ig,ilev)=
+     &      1./(bcond-acond*log(.01*vmr_co2(ig,ilev)*pplay(ig,ilev)))
+            if (pplay(ig,ilev).lt.1e-4) ztcond(ig,ilev)=0.0 !mars Monica
 !            zhcond(ig,ilev) =
 !     &  (1./(bcond-acond*log(.0095*pplay(ig,ilev))))/ppopsk(ig,ilev)
@@ -297 +290 @@
           END DO
         END DO
+        ztcond(:,nlay+1)=ztcond(:,nlay)
       else
-         call zerophys(ngrid*nlay,zhcond)
+         zhcond(:,:) = 0
+         ztcond(:,:) = 0
       end if
 
@@ -562 +557 @@
       IF (.not.flag_LES) THEN
 #endif
-      DO ig=1,ngrid
+      IF (callcond) THEN
+       DO ig=1,ngrid
          DO l=1,nlay
             if(zh(ig,l) .lt. zhcond(ig,l)) then
@@ -570 +566 @@
             endif
          ENDDO
-5     continue
-      ENDDO
+5      continue
+       ENDDO
+      ENDIF
 
 #ifdef MESOSCALE