Changeset 2635 for LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90

Timestamp:

Sep 27, 2016, 6:02:46 PM (8 years ago)

Author:

jyg

Message:

Some cleaning in the wake routines: (i) the wake
number per unit area (wdens) is now a state
variable (held constant for the time being);
(ii) wake state variable changes are computed in
subroutine 'physiq' if iflag_wake_tend=1 (it is
computed within wake routines if
iflag_wake_tend=0, consistent with earlier
versions); (iii) the new routine 'add_wake_tend'
adds tendencies to wake state variables; (iv)
tendencies due to various processes (pbl, wakes,
thermals) are named and added separately.

File:

• LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90 (modified) (12 diffs)

LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -253 +253 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: sens, flwp, fiwp 
 !$OMP THREADPRIVATE(sens, flwp, fiwp)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: ale_wake, alp_wake, bils
-!$OMP THREADPRIVATE(ale_wake, alp_wake, bils)
+!!
+!!         Wake variables
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:)            :: ale_wake, alp_wake
+!$OMP THREADPRIVATE(ale_wake, alp_wake)           
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:)            :: wake_h
+!$OMP THREADPRIVATE(wake_h)                       
+    REAL,ALLOCATABLE,SAVE,DIMENSION(:,:)            :: wake_omg
+!$OMP THREADPRIVATE(wake_omg)                     
+    REAL, SAVE, ALLOCATABLE,DIMENSION(:,:)          :: d_deltat_wk, d_deltaq_wk
+!$OMP THREADPRIVATE(d_deltat_wk, d_deltaq_wk)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:)            :: d_s_wk, d_dens_wk
+!$OMP THREADPRIVATE(d_s_wk, d_dens_wk)
+    REAL, SAVE, ALLOCATABLE,DIMENSION(:,:)          :: d_deltat_wk_gw, d_deltaq_wk_gw
+!$OMP THREADPRIVATE(d_deltat_wk_gw, d_deltaq_wk_gw)
+    REAL, SAVE, ALLOCATABLE,DIMENSION(:,:)          :: d_deltat_vdf, d_deltaq_vdf
+!$OMP THREADPRIVATE(d_deltat_vdf, d_deltaq_vdf)
+!!!      REAL,ALLOCATABLE,SAVE,DIMENSION(:)          :: d_s_vdf, d_dens_vdf
+!!!OMP THREADPRIVATE(d_s_vdf, d_dens_vdf)
+    REAL, SAVE, ALLOCATABLE,DIMENSION(:,:)          :: d_deltat_the, d_deltaq_the
+!$OMP THREADPRIVATE(d_deltat_the, d_deltaq_the)
+!!!      REAL,ALLOCATABLE,SAVE,DIMENSION(:)          :: d_s_the, d_dens_the
+!!!OMP THREADPRIVATE(d_s_the, d_dens_the)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:)           :: d_deltat_ajs_cv, d_deltaq_ajs_cv
+!$OMP THREADPRIVATE(d_deltat_ajs_cv, d_deltaq_ajs_cv)                       
+!!         End of Wake variables
+!!
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: bils
+!$OMP THREADPRIVATE(bils)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: cdragm, cdragh
 !$OMP THREADPRIVATE(cdragm, cdragh)
@@ -312 +338 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: dqvdf_x, dqvdf_w
 !$OMP THREADPRIVATE(dqvdf_x, dqvdf_w)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: undi_tke, wake_tke
-!$OMP THREADPRIVATE(undi_tke, wake_tke)
 ! Variables supplémentaires dans physiq.F relative au splitting de la surface
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:,:) :: pbl_tke_input
@@ -330 +354 @@
 !>jyg+nrlmd
   !
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: wake_h, wbeff, zmax_th, zq2m, zt2m
-!$OMP THREADPRIVATE(wake_h, wbeff, zmax_th, zq2m, zt2m)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: wbeff, zmax_th, zq2m, zt2m
+!$OMP THREADPRIVATE(wbeff, zmax_th, zq2m, zt2m)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zt2m_min_mon, zt2m_max_mon
 !$OMP THREADPRIVATE(zt2m_min_mon, zt2m_max_mon)
@@ -365 +389 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ref_liq_pi, ref_ice_pi
 !$OMP THREADPRIVATE(ref_liq_pi, ref_ice_pi)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: wake_omg, zx_rh
-!$OMP THREADPRIVATE(wake_omg, zx_rh)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: zx_rh
+!$OMP THREADPRIVATE(zx_rh)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: pmflxr, pmflxs, prfl, psfl, fraca
 !$OMP THREADPRIVATE(pmflxr, pmflxs, prfl, psfl, fraca)
@@ -530 +554 @@
       ALLOCATE(tal1(klon), pal1(klon), pab1(klon), pab2(klon))
       ALLOCATE(ptstar(klon),pt0(klon),slp(klon))
