Changeset 2902 for LMDZ5/trunk/libf

Timestamp:

Jun 2, 2017, 6:55:20 PM (8 years ago)

Author:

jyg

Message:

Corrections for energy conservation in the
convective scheme (activated by fl_cor_ebil>=2):
(i) The properties of the adiabatic updraught are
now determined by mixing static energies of the
feeding layers and not the enthalpies:
cv3_vertmix.F90 becomes cv3_enthalpmix.F90;
new routine: cv3_estatmix.F90.
(ii) Correction to cv3p_mixing concerning air
detrained directly from the adiabatic updraught
(hent was zero).

Location:

LMDZ5/trunk/libf/phylmd

Files:

• cv3_enthalpmix.F90 (added)
• cv3_estatmix.F90 (added)
• cv3_routines.F90 (modified) (8 diffs)
• cv3_vertmix.F90 (deleted)
• cv3p_mixing.F90 (modified) (2 diffs)
• cva_driver.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -280 +280 @@
 
 SUBROUTINE cv3_feed(len, nd, ok_conserv_q, &
-                    t, q, u, v, p, ph, hm, gz, &
+                    t, q, u, v, p, ph, h, gz, &
                     p1feed, p2feed, wght, &
                     wghti, tnk, thnk, qnk, qsnk, unk, vnk, &
@@ -286 +286 @@
 
   USE mod_phys_lmdz_transfert_para, ONLY : bcast
+  USE add_phys_tend_mod, ONLY: fl_cor_ebil
   IMPLICIT NONE
 
@@ -295 +296 @@
 ! - here, nk(i)=minorig
 ! - icb defined differently (plcl compared with ph instead of p)
+! - dry static energy as argument instead of moist static energy
 
 ! Main differences with convect3:
@@ -310 +312 @@
   REAL, DIMENSION (len, nd), INTENT (IN)             :: t, q, p
   REAL, DIMENSION (len, nd), INTENT (IN)             :: u, v
-  REAL, DIMENSION (len, nd), INTENT (IN)             :: hm, gz
+  REAL, DIMENSION (len, nd), INTENT (IN)             :: h, gz
   REAL, DIMENSION (len, nd+1), INTENT (IN)           :: ph
   REAL, DIMENSION (len), INTENT (IN)                 :: p1feed
@@ -381 +383 @@
     pup(i) = p2feed(i)
   END DO
-  CALL cv3_vertmix(len, nd, iflag, p1feed, pup, p, ph, &
-                   t, q, u, v, wght, &
-                   wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plclup)
+  IF (fl_cor_ebil >=2 ) THEN
+    CALL cv3_estatmix(len, nd, iflag, p1feed, pup, p, ph, &
+                     t, q, u, v, h, gz, wght, &
+                     wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plclup)
+  ELSE
+    CALL cv3_enthalpmix(len, nd, iflag, p1feed, pup, p, ph, &
+                       t, q, u, v, wght, &
+                       wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plclup)
+  ENDIF  ! (fl_cor_ebil >=2 ) 
 ! 1.b- LCL associated with ph(nk+1)
   DO i = 1, len
     plo(i) = ph(i, nk(i)+1)
   END DO
-  CALL cv3_vertmix(len, nd, iflag, p1feed, plo, p, ph, &
-                   t, q, u, v, wght, &
-                   wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plcllo)
+  IF (fl_cor_ebil >=2 ) THEN
+    CALL cv3_estatmix(len, nd, iflag, p1feed, plo, p, ph, &
+                     t, q, u, v, h, gz, wght, &
+                     wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plcllo)
+  ELSE
+    CALL cv3_enthalpmix(len, nd, iflag, p1feed, plo, p, ph, &
+                       t, q, u, v, wght, &
+                       wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plcllo)
+  ENDIF  ! (fl_cor_ebil >=2 ) 
 ! 2- Iterations
   niter = 5
@@ -437 +451 @@
 !jyg>
 
-    CALL cv3_vertmix(len, nd, iflag, p1feed, pfeed, p, ph, &
-                   t, q, u, v, wght, &
-                   wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plclfeed)
+    IF (fl_cor_ebil >=2 ) THEN
+      CALL cv3_estatmix(len, nd, iflag, p1feed, pfeed, p, ph, &
+                       t, q, u, v, h, gz, wght, &
+                       wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plclfeed)
+    ELSE
+      CALL cv3_enthalpmix(len, nd, iflag, p1feed, pfeed, p, ph, &
+                         t, q, u, v, wght, &
+                         wghti, nk, tnk, thnk, qnk, qsnk, unk, vnk, plclfeed)
+    ENDIF  ! (fl_cor_ebil >=2 ) 
 !jyg20140217<
     IF (ok_new_feed) THEN
@@ -1650 +1670 @@
       DO i = 1, ncum
         IF ((k>=icb(i)) .AND. (k<=inb(i))) THEN
+!jyg<   (energy conservation tests)
+!!          hp(i, k) = hnk(i) + (lv(i,k)+(cpd-cpv)*tp(i,k))*ep(i, k)*clw(i, k)
+!!          hp(i, k) = ( hnk(i) + (lv(i,k)+(cpd-cpv)*t(i,k))*ep(i, k)*clw(i, k) ) / &
+!!                     (1. - ep(i,k)*clw(i,k))
+!!          hp(i, k) = ( hnk(i) + (lv(i,k)+(cpd-cl)*t(i,k))*ep(i, k)*clw(i, k) ) / &
+!!                     (1. - ep(i,k)*clw(i,k))
           hp(i, k) = hnk(i) + (lv(i,k)+(cpd-cpv)*t(i,k))*ep(i, k)*clw(i, k)
         END IF
@@ -3543 +3569 @@
                                     t(il,i)*(cpv-cpd)*(rr(il,i)-qent(il,i,i)))*cpinv
         END IF
