Changeset 2177 for trunk/LMDZ.GENERIC/libf/phystd/thermcell_env.F90

Timestamp:

Nov 12, 2019, 11:55:58 AM (5 years ago)

Author:

aboissinot

Message:

Cleanup thermal plums model subroutines
In thermcell_flux, "bidouilles" are modified:

• now the plumes stop when the updraft fraction is greater than alpha_max
• e > e_max is no longer permitted
• b <= incoming mass flux is checked last

File:

• trunk/LMDZ.GENERIC/libf/phystd/thermcell_env.F90 (modified) (2 diffs)

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

@@ -38 +38 @@
 !     -------
       
-      INTEGER ngrid, nlay, nq
+      INTEGER, INTENT(in) :: ngrid
+      INTEGER, INTENT(in) :: nlay
+      INTEGER, INTENT(in) :: nq
       
-      REAL pq(ngrid,nlay,nq)                    ! Large scale water
-      REAL pt(ngrid,nlay)                       ! Large scale temperature
-      REAL pu(ngrid,nlay)                       ! Large scale zonal wind
-      REAL pv(ngrid,nlay)                       ! Large scale meridional wind
-      REAL pplay(ngrid,nlay)                    ! Layers pressure
-      REAL pplev(ngrid,nlay+1)                  ! Levels pressure
-      REAL zpopsk(ngrid,nlay)                   ! Exner function
+      REAL, INTENT(in) :: pq(ngrid,nlay,nq)           ! Large scale water
+      REAL, INTENT(in) :: pt(ngrid,nlay)              ! Large scale temperature
+      REAL, INTENT(in) :: pu(ngrid,nlay)              ! Large scale zonal wind
+      REAL, INTENT(in) :: pv(ngrid,nlay)              ! Large scale meridional wind
+      REAL, INTENT(in) :: pplay(ngrid,nlay)           ! Layers pressure
+      REAL, INTENT(in) :: pplev(ngrid,nlay+1)         ! Levels pressure
+      REAL, INTENT(in) :: zpopsk(ngrid,nlay)          ! Exner function
       
 !     Outputs:
 !     --------
       
-      REAL zqt(ngrid,nlay)                      ! qt   environment
-      REAL zql(ngrid,nlay)                      ! ql   environment
-      REAL zt(ngrid,nlay)                       ! T    environment
-      REAL ztv(ngrid,nlay)                      ! TRPV environment
-      REAL zhl(ngrid,nlay)                      ! TP   environment
-      REAL zu(ngrid,nlay)                       ! u    environment
-      REAL zv(ngrid,nlay)                       ! v    environment
-      REAL zqs(ngrid,nlay)                      ! qsat environment
+      REAL, INTENT(out) :: zt(ngrid,nlay)             ! T    environment
+      REAL, INTENT(out) :: ztv(ngrid,nlay)            ! TRPV environment
+      REAL, INTENT(out) :: zhl(ngrid,nlay)            ! TP   environment
+      REAL, INTENT(out) :: zu(ngrid,nlay)             ! u    environment
+      REAL, INTENT(out) :: zv(ngrid,nlay)             ! v    environment
+      REAL, INTENT(out) :: zqt(ngrid,nlay)            ! qt   environment
+      REAL, INTENT(out) :: zql(ngrid,nlay)            ! ql   environment
+      REAL, INTENT(out) :: zqs(ngrid,nlay)            ! qsat environment
       
 !     Local:
 !     ------
       
-      INTEGER ig, l
+      INTEGER ig, k
       
-      REAL psat                                 ! Dummy argument for Psat_water()
+      REAL psat                                       ! Dummy argument for Psat_water()
       
 !===============================================================================
@@ -85 +87 @@
       IF (water) THEN
          
-         DO l=1,nlay
+         DO k=1,nlay
             DO ig=1,ngrid
-               CALL Psat_water(pt(ig,l), pplev(ig,l), psat, zqs(ig,l))
+               CALL Psat_water(pt(ig,k), pplev(ig,k), psat, zqs(ig,k))
             ENDDO
          ENDDO
          
-         DO l=1,nlay
+         DO k=1,nlay
             DO ig=1,ngrid
-               zql(ig,l) = max(0.,pq(ig,l,igcm_h2o_vap) - zqs(ig,l))
-               zt(ig,l) = pt(ig,l) + RLvCp * zql(ig,l)
-               ztv(ig,l) = zt(ig,l) / zpopsk(ig,l)                            &
-               &         * (1. + RETV * (zqt(ig,l)-zql(ig,l)) - zql(ig,l))
+               zql(ig,k) = max(0.,pq(ig,k,igcm_h2o_vap) - zqs(ig,k))
+               zt(ig,k) = pt(ig,k) + RLvCp * zql(ig,k)
+               ztv(ig,k) = zt(ig,k) / zpopsk(ig,k)                            &
+               &         * (1. + RETV * (zqt(ig,k)-zql(ig,k)) - zql(ig,k))
             ENDDO
          ENDDO