Changeset 2069

Timestamp:

Jan 18, 2019, 12:27:10 PM (6 years ago)

Author:

aboissinot

Message:

f0 is now allocated only if calltherm=true.
Useless thermal plume model flag "iflag_thermals_alim" is removed.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/physiq_mod.F90 (modified) (1 diff)
• libf/phystd/thermcell_alim.F90 (modified) (2 diffs)
• libf/phystd/thermcell_mod.F90 (modified) (1 diff)
• libf/phystd/thermcell_plume.F90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/README

@@ -1433 +1433 @@
 - in thermcell_plume, remove useless variable zbuoybis
 - in physiq_mod, save variable f0
+
+== 14/01/2018 == AB
+- Fix f0 saving
+- Restore d_temp functionality. d_temp is set in thermcell_mod and used in thermcell_alim.
+- Remove a potential division by zero in thermcell_plume with variable zw2m.
+
+==14/01/2018 == AB
+- add comment in README for revisions 2066 and 2067
+- allocate f0 only if calltherm=true
+- remove useless flag "iflag_thermals_alim" in thermcell_alim, thermcell_mod and thermcell_plume 

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

@@ -704 +704 @@
          if (calltherm) then
             call init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RV)
-         endif
-         
-         ALLOCATE(f0(ngrid))
+            ALLOCATE(f0(ngrid))
+         endif
          
          call su_watercycle ! even if we don't have a water cycle, we might

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

@@ -2 +2 @@
 !
 !
-      SUBROUTINE thermcell_alim(flag,ngrid,klev,ztv,zlev,alim_star,           &
-                                lalim,lmin)
+      SUBROUTINE thermcell_alim(ngrid,klev,ztv,zlev,alim_star,lalim,lmin)
       
       
@@ -27 +26 @@
       INTEGER, INTENT(IN) :: klev
       INTEGER, INTENT(IN) :: lmin(ngrid)        ! plume initial level
-      INTEGER, INTENT(IN) :: flag               ! useless here
       
       REAL, INTENT(IN) :: ztv(ngrid,klev)       ! Large scale virtual potential temperature

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

@@ -8 +8 @@
 INTEGER,PARAMETER :: iflag_thermals_optflux     = 0         !     0
 INTEGER,PARAMETER :: iflag_thermals_closure     = 2         !     2
-INTEGER,PARAMETER :: iflag_thermals_alim        = 0         !     0
 INTEGER,PARAMETER :: iflag_thermals             = 18        !     18
 

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

@@ -12 +12 @@
 !==============================================================================
 ! thermcell_plume: calcule les valeurs de qt, thetal et w dans l ascendance
+! AB : ql means "liquid water mass mixing ratio"
+!      qt means "total water mass mixing ratio"
+!      TP means "potential temperature"
+!      TRPV means "virtual potential temperature with latent heat release"  
+!      TPV means "virtual potential temperature"
+!      TR means "temperature with latent heat release"
 !==============================================================================
       
@@ -86 +92 @@
       REAL zqla_est(ngrid,klev)                 ! ql   plume (before mixing)
       REAL zta_est(ngrid,klev)                  ! TR   plume (before mixing)
-      REAL zbuoy(ngrid,klev)                    ! B    plume
-      REAL zbuoyjam(ngrid,klev)                 ! B    plume (modified)
+      REAL zbuoy(ngrid,klev)                    ! plume buoyancy
+      REAL zbuoyjam(ngrid,klev)                 ! plume buoyancy (modified)
       
       REAL ztemp(ngrid)                         ! temperature for saturation vapor pressure computation in plume
@@ -125 +131 @@
       zbetalpha = betalpha / (1. + betalpha)
       
-      ztva(:,:)        = ztv(:,:)               ! ztva     is set to the virtual potential temperature withour latent heat release
-      ztva_est(:,:)    = ztva(:,:)              ! ztva_est is set to the virtual potential temperature withour latent heat release
+      ztva(:,:)        = ztv(:,:)               ! ztva     is set to the virtual potential temperature without latent heat release
+      ztva_est(:,:)    = ztva(:,:)              ! ztva_est is set to the virtual potential temperature without latent heat release
       ztla(:,:)        = zthl(:,:)              ! ztla     is set to the potential temperature
       zqta(:,:)        = po(:,:)                ! zqta     is set to qt
       zqla(:,:)        = 0.                     ! zqla     is set to ql
       zqla_est(:,:)    = 0.                     ! zqla_est is set to ql
-      zha(:,:)         = ztva(:,:)              ! zha      is set to the plume virtual potential temperature withour latent heat release
+      zha(:,:)         = ztva(:,:)              ! zha      is set to the plume virtual potential temperature without latent heat release
       
       zqsat(:)         = 0.
@@ -180 +186 @@
 ! AB : On pourrait n'appeler thermcell_alim que si la plume est active
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      CALL thermcell_alim(iflag_thermals_alim,ngrid,klev,ztv,zlev,alim_star,  &
-      &                   lalim,lmin)
+      CALL thermcell_alim(ngrid,klev,ztv,zlev,alim_star,lalim,lmin)
       
 !==============================================================================