-
-
-
+!
 ! sb: on ne fait pas encore la correction permettant de mieux
 ! conserver l'eau:

LMDZ5/trunk/libf/phylmd/cv3p_mixing.F90

@@ -254 +254 @@
         uent(il, i, i) = unk(il)
         vent(il, i, i) = vnk(il)
+        IF (fl_cor_ebil .GE. 2) THEN
+          hent(il, i, i) = hp(il,i)
+        ENDIF
         elij(il, i, i) = clw(il, i)*(1.-ep(il,i))
         Sij(il, i, i) = 0.0
       END IF
     END DO
-  END DO
+  END DO ! i = minorig + 1, nl
 
 !jyg!  DO j = 1, ntra
@@ -663 +666 @@
         vent(il, i, i) = vnk(il)
         elij(il, i, i) = clw(il, i)*(1.-ep(il,i))
-        Sij(il, i, i) = 0.0
+        IF (fl_cor_ebil .GE. 2) THEN
+          hent(il, i, i) = hp(il,i)
+          Sigij(il, i, i) = 0.0
+        ELSE
+          Sij(il, i, i) = 0.0
+        ENDIF
       END IF
     END DO ! il

LMDZ5/trunk/libf/phylmd/cva_driver.F90

@@ -40 +40 @@
 
   USE print_control_mod, ONLY: prt_level, lunout
+  USE add_phys_tend_mod, ONLY: fl_cor_ebil
   IMPLICIT NONE
 
@@ -730 +731 @@
              PRINT *, 'cva_driver -> cv3_feed'
     CALL cv3_feed(len, nd, ok_conserv_q, &                 ! nd->na
-                  t1, q1, u1, v1, p1, ph1, hm1, gz1, & 
+                  t1, q1, u1, v1, p1, ph1, h1, gz1, & 
                   p1feed1, p2feed1, wght1, &
                   wghti1, tnk1, thnk1, qnk1, qsnk1, unk1, vnk1, &

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -245 +245 @@
 
     USE cmp_seri_mod
-    USE add_phys_tend_mod, only : add_pbl_tend, add_phys_tend, prt_enerbil, &
+    USE add_phys_tend_mod, only : add_pbl_tend, add_phys_tend, diag_phys_tend, prt_enerbil, &
   &      fl_ebil, fl_cor_ebil