Ignore:
Timestamp:
Dec 6, 2022, 12:01:16 AM (22 months ago)
Author:
lguez
Message:

Sync latest trunk changes to Ocean_skin

Location:
LMDZ6/branches/Ocean_skin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/Ocean_skin

  • LMDZ6/branches/Ocean_skin/libf/phylmdiso/phys_local_var_mod.F90

    r4009 r4368  
    1616      REAL, SAVE, ALLOCATABLE :: u_seri(:,:), v_seri(:,:)
    1717      !$OMP THREADPRIVATE(u_seri, v_seri)
    18       REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:), l_mix(:,:,:), tke_dissip(:,:,:), wprime(:,:,:)
    19       !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip, wprime)
     18      REAL, SAVE, ALLOCATABLE :: rneb_seri(:,:)
     19      !$OMP THREADPRIVATE(rneb_seri)
     20      REAL, SAVE, ALLOCATABLE :: d_rneb_dyn(:,:)
     21      !$OMP THREADPRIVATE(d_rneb_dyn)
     22      REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:),l_mix(:,:,:),tke_dissip(:,:,:),wprime(:,:,:)
     23      !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip,wprime)
    2024      REAL, SAVE, ALLOCATABLE :: tr_seri(:,:,:)
    2125      !$OMP THREADPRIVATE(tr_seri)
     
    465469      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: proba_notrig, random_notrig
    466470!$OMP THREADPRIVATE(proba_notrig, random_notrig)
    467       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: cv_gen
    468 !$OMP THREADPRIVATE(cv_gen)
    469471      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: fsolsw, wfbils, wfbilo
    470472!$OMP THREADPRIVATE(fsolsw, wfbils, wfbilo)
     
    557559      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: cldemi, cldfra, cldtau, fiwc, fl, re, flwc
    558560!$OMP THREADPRIVATE(cldemi, cldfra, cldtau, fiwc, fl, re, flwc)
    559       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith
    560 !$OMP THREADPRIVATE(qlth, qith)
     561      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: qlth, qith, qsith, wiceth
     562!$OMP THREADPRIVATE(qlth, qith, qsith, wiceth)
    561563      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ref_liq, ref_ice, theta, zphi
    562564!$OMP THREADPRIVATE(ref_liq, ref_ice, theta, zphi)
     
    603605      INTEGER,ALLOCATABLE,SAVE,DIMENSION(:,:) :: zn2mout
    604606!$OMP THREADPRIVATE(zn2mout)
     607
     608      REAL, SAVE, ALLOCATABLE :: qclr(:,:)
     609      !$OMP THREADPRIVATE(qclr)
     610      REAL, SAVE, ALLOCATABLE :: qcld(:,:)
     611      !$OMP THREADPRIVATE(qcld)
     612      REAL, SAVE, ALLOCATABLE :: qss(:,:)
     613      !$OMP THREADPRIVATE(qss)
     614      REAL, SAVE, ALLOCATABLE :: qvc(:,:)
     615      !$OMP THREADPRIVATE(qvc)
     616      REAL, SAVE, ALLOCATABLE :: rnebclr(:,:)
     617      !$OMP THREADPRIVATE(rnebclr)
     618      REAL, SAVE, ALLOCATABLE :: rnebss(:,:)
     619      !$OMP THREADPRIVATE(rnebss)
     620      REAL, SAVE, ALLOCATABLE :: gamma_ss(:,:)
     621      !$OMP THREADPRIVATE(gamma_ss)
     622      REAL, SAVE, ALLOCATABLE :: N1_ss(:,:)
     623      !$OMP THREADPRIVATE(N1_ss)
     624      REAL, SAVE, ALLOCATABLE :: N2_ss(:,:)
     625      !$OMP THREADPRIVATE(N2_ss)
     626      REAL, SAVE, ALLOCATABLE :: drneb_sub(:,:)
     627      !$OMP THREADPRIVATE(drneb_sub)
     628      REAL, SAVE, ALLOCATABLE :: drneb_con(:,:)
     629      !$OMP THREADPRIVATE(drneb_con)
     630      REAL, SAVE, ALLOCATABLE :: drneb_tur(:,:)
     631      !$OMP THREADPRIVATE(drneb_tur)
     632      REAL, SAVE, ALLOCATABLE :: drneb_avi(:,:)
     633      !$OMP THREADPRIVATE(drneb_avi)
     634      REAL, SAVE, ALLOCATABLE :: zqsatl(:,:)
     635      !$OMP THREADPRIVATE(zqsatl)
     636      REAL, SAVE, ALLOCATABLE :: zqsats(:,:)
     637      !$OMP THREADPRIVATE(zqsats)
     638      REAL, SAVE, ALLOCATABLE :: Tcontr(:,:)
     639      !$OMP THREADPRIVATE(Tcontr)
     640      REAL, SAVE, ALLOCATABLE :: qcontr(:,:)
     641      !$OMP THREADPRIVATE(qcontr)
     642      REAL, SAVE, ALLOCATABLE :: qcontr2(:,:)
     643      !$OMP THREADPRIVATE(qcontr2)
     644      REAL, SAVE, ALLOCATABLE :: fcontrN(:,:)
     645      !$OMP THREADPRIVATE(fcontrN)
     646      REAL, SAVE, ALLOCATABLE :: fcontrP(:,:)
     647      !$OMP THREADPRIVATE(fcontrP)
    605648
    606649#ifdef CPP_StratAer
     
    683726USE infotrac_phy, ONLY : nbtr
    684727#ifdef ISO
    685 USE infotrac_phy, ONLY : ntraciso,niso
     728USE infotrac_phy, ONLY : ntraciso=>ntiso,niso
    686729#endif
    687730USE aero_mod
     
    693736      ALLOCATE(t_seri(klon,klev),q_seri(klon,klev),ql_seri(klon,klev),qs_seri(klon,klev))
    694737      ALLOCATE(u_seri(klon,klev),v_seri(klon,klev))
    695       ALLOCATE(l_mixmin(klon,klev+1,nbsrf), l_mix(klon,klev+1,nbsrf), tke_dissip(klon,klev+1,nbsrf), wprime(klon,klev+1,nbsrf))
    696       l_mix(:,:,:)=0. ; l_mixmin(:,:,:)=0. ; tke_dissip(:,:,:)=0. ; wprime(:,:,:)=0. ! doit etre initialse car pas toujours remplis
     738      ALLOCATE(l_mixmin(klon,klev+1,nbsrf),l_mix(klon,klev+1,nbsrf),tke_dissip(klon,klev+1,nbsrf),wprime(klon,klev+1,nbsrf))
     739      l_mix(:,:,:)=0.;l_mixmin(:,:,:)=0.;tke_dissip(:,:,:)=0.;wprime(:,:,:)=0. ! doit etre initialse car pas toujours remplis
    697740
    698741      ALLOCATE(tr_seri(klon,klev,nbtr))
     
    900943      ALLOCATE(rain_lsc(klon))
    901944      ALLOCATE(rain_num(klon))
    902       ALLOCATE(qlth(klon,klev), qith(klon,klev))
     945      ALLOCATE(qlth(klon,klev), qith(klon,klev), qsith(klon,klev), wiceth(klon,klev))
    903946      !
    904947#ifdef ISO
     
    949992      alp_bl_stat(:)=0
    950993      ALLOCATE(proba_notrig(klon), random_notrig(klon))
    951       ALLOCATE(cv_gen(klon))
    952994
    953995      ALLOCATE(dnwd0(klon, klev))
     
    9621004      ALLOCATE(ref_liq_pi(klon, klev), ref_ice_pi(klon, klev))
    9631005      ALLOCATE(zphi(klon, klev), zx_rh(klon, klev), zx_rhl(klon,klev), zx_rhi(klon,klev))
     1006      zx_rhl(:,:)=0.; zx_rhi(:,:)=0. ! because not always defined
    9641007      ALLOCATE(pmfd(klon, klev), pmfu(klon, klev))
    9651008
     
    10401083
    10411084      ALLOCATE(zn2mout(klon,6))
     1085
     1086! Supersaturation
     1087      ALLOCATE(rneb_seri(klon,klev))
     1088      ALLOCATE(d_rneb_dyn(klon,klev))
     1089      ALLOCATE(qclr(klon,klev), qcld(klon,klev), qss(klon,klev), qvc(klon,klev))
     1090      ALLOCATE(rnebclr(klon,klev), rnebss(klon,klev), gamma_ss(klon,klev))
     1091      ALLOCATE(N1_ss(klon,klev), N2_ss(klon,klev))
     1092      ALLOCATE(drneb_sub(klon,klev), drneb_con(klon,klev), drneb_tur(klon,klev), drneb_avi(klon,klev))
     1093      ALLOCATE(zqsatl(klon,klev), zqsats(klon,klev))
     1094      ALLOCATE(Tcontr(klon,klev), qcontr(klon,klev), qcontr2(klon,klev), fcontrN(klon,klev), fcontrP(klon,klev))
    10421095
    10431096#ifdef CPP_StratAer
     
    10901143      DEALLOCATE(t_seri,q_seri,ql_seri,qs_seri)
    10911144      DEALLOCATE(u_seri,v_seri)
    1092       DEALLOCATE(l_mixmin,l_mix, tke_dissip, wprime)
     1145      DEALLOCATE(l_mixmin,l_mix, tke_dissip,wprime)
    10931146
    10941147      DEALLOCATE(tr_seri)
     
    12721325      DEALLOCATE(rain_lsc)
    12731326      DEALLOCATE(rain_num)
    1274       DEALLOCATE(qlth, qith)
     1327      DEALLOCATE(qlth, qith, qsith, wiceth)
    12751328!
    12761329      DEALLOCATE(sens_x, sens_w)
     
    13111364      DEALLOCATE(alp_bl_stat, n2, s2)
    13121365      DEALLOCATE(proba_notrig, random_notrig)
    1313       DEALLOCATE(cv_gen)
    13141366
    13151367      DEALLOCATE(dnwd0)
     
    13931445      DEALLOCATE (t_tropopause)
    13941446      DEALLOCATE(zn2mout)
     1447
     1448! Supersaturation
     1449      DEALLOCATE(rneb_seri)
     1450      DEALLOCATE(d_rneb_dyn)
     1451      DEALLOCATE(qclr, qcld, qss, qvc)
     1452      DEALLOCATE(rnebclr, rnebss, gamma_ss)
     1453      DEALLOCATE(N1_ss, N2_ss)
     1454      DEALLOCATE(drneb_sub, drneb_con, drneb_tur, drneb_avi)
     1455      DEALLOCATE(zqsatl, zqsats)
     1456      DEALLOCATE(Tcontr, qcontr, qcontr2, fcontrN, fcontrP)
    13951457
    13961458#ifdef CPP_StratAer
Note: See TracChangeset for help on using the changeset viewer.