Changeset 2176 for trunk/LMDZ.GENERIC/libf

Timestamp:

Nov 12, 2019, 10:49:35 AM (5 years ago)

Author:

aboissinot

Message:

In physiq_mod.F90, variables fm0, entr0 and detr0 are now allocatable.

File:

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

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

@@ -258 +258 @@
       
       real,allocatable,save :: f0(:)      ! Mass flux norm
+      real,allocatable,save :: fm0(:,:)   ! Mass flux
+      real,allocatable,save :: entr0(:,:) ! Entrainment
+      real,allocatable,save :: detr0(:,:) ! Detrainment
       real dqevap(ngrid,nlayer,nq)        ! water tracer mass mixing ratio variations due to evaporation
       real dtevap(ngrid,nlayer)           ! temperature variation due to evaporation
       real zqtherm(ngrid,nlayer,nq)       ! vapor mass mixing ratio after evaporation
       real zttherm(ngrid,nlayer)          ! temperature after evaporation
-      real fm0(ngrid, nlayer+1)           ! Mass flux
-      real entr0(ngrid, nlayer)           ! Entrainment
-      real detr0(ngrid, nlayer)           ! Detrainment
       real fraca(ngrid, nlayer+1)         ! Fraction of the surface that plumes occupies
-      real zw2(ngrid, nlayer+1)           ! Squared vertical speed or its square root
+      real zw2(ngrid, nlayer+1)           ! Vertical speed
+      real zw2_bis(ngrid, nlayer)         ! 
       real zqsatth(ngrid, nlayer)         ! Water vapor mixing ratio at saturation
       real zqta(ngrid, nlayer)            ! Total water mass mixing ratio in the plume
@@ -686 +687 @@
 !        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          if (calltherm) then
-            call init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RV)
+            CALL init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RV)
             ALLOCATE(f0(ngrid))
+            ALLOCATE(fm0(ngrid,nlayer+1))
+            ALLOCATE(entr0(ngrid,nlayer))
+            ALLOCATE(detr0(ngrid,nlayer))
          endif
          
@@ -1355 +1359 @@
                      
                   endif ! end of 'enertest'
-               endif
+               endif ! end of '.not.calltherm'
                
                ! Large scale condensation/evaporation.
@@ -1738 +1742 @@
       zu(1:ngrid,1:nlayer) = pu(1:ngrid,1:nlayer) + pdu(1:ngrid,1:nlayer)*ptimestep
       zv(1:ngrid,1:nlayer) = pv(1:ngrid,1:nlayer) + pdv(1:ngrid,1:nlayer)*ptimestep
+      
+      ! Recast thermal plume vertical velocity array for outputs
+      IF (calltherm) THEN
+         DO ig=1,ngrid
+            DO l=1,nlayer
+               zw2_bis(ig,l) = zw2(ig,l)
+            ENDDO
+         ENDDO
+      ENDIF
 
       ! Diagnostic.
@@ -2128 +2141 @@
          call writediagfi(ngrid,'detr','Detrainment','kg m$^{-2}$ s$^{-1}$', 3, detr0)
          call writediagfi(ngrid,'fm','Mass flux','kg m$^{-2}$ s$^{-1}$', 3, fm0)
-         call writediagfi(ngrid,'w_plm','Squared vertical velocity','m s$^{-1}$', 3, zw2)
+         call writediagfi(ngrid,'w_plm','Squared vertical velocity','m s$^{-1}$', 3, zw2_bis)
          call writediagfi(ngrid,'fraca','Updraft fraction','', 3, fraca)
 !         call writediagfi(ngrid,'pmin', 'pmin', 'Pa', 2, pmin)
@@ -2337 +2350 @@
       CALL send_xios_field("omega",omega)
       
-      IF (callrad) CALL send_xios_field('dt_rad',dtrad)
-      IF (calldifv) CALL send_xios_field('dt_dif',zdtdif)
-      IF (calladj) CALL send_xios_field('dt_adj',zdtadj)
       IF (calltherm) THEN
-         CALL send_xios_field('w_plm',zw2(:,2:))
-         CALL send_xios_field('fm',fm0(:,2:))
-         CALL send_xios_field('frac',fraca(:,2:))
+         CALL send_xios_field('w_plm',zw2_bis)
          CALL send_xios_field('entr',entr0)
          CALL send_xios_field('detr',detr0)