Changeset 2132 for trunk/LMDZ.GENERIC/libf/phystd/thermcell_main.F90

Timestamp:

Apr 29, 2019, 3:13:04 PM (6 years ago)

Author:

aboissinot

Message:

Alimentation (more precisely lalim) is removed from thermcell_flux as well as corrections which need it.
Consequently, iflag_thermals_optflux flag is removed from thermcell_mod.

File:

• trunk/LMDZ.GENERIC/libf/phystd/thermcell_main.F90 (modified) (6 diffs)

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

@@ -8 +8 @@
                           f0,fm0,entr0,detr0,zw2,fraca,                       &
                           zqta,zqla,ztv,ztva,zhla,zhl,zqsa,                   &
-                          lmin,lmix,lalim,lmax)
+                          lmin,lmix,lmax)
       
       
@@ -126 +126 @@
       REAL linter(ngrid)                        ! Level (continuous) of maximal vertical speed
       REAL zmix(ngrid)                          ! Altitude of maximal vertical speed
-      REAL zmax(ngrid)                          ! Maximal altitude reached by the plume
+      REAL zmax(ngrid)                          ! Plume height
       REAL wmax(ngrid)                          ! Maximal vertical speed
       REAL zw2(ngrid,nlay+1)                    ! Plume vertical speed
@@ -149 +149 @@
       CHARACTER (len=80) :: abort_message
       
-! AB: I remove alimentation, which is in fact included in entr_star. EN COURS
-      INTEGER lalim(ngrid)                      ! Highest alimentation level
-      REAL alim_star(ngrid,nlay)                ! Normalized alimentation
-      REAL alim_star_tot(ngrid)                 ! Integrated alimentation
-      REAL alim_star_clos(ngrid,nlay)           ! Closure alimentation
-      
 !===============================================================================
 ! Initialization
@@ -183 +177 @@
       pdtadj(:,:) = 0.0
       pdqadj(:,:,:) = 0.0
-      
-! AB: I remove alimentation, which is in fact included in entr_star. EN COURS
-      alim_star(:,:) = 0.
-      alim_star_tot(:) = 0.
-      alim_star_clos(:,:) = 0.
-      lalim(:) = 1
       
 ! AB: Careful, hard-coded value from Earth tuned version of the thermal plume model!
@@ -333 +321 @@
       &                    ztva,zhla,zqla,zqta,zta,                           &
       &                    zw2,zqsa,lmix,lmin)
-      
+            
 !-------------------------------------------------------------------------------
 ! Thermal plumes characteristics: zmax, zmix, wmax
@@ -374 +362 @@
       
       CALL thermcell_flux(ngrid,nlay,ptimestep,masse,                         &
-! AB: I remove alimentation, which is in fact included in entr_star. EN COURS
-!     That is not already done for thermcell_flux.
-      &                   lalim,lmin,lmax,entr_star,detr_star,                &
+      &                   lmin,lmax,entr_star,detr_star,                      &
       &                   f,rhobarz,zlev,zw2,fm,entr,detr,zqla)