Changeset 2107 for trunk/LMDZ.GENERIC/libf

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).

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• convadj.F (modified) (5 diffs)
• physiq_mod.F90 (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

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90 ¶

@@ -1189 +1189 @@
       
       IF (calltherm) THEN
-! AB : we need to evaporate ice before calling thermcell_main
+! AB : We need to evaporate ice before calling thermcell_main
          IF (water) THEN
             CALL evap(ngrid,nlayer,nq,ptimestep,pt,pq,pdq,pdt,dqevap,dtevap,zqtherm,zttherm)
@@ -1197 +1197 @@
          ENDIF
          
-! AB:  WARNING: if a plume stops, the parametrization never look above if somewhere the atmosphere is still unstable!
-!               As is, there cannot be more than one plume by grid point by time step.
+! AB:  If a plume stops, the parametrization never look above if somewhere the atmosphere is still unstable!
+!      Maybe it's a good idea to call convective adjustment too.
          CALL thermcell_main(icount, ngrid, nlayer, ptimestep,                   &
                              pplay, pplev, pphi, firstcall,                      &
-                             pu, pv, pt, pq(:,:,igcm_h2o_vap),                   &
+                             pu, pv, zttherm, zqtherm(:,:,igcm_h2o_vap),         &
                              zdutherm, zdvtherm, zdttherm, zdotherm,             &
                              f0, fm0, entr0, detr0,                              &
@@ -1208 +1208 @@
                              lmin, lmix, lalim, lmax,                            &
                              zpopsk, ratqscth, ratqsdiff,                        &
-! AB : next variables are only used for diagnoses
+! AB : Next variables are only used for diagnoses
                              Ale_bl,Alp_bl,lalim_conv,wght_th,                   &
                              pbl_tke,pctsrf,omega_therm,airephy,                 &
@@ -1231 +1231 @@
          ENDIF
          
+      ELSE
+         
+         lmax(1:ngrid) = 0
+         
       ENDIF ! end of 'calltherm'
       
@@ -1250 +1254 @@
                       pdu,pdv,zdh,pdq,                      &
                       zduadj,zdvadj,zdhadj,                 &
-                      zdqadj)
+                      zdqadj,lmax)
 
          pdu(1:ngrid,1:nlayer) = pdu(1:ngrid,1:nlayer) + zduadj(1:ngrid,1:nlayer)