Changeset 2542 for LMDZ5/branches/testing/libf/phylmd/phys_local_var_mod.F90

Timestamp:

Jun 6, 2016, 4:04:57 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2487:2541 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_local_var_mod.F90 (modified) (12 diffs)

LMDZ5/branches/testing/libf/phylmd/phys_local_var_mod.F90

@@ -21 +21 @@
       REAL, SAVE, ALLOCATABLE :: d_t_dyn(:,:), d_q_dyn(:,:)
       !$OMP THREADPRIVATE(d_t_dyn, d_q_dyn)
+      REAL, SAVE, ALLOCATABLE :: d_ql_dyn(:,:), d_qs_dyn(:,:)
+      !$OMP THREADPRIVATE(d_ql_dyn, d_qs_dyn)
+      REAL, SAVE, ALLOCATABLE :: d_q_dyn2d(:), d_ql_dyn2d(:), d_qs_dyn2d(:)
+      !$OMP THREADPRIVATE(d_q_dyn2d, d_ql_dyn2d, d_qs_dyn2d)
       REAL, SAVE, ALLOCATABLE :: d_u_dyn(:,:), d_v_dyn(:,:)
       !$OMP THREADPRIVATE(d_u_dyn, d_v_dyn)
@@ -133 +137 @@
       !$OMP THREADPRIVATE(ZFSDN0,ZFSUP0)
 !
+      REAL, SAVE, ALLOCATABLE :: stratomask(:,:) 
+      !$OMP THREADPRIVATE(stratomask) 
       REAL, SAVE, ALLOCATABLE :: tausum_aero(:,:,:) 
       !$OMP THREADPRIVATE(tausum_aero) 
@@ -255 +261 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: JrNt
 !$OMP THREADPRIVATE(JrNt)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: dthmin, evap, fder, plcl, plfc, prw
-!$OMP THREADPRIVATE(dthmin, evap, fder, plcl, plfc, prw)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: dthmin, evap, fder, plcl, plfc, prw, prlw, prsw
+!$OMP THREADPRIVATE(dthmin, evap, fder, plcl, plfc, prw, prlw, prsw)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zustar, zu10m, zv10m, rh2m
 !$OMP THREADPRIVATE(zustar, zu10m, zv10m, rh2m)
@@ -277 +283 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxfluxlat, zxtsol, snow_lsc, zxfqfonte
 !$OMP THREADPRIVATE(zxfluxlat, zxtsol, snow_lsc, zxfqfonte)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxqsurf, rain_lsc
-!$OMP THREADPRIVATE(zxqsurf, rain_lsc)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxrunofflic
+!$OMP THREADPRIVATE(zxrunofflic)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxqsurf, rain_lsc, rain_num
+!$OMP THREADPRIVATE(zxqsurf, rain_lsc, rain_num)
 !
 !jyg+nrlmd<
@@ -401 +409 @@
       allocate(tr_seri(klon,klev,nbtr))
       allocate(d_t_dyn(klon,klev),d_q_dyn(klon,klev))
+      allocate(d_ql_dyn(klon,klev),d_qs_dyn(klon,klev))
+      allocate(d_q_dyn2d(klon),d_ql_dyn2d(klon),d_qs_dyn2d(klon))
       allocate(d_u_dyn(klon,klev),d_v_dyn(klon,klev))
       allocate(d_tr_dyn(klon,klev,nbtr))                   !RomP
@@ -455 +465 @@
 !      allocate(tausum_aero(klon,nwave,naero_spc))
 !      allocate(tau3d_aero(klon,klev,nwave,naero_spc)) 
+      allocate(stratomask(klon,klev))
 !--correction mini bug OB
       allocate(tausum_aero(klon,nwave,naero_tot))
@@ -521 +532 @@
       ALLOCATE(JrNt(klon))
       ALLOCATE(dthmin(klon), evap(klon), fder(klon), plcl(klon), plfc(klon))
-      ALLOCATE(prw(klon), zustar(klon), zu10m(klon), zv10m(klon), rh2m(klon))
+      ALLOCATE(prw(klon), prlw(klon), prsw(klon), zustar(klon), zu10m(klon), zv10m(klon), rh2m(klon))
       ALLOCATE(s_lcl(klon))
       ALLOCATE(s_pblh(klon), s_pblt(klon), s_therm(klon))
@@ -534 +545 @@
       ALLOCATE(zxfqcalving(klon), zxfluxlat(klon))
       ALLOCATE(zxtsol(klon), snow_lsc(klon), zxfqfonte(klon), zxqsurf(klon))
+      ALLOCATE(zxrunofflic(klon))
       ALLOCATE(rain_lsc(klon))
+      ALLOCATE(rain_num(klon))
 !
       ALLOCATE(sens_x(klon), sens_w(klon))
@@ -615 +628 @@
       deallocate(tr_seri)
       deallocate(d_t_dyn,d_q_dyn)
+      deallocate(d_ql_dyn,d_qs_dyn)
+      deallocate(d_q_dyn2d,d_ql_dyn2d,d_qs_dyn2d)
       deallocate(d_u_dyn,d_v_dyn)
       deallocate(d_tr_dyn)                      !RomP
@@ -658 +673 @@
       deallocate(topsw0_aero,solsw0_aero)
       deallocate(topswcf_aero,solswcf_aero)
+      deallocate(stratomask) 
       deallocate(tausum_aero) 
       deallocate(tau3d_aero) 
@@ -725 +741 @@
       DEALLOCATE(cldljn, cldmjn, cldhjn, cldtjn, JrNt)
       DEALLOCATE(dthmin, evap, fder, plcl, plfc)
-      DEALLOCATE(prw, zustar, zu10m, zv10m, rh2m, s_lcl)
+      DEALLOCATE(prw, prlw, prsw, zustar, zu10m, zv10m, rh2m, s_lcl)
       DEALLOCATE(s_pblh, s_pblt, s_therm)
 !
@@ -736 +752 @@
       DEALLOCATE(uq, ve, vq, zxffonte)
       DEALLOCATE(zxfqcalving, zxfluxlat)
+      DEALLOCATE(zxrunofflic)
       DEALLOCATE(zxtsol, snow_lsc, zxfqfonte, zxqsurf)
       DEALLOCATE(rain_lsc)
+      DEALLOCATE(rain_num)
 !
       DEALLOCATE(sens_x, sens_w)