Changeset 2480 for trunk

Timestamp:

Mar 16, 2021, 11:28:16 AM (4 years ago)

Author:

aboissinot

Message:

Commit the last changes in the thermal plume model (more english comments).

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/thermcell_flux.F90 (modified) (3 diffs)
• libf/phystd/thermcell_height.F90 (modified) (1 diff)
• libf/phystd/thermcell_main.F90 (modified) (3 diffs)
• libf/phystd/thermcell_mod.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/README

@@ -1628 +1628 @@
 to defined a consistent 1D sza in physiq_mod used also in chemistry
 + typo
+
+== 16/03/2021 == AB
+Commit the last changes in the thermal plume model which was waiting for one year. 

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

@@ -177 +177 @@
             print *, '- - - - - - - - - - - - - - - - - - - - - - - - - - - - -'
             DO k=nlay,1,-1
-               print *, 'k, fm ', k+1, fm(igout,k+1)
+               print *, 'fm,w ', fm(igout,k+1), zw2(igout,k+1)
                print *, 'entr,detr', entr(igout,k), detr(igout,k)
             ENDDO
-            print *, 'k, fm ', 1, fm(igout,1)
+            print *, 'fm,w ', fm(igout,1), zw2(igout,1)
             print *, '---------------------------------------------------------'
             CALL abort
@@ -222 +222 @@
                   fm(ig,l+1) = fm(ig,l) + entr(ig,l)
                   entr(ig,l+1) = entr(ig,l+1) + ddd
+               ELSE
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ! AB: Simulation abort (try to reduce the physical time step).
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-               ELSE
-                  entr(ig,l) = entr(ig,l) + eee
-                  igout = ig
-                  lout = l
-                  labort_physic = .true.
+!                  entr(ig,l) = entr(ig,l) + eee
+!                  igout = ig
+!                  lout = l
+!                  labort_physic = .true.
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ! AB: We can renormalize the plume mass fluxes. I think it does not work.
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!               ELSE
 !                  fact = max(fact, eee0 / emax)
-!                  entr(ig,l) = eee0
-!                  ncorecfact = ncorecfact + 1
+                  fact = eee0 / emax
+                  entr(ig,l) = eee0
+                  ncorecfact = ncorecfact + 1
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ! AB: The renormalization can be just applied in the local plume.
 !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!                  DO k=lmin(ig),lmax(ig)
-!                     entr(ig,k) = entr(ig,k) * emax / eee0
-!                     detr(ig,k) = detr(ig,k) * emax / eee0
-!                     fm(ig,k) = fm(ig,k) * emax / eee0
-!                  ENDDO
+                  DO k=lmin(ig),lmax(ig)
+                     entr(ig,k) = entr(ig,k) * emax / eee0
+                     detr(ig,k) = detr(ig,k) * emax / eee0
+                     fm(ig,k) = fm(ig,k) * emax / eee0
+                  ENDDO
                ENDIF
             ENDIF
@@ -264 +264 @@
             print *, '- - - - - - - - - - - - - - - - - - - - - - - - - - - - -'
             DO k=nlay,1,-1
-               print *, 'fm ', fm(igout,k+1)
+               print *, 'fm,w ', fm(igout,k+1), zw2(igout,k+1)
                print *, 'entr,detr', entr(igout,k), detr(igout,k)
             ENDDO
-            print *, 'fm ', fm(igout,1)
+            print *, 'fm,w ', fm(igout,1), zw2(igout,1)
             print *, '---------------------------------------------------------'
             CALL abort

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

@@ -2 +2 @@
 !
 !
-SUBROUTINE thermcell_height(ngrid,nlay,lmin,lmix,lmax,zlev,                   &
-                            zmin,zmix,zmax,zw2,wmax,f_star)
+SUBROUTINE thermcell_height(ngrid,nlay,lmin,lmix,lmax,                        &
+                            zlev,zmin,zmix,zmax,zw2,wmax,f_star)
       
       

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

@@ -383 +383 @@
       
 !-------------------------------------------------------------------------------
-! Calcul du transport vertical de la temperature potentielle
+! Potential temperature
 !-------------------------------------------------------------------------------
       
@@ -396 +396 @@
       
 !-------------------------------------------------------------------------------
-! Calcul du transport vertical des traceurs
+! Tracers
 !-------------------------------------------------------------------------------
       
@@ -405 +405 @@
       
 !-------------------------------------------------------------------------------
-! Calcul du transport vertical du moment horizontal
+! Horizontal momentum
 !-------------------------------------------------------------------------------
       

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

@@ -13 +13 @@
       REAL,SAVE :: r_aspect_thermals             !  1.0      Aspect ratio of the thermals (width / height)
       REAL,SAVE :: tau_thermals                  !  0.       Relaxation time
-      REAL,SAVE :: betalpha                      !  0.9      - between 0 (e=d) and 1 (rho*fraca=cst)
+      REAL,SAVE :: betalpha                      !  0.9      - between 0 (e=d=0) and 1 (rho*fraca=cst)
       REAL,SAVE :: afact                         !  2./3.    - buoyancy acceleration efficiency, between 0 and 1
       REAL,SAVE :: fact_epsilon                  !  2.e-3    - turbulence and friction deceleration