Changeset 2101 for trunk/LMDZ.GENERIC/libf/phystd/thermcell_flux.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_flux.F90 (modified) (10 diffs)

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

@@ -2 +2 @@
 !
 !
-      SUBROUTINE thermcell_flux(ngrid,klev,ptimestep,masse,                   &
-      &                    lalim,lmin,lmax,alim_star,entr_star,detr_star,     &
-      &                    f,rhobarz,zlev,zw2,fm,entr,                        &
-      &                    detr,zqla,lev_out,lunout1,igout)
+SUBROUTINE thermcell_flux(ngrid,nlay,ptimestep,masse,                         &
+                          lalim,lmin,lmax,alim_star,entr_star,detr_star,      &
+                          f,rhobarz,zlev,zw2,fm,entr,                         &
+                          detr,zqla,lev_out,lunout1,igout)
       
       
@@ -26 +26 @@
       
       INTEGER ngrid
-      INTEGER klev
+      INTEGER nlay
       INTEGER igout
       INTEGER lev_out
@@ -34 +34 @@
       INTEGER lalim(ngrid)
       
-      REAL alim_star(ngrid,klev)
-      REAL entr_star(ngrid,klev)
-      REAL detr_star(ngrid,klev)
-      REAL zw2(ngrid,klev+1)
-      REAL zlev(ngrid,klev+1)
-      REAL masse(ngrid,klev)
+      REAL alim_star(ngrid,nlay)
+      REAL entr_star(ngrid,nlay)
+      REAL detr_star(ngrid,nlay)
+      REAL zw2(ngrid,nlay+1)
+      REAL zlev(ngrid,nlay+1)
+      REAL masse(ngrid,nlay)
       REAL ptimestep
-      REAL rhobarz(ngrid,klev)
+      REAL rhobarz(ngrid,nlay)
       REAL f(ngrid)
-      REAL zqla(ngrid,klev)
+      REAL zqla(ngrid,nlay)
       REAL zmax(ngrid)
       
@@ -49 +49 @@
 !      --------      
       
-      REAL entr(ngrid,klev)
-      REAL detr(ngrid,klev)
-      REAL fm(ngrid,klev+1)
+      REAL entr(ngrid,nlay)
+      REAL detr(ngrid,nlay)
+      REAL fm(ngrid,nlay+1)
       
 !      local:
@@ -124 +124 @@
 !------------------------------------------------------------------------------
       
-      DO l=1,klev
+      DO l=1,nlay
          entr(:,l) = f(:) * (entr_star(:,l) + alim_star(:,l))
          detr(:,l) = f(:) * detr_star(:,l)
@@ -133 +133 @@
 !------------------------------------------------------------------------------
       
-      DO l=1,klev
+      DO l=1,nlay
          DO ig=1,ngrid
             IF (l.lt.lmax(ig) .and. l.ge.lmin(ig)) THEN
@@ -152 +152 @@
 !==============================================================================
       
-      DO l=1,klev
+      DO l=1,nlay
          
 !------------------------------------------------------------------------------
@@ -186 +186 @@
 ! Test sur fraca constante ou croissante au-dessus de lalim
 !------------------------------------------------------------------------------
+         
 ! AB : Do we have to decree that? If so, set iflag_thermals_optflux to 0
          IF (iflag_thermals_optflux==0) THEN
@@ -205 +206 @@
 ! Test sur flux de masse constant ou decroissant au-dessus de lalim
 !------------------------------------------------------------------------------
+         
 ! AB : Do we have to decree that? If so, set iflag_thermals_optflux to 0
          IF (iflag_thermals_optflux==0) THEN
@@ -544 +546 @@
       
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-! AB : temporary test added to check the equation df/dz = e - d validity
-!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!      DO l=1,klev
+! AB : temporary test added to check the validity of eq. df/dz = e - d
+!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!      DO l=1,nlay
 !         DO ig=1,ngrid
 !            test = abs(fm(ig,l) + entr(ig,l) - detr(ig,l) - fm(ig,l+1))