Changeset 2143 for trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90

Timestamp:

Jun 20, 2019, 4:11:54 PM (5 years ago)

Author:

aboissinot

Message:

Update the thermal plume model:

• check formulae consistency between thermcell_plume and thercell_closure
• compute correctly thermal plume height
• fix alimentation computation in the first unstable layer

File:

• trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90

@@ -53 +53 @@
 !     ------
       
-      INTEGER ig, l
+      INTEGER ig, l, k
       INTEGER niter, iter
       
@@ -59 +59 @@
       REAL qold(ngrid,nlay)
       REAL fqa(ngrid,nlay+1)
-      REAL wqd(ngrid,nlay+1)
       REAL zzm
       
@@ -86 +85 @@
                print *, 'ERROR: entrainment is greater than the layer mass!'
                print *, 'ig,l,entr', ig, l, entr(ig,l)
+               print *, 'lmin', lmin(ig)
                print *, '-------------------------------'
                print *, 'entr*dt,mass', entr(ig,l)*ptimestep, masse(ig,l)
                print *, '-------------------------------'
-               print *, 'fm+', fm(ig,l+1)
-               print *, 'entr,detr', entr(ig,l), detr(ig,l)
-               print *, 'fm ', fm(ig,l)
-               print *, 'entr,detr', entr(ig,l-1), detr(ig,l-1)
-               print *, 'fm-', fm(ig,l-1)
+               DO k=nlay,1,-1
+                  print *, 'fm ', fm(ig,k+1)
+                  print *, 'entr,detr', entr(ig,k), detr(ig,k)
+               ENDDO
+               print *, 'fm ', fm(ig,1)
+               print *, '-------------------------------'
                CALL abort
             ENDIF
@@ -117 +118 @@
                qa(ig,l) = q(ig,l)
             ENDIF
-            
-!            IF (qa(ig,l).lt.0.) THEN
-!               print *, 'WARNING: qa is negative!'
-!               print *, 'qa', qa(ig,l)
-!            ENDIF
-            
-!            IF (q(ig,l).lt.0.) THEN
-!               print *, 'WARNING: q is negative!'
-!               print *, 'q', q(ig,l)
-!            ENDIF
          ENDDO
       ENDDO