Changeset 2107 for trunk/LMDZ.GENERIC/libf/phystd/convadj.F

Timestamp:

Feb 26, 2019, 4:45:05 PM (6 years ago)

Author:

aboissinot

Message:

Now convective adjustment can be used at the same time as thermal plume model (for layers beyond thermals).

File:

• trunk/LMDZ.GENERIC/libf/phystd/convadj.F (modified) (5 diffs)

trunk/LMDZ.GENERIC/libf/phystd/convadj.F

@@ -4 +4 @@
      &                   pdufi,pdvfi,pdhfi,pdqfi,
      &                   pduadj,pdvadj,pdhadj,
-     &                   pdqadj)
+     &                   pdqadj,lmax)
 
       USE tracer_h
@@ -41 +41 @@
       REAL pu(ngrid,nlay),pdufi(ngrid,nlay),pduadj(ngrid,nlay)
       REAL pv(ngrid,nlay),pdvfi(ngrid,nlay),pdvadj(ngrid,nlay)
+      INTEGER lmax(ngrid)
 
 !     Tracers
@@ -156 +157 @@
       DO l=2,nlay
         DO ig=1,ngrid
-          IF(zhc(ig,l).LT.zhc(ig,l-1)) vtest(ig)=.true.
+          IF (zhc(ig,l).LT.zhc(ig,l-1).and.(l.GT.lmax(ig))) THEN
+            vtest(ig)=.true.
+          ENDIF
         ENDDO
       ENDDO
-
+      
 !     Make a list of them
       jcnt=0
@@ -194 +197 @@
             l2 = l2 + 1
             IF (l2 .GT. nlay) EXIT
-            IF (zhc(i, l2) .LT. zhc(i, l2-1)) THEN
+            IF ((zhc(i, l2).LT.zhc(i, l2-1)).and.(l.GT.lmax(i))) THEN
  
 !     l2 is the highest level of the unstable column
@@ -223 +226 @@
                 down = .false.
                 IF (l1 .ne. 1) then    !--  and then
-                  IF (zhmc .lt. zhc(i, l1-1)) then
+                  IF ((zhmc.LT.zhc(i, l1-1)).and.(l.GT.lmax(i))) then
                     down = .true.
                   END IF