Changeset 2101 for trunk/LMDZ.GENERIC/libf/phystd/thermcell_alim.F90

Timestamp:

Feb 15, 2019, 2:43:57 PM (6 years ago)

Author:

aboissinot

Message:

Fix a bug in thermcell_alim.F90 where vertical and horizontal loops must be inverted.
In thermal plume model, arrays size declaration is standardised (no longer done thanks to dimphy module but by way of arguments).
Clean up some thermal plume model routines (remove uselesss variables...)

File:

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

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

@@ -2 +2 @@
 !
 !
-      SUBROUTINE thermcell_alim(ngrid,klev,ztv2,zlev,alim_star,lalim,lmin)
+SUBROUTINE thermcell_alim(ngrid,nlay,ztv2,zlev,alim_star,lalim,lmin)
       
-      
-      USE thermcell_mod, ONLY: linf, d_temp
-      
-      IMPLICIT NONE
       
 !==============================================================================
@@ -14 +10 @@
 ! laterale a la base des panaches thermiques
 !==============================================================================
+      
+      IMPLICIT NONE
       
       
@@ -24 +22 @@
       
       INTEGER, INTENT(IN) :: ngrid
-      INTEGER, INTENT(IN) :: klev
-      INTEGER, INTENT(IN) :: lmin(ngrid)        ! plume initial level
+      INTEGER, INTENT(IN) :: nlay
+      INTEGER, INTENT(IN) :: lmin(ngrid)           ! plume initial level
       
-      REAL, INTENT(IN) :: ztv2(ngrid,klev)      ! Virtual potential temperature
-      REAL, INTENT(IN) :: zlev(ngrid,klev+1)    ! levels altitude
+      REAL, INTENT(IN) :: ztv2(ngrid,nlay)         ! Virtual potential temperature
+      REAL, INTENT(IN) :: zlev(ngrid,nlay+1)       ! levels altitude
       
 !      outputs:
 !      --------
       
-      INTEGER, INTENT(OUT) :: lalim(ngrid)      ! alimentation maximal level
+      INTEGER, INTENT(OUT) :: lalim(ngrid)         ! alimentation maximal level
       
-      REAL, INTENT(OUT) :: alim_star(ngrid,klev)
+      REAL, INTENT(OUT) :: alim_star(ngrid,nlay)   ! Normalized alimentation
       
 !      local:
@@ -42 +40 @@
       INTEGER :: ig, l
       
-      REAL :: alim_star_tot(ngrid)              ! integrated alimentation
+      REAL :: alim_star_tot(ngrid)                 ! integrated alimentation
       
 !==============================================================================
@@ -56 +54 @@
 !==============================================================================
       
-      DO l=lmin(ig),klev-1
-         DO ig=1,ngrid
-            IF ((ztv2(ig,l)>ztv2(ig,l+1)).and.(ztv2(ig,lmin(ig))>=ztv2(ig,l))) THEN
+      DO ig=1,ngrid
+         DO l=lmin(ig),nlay-1
+            IF ((ztv2(ig,l).gt.ztv2(ig,l+1)).and.(ztv2(ig,lmin(ig)).ge.ztv2(ig,l))) THEN
                alim_star(ig,l) = MAX( (ztv2(ig,l) - ztv2(ig,l+1)), 0.)  &
                &               * sqrt(zlev(ig,l+1))
@@ -73 +71 @@
 !------------------------------------------------------------------------------
       
-      DO l=1,klev
+      DO l=1,nlay
          DO ig=1,ngrid 
             IF (alim_star_tot(ig) > 1.e-10 ) THEN