Ignore:
Timestamp:
Jul 28, 2025, 7:23:15 PM (11 days ago)
Author:
aborella
Message:

Merge with trunk r5789

Location:
LMDZ6/branches/contrails
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/contrails

  • LMDZ6/branches/contrails/libf/phylmd/phys_state_var_mod.F90

    r5790 r5791  
    1515      INTEGER, PARAMETER :: nlevSTD8=8
    1616      INTEGER, PARAMETER :: nlevSTD3=3
    17       INTEGER, PARAMETER :: nout=3
     17      INTEGER, PARAMETER :: nout=10
    1818      INTEGER, PARAMETER :: napisccp=1
    1919      INTEGER, SAVE :: radpas  ! radiation is called every "radpas" step
     
    144144      REAL, ALLOCATABLE, SAVE :: cfc_ancien(:,:), qtc_ancien(:,:), nic_ancien(:,:)
    145145!$OMP THREADPRIVATE(cfc_ancien, qtc_ancien, nic_ancien)
     146       REAL, ALLOCATABLE, SAVE :: tke_ancien(:,:)
     147!$OMP THREADPRIVATE(tke_ancien)
    146148!!! RomP >>>
    147149      REAL, ALLOCATABLE, SAVE :: tr_ancien(:,:,:)
     
    173175!$OMP THREADPRIVATE(clwcon0th,rnebcon0th)
    174176! radiation outputs
     177!FC
     178      REAL,ALLOCATABLE,SAVE :: lwtoab(:,:), lwtoa0b(:,:)
     179!$OMP THREADPRIVATE(lwtoab,lwtoa0b)
     180      REAL,ALLOCATABLE,SAVE :: lwtoabp(:,:), lwtoa0bp(:,:)
     181!$OMP THREADPRIVATE(lwtoabp,lwtoa0bp)
     182! FC
    175183      REAL,ALLOCATABLE,SAVE :: swdnc0(:,:), swdn0(:,:), swdn(:,:)
    176184!$OMP THREADPRIVATE(swdnc0,swdn0,swdn)
     
    222230      REAL,ALLOCATABLE,SAVE :: O3sumSTD(:,:,:), O3daysumSTD(:,:,:)
    223231!$OMP THREADPRIVATE(O3sumSTD,O3daysumSTD)
     232!GG
     233      REAL,ALLOCATABLE,SAVE :: hice(:)
     234!$OMP THREADPRIVATE(hice)
     235      REAL,ALLOCATABLE,SAVE :: tice(:)
     236!$OMP THREADPRIVATE(tice)
     237      REAL,ALLOCATABLE,SAVE :: bilg_cumul(:)
     238!$OMP THREADPRIVATE(bilg_cumul)
     239!GG
    224240!IM begin
    225241      REAL,ALLOCATABLE,SAVE :: wlevSTD(:,:), ulevSTD(:,:), vlevSTD(:,:)
     
    471487      REAL,ALLOCATABLE,SAVE :: swdnc0_s2(:,:), swdn0_s2(:,:), swdn_s2(:,:)
    472488      REAL,ALLOCATABLE,SAVE :: swupc0_s2(:,:), swup0_s2(:,:), swup_s2(:,:)
    473 !$OMP THREADPRIVATE(swdnc0_s2, swdn0_s2, swdn_s2, swupc0_s2, swup0_s2, swup_s2)
     489!$OMP THREADPRIVATE(swdnc0_s2, swdn0_s2, swdn_s2 , swupc0_s2, swup0_s2, swup_s2)
     490!FC
     491      REAL,ALLOCATABLE,SAVE :: lwtoab_s2(:,:), lwtoa0b_s2(:,:)
     492!$OMP THREADPRIVATE(lwtoab_s2,lwtoa0b_s2)
     493
    474494
    475495! pbase : cloud base pressure
     
    662682      ALLOCATE(cfc_ancien(klon,klev), qtc_ancien(klon,klev), nic_ancien(klon,klev))
    663683      ALLOCATE(qvcon(klon,klev), qccon(klon,klev))
     684      ALLOCATE(tke_ancien(klon,klev+1))
    664685!!! Rom P >>>
    665686      ALLOCATE(tr_ancien(klon,klev,nbtr))
     
    685706      ALLOCATE(clwcon0th(klon,klev),rnebcon0th(klon,klev))
    686707! radiation outputs
     708!FC
     709      ALLOCATE(lwtoab(klon,nbands_lw_rrtm), lwtoa0b(klon,nbands_lw_rrtm))
     710      lwtoab(:,:)=0.0
     711      lwtoa0b(:,:)=0.0
     712      ALLOCATE(lwtoab_s2(klon,nbands_lw_rrtm), lwtoa0b_s2(klon,nbands_lw_rrtm))
     713      lwtoab_s2(:,:)=0.0
     714      lwtoa0b_s2(:,:)=0.0
     715      ALLOCATE(lwtoabp(klon,nbands_lw_rrtm), lwtoa0bp(klon,nbands_lw_rrtm))
     716      lwtoabp(:,:)=0.0
     717      lwtoa0bp(:,:)=0.0
     718!FC
    687719      ALLOCATE(swdnc0(klon,klevp1), swdn0(klon,klevp1), swdn(klon,klevp1))
    688720      ALLOCATE(swupc0(klon,klevp1), swup0(klon,klevp1), swup(klon,klevp1))
     
    726758      ALLOCATE(zuthe(klon),zvthe(klon))
    727759      ALLOCATE(alb_neig(klon))
     760!GG
     761      ALLOCATE(hice(klon))
     762      hice(:) = 0.
     763      ALLOCATE(tice(klon))
     764      tice(:) = 0.
     765      ALLOCATE(bilg_cumul(klon))
     766      bilg_cumul(:) = 0.
     767!GG
    728768!cloud base mass flux
    729769      ALLOCATE(ema_cbmf(klon))
     
    913953      DEALLOCATE(cfc_ancien, qtc_ancien, nic_ancien)
    914954      DEALLOCATE(qvcon, qccon)
     955      DEALLOCATE(tke_ancien)
    915956      DEALLOCATE(tr_ancien)                           !RomP
    916957      DEALLOCATE(ratqs, pbl_tke,coefh,coefm)
     
    921962      DEALLOCATE(clwcon0th, rnebcon0th)
    922963! radiation outputs
     964!FC
     965      DEALLOCATE(lwtoab, lwtoa0b)
     966      DEALLOCATE(lwtoab_s2, lwtoa0b_s2)
     967      DEALLOCATE(lwtoabp, lwtoa0bp)
     968!FC
    923969      DEALLOCATE(swdnc0, swdn0, swdn)
    924970      DEALLOCATE(swupc0, swup0, swup)
     
    9541000      DEALLOCATE(zuthe, zvthe)
    9551001      DEALLOCATE(alb_neig)
     1002!GG
     1003      DEALLOCATE(hice)
     1004      DEALLOCATE(tice)
     1005      DEALLOCATE(bilg_cumul)
     1006!GG
    9561007      DEALLOCATE(ema_cbmf)
    9571008      DEALLOCATE(ema_pcb, ema_pct)
Note: See TracChangeset for help on using the changeset viewer.