-      ALLOCATE(ale_wake(klon), alp_wake(klon), bils(klon))
+!!
+!!          Wake variables
+      ALLOCATE(ale_wake(klon), alp_wake(klon))
+      ALLOCATE(wake_h(klon))
+      ALLOCATE(wake_omg(klon, klev))
+      ALLOCATE(d_deltat_wk(klon, klev), d_deltaq_wk(klon, klev))
+      ALLOCATE(d_s_wk(klon), d_dens_wk(klon))
+      ALLOCATE(d_deltat_wk_gw(klon, klev), d_deltaq_wk_gw(klon, klev))
+      ALLOCATE(d_deltat_vdf(klon, klev), d_deltaq_vdf(klon, klev))
+!!      ALLOCATE( d_s_vdf(klon), d_dens_vdf(klon))
+      ALLOCATE(d_deltat_the(klon, klev), d_deltaq_the(klon, klev))
+!!      ALLOCATE( d_s_the(klon), d_dens_the(klon))
+      ALLOCATE(d_deltat_ajs_cv(klon, klev), d_deltaq_ajs_cv(klon, klev))
+!!         End of wake variables
+!!
+      ALLOCATE(bils(klon))
       ALLOCATE(cdragm(klon), cdragh(klon), cldh(klon), cldl(klon))
       ALLOCATE(cldm(klon), cldq(klon), cldt(klon), qsat2m(klon))
@@ -561 +600 @@
       ALLOCATE(dtvdf_x(klon,klev), dtvdf_w(klon,klev))
       ALLOCATE(dqvdf_x(klon,klev), dqvdf_w(klon,klev))
-      ALLOCATE(undi_tke(klon,klev), wake_tke(klon,klev))
       ALLOCATE(pbl_tke_input(klon,klev+1,nbsrf))
       ALLOCATE(t_therm(klon,klev), q_therm(klon,klev),u_therm(klon,klev), v_therm(klon,klev))
@@ -568 +606 @@
       ALLOCATE(kh(klon), kh_x(klon), kh_w(klon))
 !
-      ALLOCATE(wake_h(klon), wbeff(klon), zmax_th(klon))
+      ALLOCATE(wbeff(klon), zmax_th(klon))
       ALLOCATE(zq2m(klon), zt2m(klon), weak_inversion(klon))
       ALLOCATE(zt2m_min_mon(klon), zt2m_max_mon(klon))
@@ -589 +627 @@
       ALLOCATE(ref_liq(klon, klev), ref_ice(klon, klev), theta(klon, klev))
       ALLOCATE(ref_liq_pi(klon, klev), ref_ice_pi(klon, klev))
-      ALLOCATE(zphi(klon, klev), wake_omg(klon, klev), zx_rh(klon, klev))
+      ALLOCATE(zphi(klon, klev), zx_rh(klon, klev))
       ALLOCATE(pmfd(klon, klev), pmfu(klon, klev))
 
@@ -741 +779 @@
       DEALLOCATE(tal1, pal1, pab1, pab2)
       DEALLOCATE(ptstar, pt0, slp)
-      DEALLOCATE(ale_wake, alp_wake, bils)
+!
+      DEALLOCATE(ale_wake, alp_wake)
+      DEALLOCATE(wake_h)
+      DEALLOCATE(wake_omg)
+      DEALLOCATE(d_deltat_wk, d_deltaq_wk)
+      DEALLOCATE(d_s_wk, d_dens_wk)
+      DEALLOCATE(d_deltat_wk_gw, d_deltaq_wk_gw)
+      DEALLOCATE(d_deltat_vdf, d_deltaq_vdf)
+!!      DEALLOCATE( d_s_vdf, d_dens_vdf)
+      DEALLOCATE(d_deltat_the, d_deltaq_the)
+!!      DEALLOCATE( d_s_the, d_dens_the)
+      DEALLOCATE(d_deltat_ajs_cv, d_deltaq_ajs_cv)
+!
+      DEALLOCATE(bils)
       DEALLOCATE(cdragm, cdragh, cldh, cldl)
       DEALLOCATE(cldm, cldq, cldt, qsat2m)
@@ -770 +821 @@
       DEALLOCATE(dtvdf_x, dtvdf_w)
       DEALLOCATE(dqvdf_x, dqvdf_w)
-      DEALLOCATE(undi_tke, wake_tke)
       DEALLOCATE(pbl_tke_input)
       DEALLOCATE(t_therm, q_therm, u_therm, v_therm)
@@ -777 +827 @@
       DEALLOCATE(kh, kh_x, kh_w)
 !
-      DEALLOCATE(wake_h, wbeff, zmax_th)
+      DEALLOCATE(wbeff, zmax_th)
       DEALLOCATE(zq2m, zt2m, weak_inversion)
       DEALLOCATE(zt2m_min_mon, zt2m_max_mon)
@@ -798 +848 @@
       DEALLOCATE(ref_liq, ref_ice, theta)
       DEALLOCATE(ref_liq_pi, ref_ice_pi)
-      DEALLOCATE(zphi, wake_omg, zx_rh)
+      DEALLOCATE(zphi, zx_rh)
       DEALLOCATE(pmfd, pmfu)