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

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -41 +41 @@
       REAL, SAVE, ALLOCATABLE :: d_u_ajs(:,:), d_v_ajs(:,:)
       !$OMP THREADPRIVATE(d_u_ajs, d_v_ajs)
-      REAL, SAVE, ALLOCATABLE :: d_u_ajsb(:,:), d_v_ajsb(:,:)
-      !$OMP THREADPRIVATE(d_u_ajsb, d_v_ajsb)
       REAL, SAVE, ALLOCATABLE :: d_t_eva(:,:),d_q_eva(:,:)
       !$OMP THREADPRIVATE(d_t_eva,d_q_eva)
@@ -95 +93 @@
       REAL, SAVE, ALLOCATABLE :: topswcf_aero(:,:),  solswcf_aero(:,:)  ! diag
       !$OMP THREADPRIVATE(topswcf_aero,solswcf_aero)
+! Special RRTM
+      REAL, SAVE, ALLOCATABLE :: ZLWFT0_i(:,:),  ZSWFT0_i(:,:)      ! diag
+      !$OMP THREADPRIVATE(ZLWFT0_i,ZSWFT0_i)
+      REAL, SAVE, ALLOCATABLE :: ZFLDN0(:,:),  ZFLUP0(:,:)      ! diag
+      !$OMP THREADPRIVATE(ZFLDN0,ZFLUP0)
+      REAL, SAVE, ALLOCATABLE :: ZFSDN0(:,:),  ZFSUP0(:,:)      ! diag
+      !$OMP THREADPRIVATE(ZFSDN0,ZFSUP0)
+!
       REAL, SAVE, ALLOCATABLE :: tausum_aero(:,:,:) 
       !$OMP THREADPRIVATE(tausum_aero) 
@@ -200 +206 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: cldh, cldl, cldm, cldq, cldt, qsat2m, qsol
 !$OMP THREADPRIVATE(cldh, cldl, cldm, cldq, cldt, qsat2m, qsol)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: cldhjn, cldljn, cldmjn,cldtjn
+!$OMP THREADPRIVATE(cldhjn, cldljn, cldmjn, cldtjn)
+      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)
@@ -241 +251 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ref_liq, ref_ice, theta, zphi
 !$OMP THREADPRIVATE(ref_liq, ref_ice, theta, zphi)
+      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)
@@ -263 +275 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: beta_prec
 !$OMP THREADPRIVATE(beta_prec)
-      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: rneb
-!$OMP THREADPRIVATE(rneb)
+      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: rneb,rnebjn
+!$OMP THREADPRIVATE(rneb,rnebjn)
 
 ! variables de sorties MM
@@ -299 +311 @@
       allocate(d_t_ajs(klon,klev),d_q_ajs(klon,klev))
       allocate(d_u_ajs(klon,klev),d_v_ajs(klon,klev))
-      allocate(d_u_ajsb(klon,klev),d_v_ajsb(klon,klev))
       allocate(d_t_eva(klon,klev),d_q_eva(klon,klev))
       allocate(d_t_lscst(klon,klev),d_q_lscst(klon,klev))
@@ -312 +323 @@
       allocate(d_u_lif(klon,klev),d_v_lif(klon,klev))
       allocate(d_ts(klon,nbsrf), d_tr(klon,klev,nbtr))
+! Special RRTM
+      allocate(ZLWFT0_i(klon,klev+1),ZSWFT0_i(klon,klev+1),ZFLDN0(klon,klev+1))
+      allocate(ZFLUP0(klon,klev+1),ZFSDN0(klon,klev+1),ZFSUP0(klon,klev+1))
+!
       allocate(topswad_aero(klon), solswad_aero(klon))
       allocate(topswai_aero(klon), solswai_aero(klon))
@@ -373 +388 @@
       ALLOCATE(cdragm(klon), cdragh(klon), cldh(klon), cldl(klon))
       ALLOCATE(cldm(klon), cldq(klon), cldt(klon), qsat2m(klon), qsol(klon))
+      ALLOCATE(cldhjn(klon), cldljn(klon), cldmjn(klon), cldtjn(klon))
+      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))
@@ -397 +414 @@
       ALLOCATE(fl(klon, klev), re(klon, klev), flwc(klon, klev))
       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(pmfd(klon, klev), pmfu(klon, klev))
@@ -420 +438 @@
       ALLOCATE(wdtrainA(klon,klev),wdtrainM(klon,klev))
       ALLOCATE(beta_prec(klon,klev))
-      ALLOCATE(rneb(klon,klev))
+      ALLOCATE(rneb(klon,klev),rnebjn(klon,klev))
 
 
@@ -450 +468 @@
       deallocate(d_t_ajs,d_q_ajs)
       deallocate(d_u_ajs,d_v_ajs)
-      deallocate(d_u_ajsb,d_v_ajsb)
       deallocate(d_t_eva,d_q_eva)
       deallocate(d_t_lscst,d_q_lscst)
@@ -524 +541 @@
       DEALLOCATE(cdragm, cdragh, cldh, cldl)
       DEALLOCATE(cldm, cldq, cldt, qsat2m, qsol)
+      DEALLOCATE(cldljn, cldmjn, cldhjn, cldtjn, JrNt)
       DEALLOCATE(dthmin, evap, fder, plcl, plfc)
       DEALLOCATE(prw, zustar, zu10m, zv10m, rh2m, s_lcl)
@@ -547 +565 @@
       DEALLOCATE(fl, re, flwc)
       DEALLOCATE(ref_liq, ref_ice, theta)
+      DEALLOCATE(ref_liq_pi, ref_ice_pi)
       DEALLOCATE(zphi, wake_omg, zx_rh)
       DEALLOCATE(pmfd, pmfu)