Changeset 4368 for LMDZ6/branches/Ocean_skin/libf/phylmd/phys_local_var_mod.F90

Timestamp:

Dec 6, 2022, 12:01:16 AM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

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

LMDZ6/branches/Ocean_skin/libf/phylmd/phys_local_var_mod.F90

@@ -16 +16 @@
       REAL, SAVE, ALLOCATABLE :: u_seri(:,:), v_seri(:,:)
       !$OMP THREADPRIVATE(u_seri, v_seri)
+      REAL, SAVE, ALLOCATABLE :: rneb_seri(:,:)
+      !$OMP THREADPRIVATE(rneb_seri)
+      REAL, SAVE, ALLOCATABLE :: d_rneb_dyn(:,:)
+      !$OMP THREADPRIVATE(d_rneb_dyn)
       REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:),l_mix(:,:,:),tke_dissip(:,:,:),wprime(:,:,:)
       !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip,wprime)
@@ -434 +438 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: cldemi, cldfra, cldtau, fiwc, fl, re, flwc
 !$OMP THREADPRIVATE(cldemi, cldfra, cldtau, fiwc, fl, re, flwc)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith
-!$OMP THREADPRIVATE(qlth, qith)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith, qsith, wiceth
+!$OMP THREADPRIVATE(qlth, qith, qsith, wiceth)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ref_liq, ref_ice, theta, zphi
 !$OMP THREADPRIVATE(ref_liq, ref_ice, theta, zphi)
@@ -455 +459 @@
 !$OMP THREADPRIVATE(phiwriteSTD, qwriteSTD, twriteSTD, rhwriteSTD)
 
+
 ! ug et d'autres encore:
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: beta_prec
@@ -472 +477 @@
       INTEGER,ALLOCATABLE,SAVE,DIMENSION(:,:) :: zn2mout
 !$OMP THREADPRIVATE(zn2mout)
+
+      REAL, SAVE, ALLOCATABLE :: qclr(:,:)
+      !$OMP THREADPRIVATE(qclr)
+      REAL, SAVE, ALLOCATABLE :: qcld(:,:)
+      !$OMP THREADPRIVATE(qcld)
+      REAL, SAVE, ALLOCATABLE :: qss(:,:)
+      !$OMP THREADPRIVATE(qss)
+      REAL, SAVE, ALLOCATABLE :: qvc(:,:)
+      !$OMP THREADPRIVATE(qvc)
+      REAL, SAVE, ALLOCATABLE :: rnebclr(:,:)
+      !$OMP THREADPRIVATE(rnebclr)
+      REAL, SAVE, ALLOCATABLE :: rnebss(:,:)
+      !$OMP THREADPRIVATE(rnebss)
+      REAL, SAVE, ALLOCATABLE :: gamma_ss(:,:)
+      !$OMP THREADPRIVATE(gamma_ss)
+      REAL, SAVE, ALLOCATABLE :: N1_ss(:,:)
+      !$OMP THREADPRIVATE(N1_ss)
+      REAL, SAVE, ALLOCATABLE :: N2_ss(:,:)
+      !$OMP THREADPRIVATE(N2_ss)
+      REAL, SAVE, ALLOCATABLE :: drneb_sub(:,:)
+      !$OMP THREADPRIVATE(drneb_sub)
+      REAL, SAVE, ALLOCATABLE :: drneb_con(:,:)
+      !$OMP THREADPRIVATE(drneb_con)
+      REAL, SAVE, ALLOCATABLE :: drneb_tur(:,:)
+      !$OMP THREADPRIVATE(drneb_tur)
+      REAL, SAVE, ALLOCATABLE :: drneb_avi(:,:)
+      !$OMP THREADPRIVATE(drneb_avi)
+      REAL, SAVE, ALLOCATABLE :: zqsatl(:,:)
+      !$OMP THREADPRIVATE(zqsatl)
+      REAL, SAVE, ALLOCATABLE :: zqsats(:,:)
+      !$OMP THREADPRIVATE(zqsats)
+      REAL, SAVE, ALLOCATABLE :: Tcontr(:,:)
+      !$OMP THREADPRIVATE(Tcontr)
+      REAL, SAVE, ALLOCATABLE :: qcontr(:,:)
+      !$OMP THREADPRIVATE(qcontr)
+      REAL, SAVE, ALLOCATABLE :: qcontr2(:,:)
+      !$OMP THREADPRIVATE(qcontr2)
+      REAL, SAVE, ALLOCATABLE :: fcontrN(:,:)
+      !$OMP THREADPRIVATE(fcontrN)
+      REAL, SAVE, ALLOCATABLE :: fcontrP(:,:)
+      !$OMP THREADPRIVATE(fcontrP)
 
 #ifdef CPP_StratAer
@@ -732 +778 @@
       ALLOCATE(rain_lsc(klon))
       ALLOCATE(rain_num(klon))
-      ALLOCATE(qlth(klon,klev), qith(klon,klev))
+      ALLOCATE(qlth(klon,klev), qith(klon,klev), qsith(klon,klev), wiceth(klon,klev))
       !
       ALLOCATE(sens_x(klon), sens_w(klon))
@@ -778 +824 @@
       ALLOCATE(ref_liq_pi(klon, klev), ref_ice_pi(klon, klev))
       ALLOCATE(zphi(klon, klev), zx_rh(klon, klev), zx_rhl(klon,klev), zx_rhi(klon,klev))
+      zx_rhl(:,:)=0.; zx_rhi(:,:)=0. ! because not always defined
       ALLOCATE(pmfd(klon, klev), pmfu(klon, klev))
 
@@ -828 +875 @@
 
       ALLOCATE(zn2mout(klon,6))
+
+! Supersaturation
+      ALLOCATE(rneb_seri(klon,klev))
+      ALLOCATE(d_rneb_dyn(klon,klev))
+      ALLOCATE(qclr(klon,klev), qcld(klon,klev), qss(klon,klev), qvc(klon,klev))
+      ALLOCATE(rnebclr(klon,klev), rnebss(klon,klev), gamma_ss(klon,klev))
+      ALLOCATE(N1_ss(klon,klev), N2_ss(klon,klev))
+      ALLOCATE(drneb_sub(klon,klev), drneb_con(klon,klev), drneb_tur(klon,klev), drneb_avi(klon,klev))
+      ALLOCATE(zqsatl(klon,klev), zqsats(klon,klev))
+      ALLOCATE(Tcontr(klon,klev), qcontr(klon,klev), qcontr2(klon,klev), fcontrN(klon,klev), fcontrP(klon,klev))
 
 #ifdef CPP_StratAer
@@ -1032 +1089 @@
       DEALLOCATE(rain_lsc)
       DEALLOCATE(rain_num)
-      DEALLOCATE(qlth, qith)
+      DEALLOCATE(qlth, qith, qsith, wiceth)
 !
       DEALLOCATE(sens_x, sens_w)
@@ -1116 +1173 @@
       DEALLOCATE (t_tropopause)
       DEALLOCATE(zn2mout)
+
+! Supersaturation
+      DEALLOCATE(rneb_seri)
+      DEALLOCATE(d_rneb_dyn)
+      DEALLOCATE(qclr, qcld, qss, qvc)
+      DEALLOCATE(rnebclr, rnebss, gamma_ss)
+      DEALLOCATE(N1_ss, N2_ss)
+      DEALLOCATE(drneb_sub, drneb_con, drneb_tur, drneb_avi)
+      DEALLOCATE(zqsatl, zqsats)
+      DEALLOCATE(Tcontr, qcontr, qcontr2, fcontrN, fcontrP)
 
 #ifdef CPP_StratAer