Changeset 2064 for trunk/LMDZ.GENERIC/libf/phystd

Timestamp:

Jan 10, 2019, 3:44:36 PM (6 years ago)

Author:

aboissinot

Message:

Fix a bug in thermcell_closure arguments which implies wrong fluxes normalization.

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• thermcell_closure.F90 (modified) (4 diffs)
• thermcell_main.F90 (modified) (4 diffs)
• thermcell_mod.F90 (modified) (3 diffs)

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

@@ -3 +3 @@
 !
       SUBROUTINE thermcell_closure(ngrid,nlay,ptimestep,rho,zlev,             &
-      &                    lalim,alim_star,f_star,zmax,wmax,f,lev_out)
-      
+      &                            lalim,alim_star,f_star,                    &
+      &                            zmax,wmax,f,lev_out)
       
 !==============================================================================
@@ -77 +77 @@
       DO ig=1,ngrid
          IF (lalim(ig)>llmax) THEN
-            llmax=lalim(ig)
+            llmax = lalim(ig)
          ENDIF
       ENDDO
@@ -88 +88 @@
          DO ig=1,ngrid
             IF (k<lalim(ig)) THEN
-               alim_star2(ig)=alim_star2(ig)+alim_star(ig,k)**2  &
-               &                    /(rho(ig,k)*(zlev(ig,k+1)-zlev(ig,k)))
-               alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,k)
+               alim_star2(ig) = alim_star2(ig) + alim_star(ig,k)**2           &
+               &              / (rho(ig,k) * (zlev(ig,k+1) - zlev(ig,k)))
+               alim_star_tot(ig) = alim_star_tot(ig) + alim_star(ig,k)
             ENDIF
          ENDDO
@@ -97 +97 @@
       DO ig=1,ngrid
          IF (alim_star2(ig)>1.e-10) THEN
-            f(ig) = wmax(ig) * alim_star_tot(ig)/                             &
-            &     (max(500.,zmax(ig))*r_aspect_thermals*alim_star2(ig))
+            f(ig) = wmax(ig) * alim_star_tot(ig)                              &
+            &     / (max(500.,zmax(ig)) * r_aspect_thermals * alim_star2(ig))
          ENDIF
       ENDDO

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

@@ -20 +20 @@
       &                  ,alp_bl_conv,alp_bl_stat)
 !!! fin nrlmd le 10/04/2012
-      
       
 !==============================================================================
@@ -517 +516 @@
       
       IF (iflag_thermals_closure.eq.1) THEN
-         CALL thermcell_closure(ngrid,nlay,r_aspect_thermals,ptimestep,rho,   &
-         &                      zlev,lalim,alim_star_clos,f_star,             &
+         CALL thermcell_closure(ngrid,nlay,ptimestep,rho,zlev,                &
+         &                      lalim,alim_star_clos,f_star,                  &
          &                      zmax_sec,wmax_sec,f,lev_out)
       ELSEIF (iflag_thermals_closure.eq.2) THEN
-         CALL thermcell_closure(ngrid,nlay,r_aspect_thermals,ptimestep,rho,   &
-         &                      zlev,lalim,alim_star,f_star,                  &
+         CALL thermcell_closure(ngrid,nlay,ptimestep,rho,zlev,                &
+         &                      lalim,alim_star,f_star,                       &
          &                      zmax,wmax,f,lev_out)
+      ELSE
+         print *, 'ERROR: no closure had been selected!'
+         call abort
       ENDIF
       
@@ -562 +564 @@
       IF (tau_thermals>1.) THEN
          lambda = exp(-ptimestep/tau_thermals)
-         fm0 = (1.-lambda)*fm+lambda*fm0
-         entr0 = (1.-lambda)*entr+lambda*entr0
-         detr0 = (1.-lambda)*detr+lambda*detr0
+         fm0   = (1.-lambda) * fm   + lambda * fm0
+         entr0 = (1.-lambda) * entr + lambda * entr0
+         detr0 = (1.-lambda) * detr + lambda * detr0
       ELSE
-         fm0 = fm
+         fm0   = fm
          entr0 = entr
          detr0 = detr
@@ -659 +661 @@
          enddo
          
-         ierr=0
+         ierr = 0
          
          do ig=1,ngrid

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

@@ -39 +39 @@
 ! AB : linf is used to set the lowest possible first level because we allow it
 !      to begin higher than the surface. It is set to 2 in order to remove the
-!      first layer for gas giant. If there is a surface, it has to be set to 1.
+!      first layer for gas giant.
+!      If there is a surface, it has to be set to 1.
+!      If someone want to call more than once the thermal plume model in one
+!      or more grid point, this variable must become a saved array of INTEGER
+!      with size ngrid. 
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 INTEGER,PARAMETER :: linf                       = 2
@@ -59 +63 @@
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ! AB : Parameters needed only for a loop in thermcell_alp (diagnoses).
-!      Maybe to remove.
+!      Maybe to be removed.
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 INTEGER,PARAMETER :: nbsrf                      = 1
@@ -65 +69 @@
 
 CONTAINS
-
-   SUBROUTINE init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RV)
-   
-   IMPLICIT NONE
-   
-   REAL g
-   REAL rcp
-   REAL r
-   REAL pi
-   REAL T_h2o_ice_liq
-   REAL RV
-   
-   RTT = T_h2o_ice_liq
-   RG = g
-   RKAPPA = rcp
-   RPI = pi
-   RD = r
-   
-   RETURN
-   END SUBROUTINE init_thermcell_mod
+      
+      SUBROUTINE init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RV)
+      
+      IMPLICIT NONE
+      
+      REAL g
+      REAL rcp
+      REAL r
+      REAL pi
+      REAL T_h2o_ice_liq
+      REAL RV
+      
+      RTT = T_h2o_ice_liq
+      RG = g
+      RKAPPA = rcp
+      RPI = pi
+      RD = r
+      
+      RETURN
+      END SUBROUTINE init_thermcell_mod
 
 END MODULE thermcell_mod