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

Timestamp:

Jan 30, 2020, 10:36:35 AM (5 years ago)

Author:

aboissinot

Message:

The thermal plume model is able to manage several plumes in the same column and
work without the convective adjustment.

File:

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

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

@@ -3 +3 @@
      &                   pu,pv,ph,pq,
      &                   pdufi,pdvfi,pdhfi,pdqfi,
-     &                   pduadj,pdvadj,pdhadj,
-     &                   pdqadj,lmax)
+     &                   pduadj,pdvadj,pdhadj,pdqadj)
 
       USE tracer_h
@@ -41 +40 @@
       REAL pu(ngrid,nlay),pdufi(ngrid,nlay),pduadj(ngrid,nlay)
       REAL pv(ngrid,nlay),pdvfi(ngrid,nlay),pdvadj(ngrid,nlay)
-      INTEGER lmax(ngrid)
 
 !     Tracers
@@ -157 +155 @@
       DO l=2,nlay
         DO ig=1,ngrid
-          IF (zhc(ig,l).LT.zhc(ig,l-1).and.(l.GT.lmax(ig))) THEN
+          IF (zhc(ig,l).LT.zhc(ig,l-1)) THEN
             vtest(ig)=.true.
           ENDIF
@@ -197 +195 @@
             l2 = l2 + 1
             IF (l2 .GT. nlay) EXIT
-            IF ((zhc(i, l2).LT.zhc(i, l2-1)).and.(l2.GT.lmax(i))) THEN
+            IF (zhc(i, l2).LT.zhc(i, l2-1)) THEN
  
 !     l2 is the highest level of the unstable column
@@ -226 +224 @@
                 down = .false.
                 IF (l1 .ne. 1) then    !--  and then
-                  IF ((zhmc.LT.zhc(i, l1-1)).and.(l1.GT.lmax(i))) then
+                  IF (zhmc.LT.zhc(i, l1-1)) then
                     down = .true.
                   END IF