Changeset 1438

Timestamp:

May 29, 2015, 10:27:51 AM (10 years ago)

Author:

aslmd

Message:

MESOSCALE. a more adapted exclusion of LMDZ-specific stuff

File:

• trunk/LMDZ.MARS/libf/phymars/newcondens.F (modified) (1 diff)

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

@@ -546 +546 @@
 
             zmflux(1) = -zcondices(ig)
-#ifdef MESOSCALE
-            print *,"newcondens: have to do something"
-            print *,"specific for MESOSCALE here"
-            print *,"-- I don't know bp!!!"
-            stop
-#else
             DO l=1,nlayer
              zmflux(l+1) = zmflux(l) -zcondicea(ig,l)
+#ifndef MESOSCALE
      &        + (bp(l)-bp(l+1))*(zfallice(ig,1)-zmflux(1))
 c zmflux set to 0 if very low to avoid: top layer is disappearing in v1ld  
           if (abs(zmflux(l+1)).lt.1E-13.OR.bp(l+1).eq.0.) zmflux(l+1)=0.
+#else
+          if (abs(zmflux(l+1)).lt.1E-13) zmflux(l+1)=0.
+#endif
             END DO
-#endif
 
 c Mass of each layer