Ignore:
Timestamp:
Nov 30, 2016, 1:28:41 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2664:2719 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2641 r2720  
    2929      REAL, SAVE, ALLOCATABLE :: d_u_dyn(:,:), d_v_dyn(:,:)
    3030      !$OMP THREADPRIVATE(d_u_dyn, d_v_dyn)
    31 !!!!
    3231      REAL, SAVE, ALLOCATABLE :: d_tr_dyn(:,:,:)
    3332      !$OMP THREADPRIVATE(d_tr_dyn)
    34 !!!!
    3533      REAL, SAVE, ALLOCATABLE :: d_t_con(:,:),d_q_con(:,:)
    3634      !$OMP THREADPRIVATE(d_t_con,d_q_con)
     
    5553      !$OMP THREADPRIVATE(d_t_ajs_x, d_q_ajs_x)
    5654!>nrlmd
    57       REAL, SAVE, ALLOCATABLE :: d_t_eva(:,:),d_q_eva(:,:)
    58       !$OMP THREADPRIVATE(d_t_eva,d_q_eva)
     55      REAL, SAVE, ALLOCATABLE :: d_t_eva(:,:),d_q_eva(:,:),d_ql_eva(:,:),d_qi_eva(:,:)
     56      !$OMP THREADPRIVATE(d_t_eva,d_q_eva,d_ql_eva,d_qi_eva)
    5957      REAL, SAVE, ALLOCATABLE :: d_t_lscst(:,:),d_q_lscst(:,:)
    6058      !$OMP THREADPRIVATE(d_t_lscst,d_q_lscst)
     
    372370      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: fsolsw, wfbils, wfbilo
    373371!$OMP THREADPRIVATE(fsolsw, wfbils, wfbilo)
     372      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: wfevap, wfrain, wfsnow
     373!$OMP THREADPRIVATE(wfevap,wfrain,wfsnow)
    374374      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:)  :: t2m, fluxlat, fsollw,evap_pot
    375375!$OMP THREADPRIVATE(t2m, fluxlat, fsollw,evap_pot)
     
    418418!$OMP THREADPRIVATE(sissnow,runoff,albsol3_lic)
    419419
     420#ifdef CPP_StratAer
     421! variables for strat. aerosol CK
     422      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: R2SO4
     423!$OMP THREADPRIVATE(R2SO4)
     424      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: DENSO4
     425!$OMP THREADPRIVATE(DENSO4)
     426      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: f_r_wet
     427!$OMP THREADPRIVATE(f_r_wet)
     428      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: sfluxaer
     429!$OMP THREADPRIVATE(sfluxaer)
     430      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: decfluxaer
     431!$OMP THREADPRIVATE(decfluxaer)
     432      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: mdw
     433!$OMP THREADPRIVATE(mdw)
     434      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sulf_convert
     435!$OMP THREADPRIVATE(sulf_convert)
     436      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sulf_nucl
     437!$OMP THREADPRIVATE(sulf_nucl)
     438      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sulf_cond_evap
     439!$OMP THREADPRIVATE(sulf_cond_evap)
     440      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ocs_convert
     441!$OMP THREADPRIVATE(ocs_convert)
     442      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: SO2_backgr_tend
     443!$OMP THREADPRIVATE(SO2_backgr_tend)
     444      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: OCS_backgr_tend
     445!$OMP THREADPRIVATE(OCS_backgr_tend)
     446      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: OCS_lifetime
     447!$OMP THREADPRIVATE(OCS_lifetime)
     448      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: SO2_lifetime
     449!$OMP THREADPRIVATE(SO2_lifetime)
     450      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: alpha_bin
     451!$OMP THREADPRIVATE(alpha_bin)
     452      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: piz_bin
     453!$OMP THREADPRIVATE(piz_bin)
     454      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: cg_bin
     455!$OMP THREADPRIVATE(cg_bin)
     456      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tau_strat_550
     457!$OMP THREADPRIVATE(tau_strat_550)
     458      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tau_strat_550_lay
     459!$OMP THREADPRIVATE(tau_strat_550_lay)
     460      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tau_strat_1020
     461!$OMP THREADPRIVATE(tau_strat_1020)
     462      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tausum_strat
     463!$OMP THREADPRIVATE(tausum_strat)
     464      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: sulf_dep_dry
     465!$OMP THREADPRIVATE(sulf_dep_dry)
     466      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: sulf_dep_wet
     467!$OMP THREADPRIVATE(sulf_dep_wet)
     468      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: surf_PM25_sulf
     469!$OMP THREADPRIVATE(surf_PM25_sulf)
     470      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: p_tropopause
     471!$OMP THREADPRIVATE(p_tropopause)
     472      REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: vsed_aer
     473!$OMP THREADPRIVATE(vsed_aer)
     474#endif
     475
    420476CONTAINS
    421477
     
    456512      allocate(d_u_ajs(klon,klev),d_v_ajs(klon,klev))
    457513      allocate(d_t_eva(klon,klev),d_q_eva(klon,klev))
     514      allocate(d_ql_eva(klon,klev),d_qi_eva(klon,klev))
    458515      allocate(d_t_lscst(klon,klev),d_q_lscst(klon,klev))
    459516      allocate(d_t_lscth(klon,klev),d_q_lscth(klon,klev))
     
    633690      ALLOCATE(fsollw(klon, nbsrf))
    634691      ALLOCATE(fsolsw(klon, nbsrf), wfbils(klon, nbsrf), wfbilo(klon, nbsrf))
     692      ALLOCATE(wfevap(klon, nbsrf), wfrain(klon,nbsrf), wfsnow(klon, nbsrf))
    635693      ALLOCATE(evap_pot(klon, nbsrf))
    636694
     
    656714      ALLOCATE (sissnow(klon),runoff(klon),albsol3_lic(klon))
    657715
    658 
     716#ifdef CPP_StratAer
     717      ALLOCATE (R2SO4(klon,klev))
     718      ALLOCATE (DENSO4(klon,klev))
     719      ALLOCATE (f_r_wet(klon,klev))
     720      ALLOCATE (sfluxaer(klon))
     721      ALLOCATE (decfluxaer(klon,nbtr))
     722      ALLOCATE (mdw(nbtr))
     723      ALLOCATE (sulf_convert(klon,klev))
     724      ALLOCATE (sulf_nucl(klon,klev))
     725      ALLOCATE (sulf_cond_evap(klon,klev))
     726      ALLOCATE (ocs_convert(klon,klev))
     727      ALLOCATE (SO2_backgr_tend(klon,klev))
     728      ALLOCATE (OCS_backgr_tend(klon,klev))
     729      ALLOCATE (OCS_lifetime(klon,klev))
     730      ALLOCATE (SO2_lifetime(klon,klev))
     731      ALLOCATE (alpha_bin(nbands_sw_rrtm+nbands_lw_rrtm+nwave+nwave_lw,nbtr))
     732      ALLOCATE (piz_bin(nbands_sw_rrtm+nbands_lw_rrtm+nwave+nwave_lw,nbtr))
     733      ALLOCATE (cg_bin(nbands_sw_rrtm+nbands_lw_rrtm+nwave+nwave_lw,nbtr))
     734      ALLOCATE (tau_strat_550(klon,klev))
     735      ALLOCATE (tau_strat_550_lay(klon,klev))
     736      ALLOCATE (tau_strat_1020(klon,klev))
     737      ALLOCATE (tausum_strat(klon,3))
     738      ALLOCATE (sulf_dep_dry(klon))
     739      ALLOCATE (sulf_dep_wet(klon))
     740      ALLOCATE (surf_PM25_sulf(klon))
     741      ALLOCATE (p_tropopause(klon))
     742      ALLOCATE (vsed_aer(klon,klev))
     743#endif
    659744
    660745END SUBROUTINE phys_local_var_init
     
    690775      deallocate(d_u_ajs,d_v_ajs)
    691776      deallocate(d_t_eva,d_q_eva)
     777      deallocate(d_ql_eva,d_qi_eva)
    692778      deallocate(d_t_lscst,d_q_lscst)
    693779      deallocate(d_t_lscth,d_q_lscth)
     
    854940      DEALLOCATE(fsollw, evap_pot)
    855941      DEALLOCATE(fsolsw, wfbils, wfbilo)
     942      DEALLOCATE(wfevap,wfrain,wfsnow)
    856943
    857944      DEALLOCATE(pmflxr, pmflxs, prfl)
     
    872959      DEALLOCATE (zxsnow,snowhgt,qsnow,to_ice,sissnow,runoff,albsol3_lic)
    873960
     961#ifdef CPP_StratAer
     962! variables for strat. aerosol CK
     963      DEALLOCATE (R2SO4)
     964      DEALLOCATE (DENSO4)
     965      DEALLOCATE (f_r_wet)
     966      DEALLOCATE (sfluxaer)
     967      DEALLOCATE (decfluxaer)
     968      DEALLOCATE (mdw)
     969      DEALLOCATE (sulf_convert)
     970      DEALLOCATE (sulf_nucl)
     971      DEALLOCATE (sulf_cond_evap)
     972      DEALLOCATE (ocs_convert)
     973      DEALLOCATE (SO2_backgr_tend)
     974      DEALLOCATE (OCS_backgr_tend)
     975      DEALLOCATE (SO2_lifetime)
     976      DEALLOCATE (OCS_lifetime)
     977      DEALLOCATE (alpha_bin)
     978      DEALLOCATE (piz_bin)
     979      DEALLOCATE (cg_bin)
     980      DEALLOCATE (tau_strat_550)
     981      DEALLOCATE (tau_strat_550_lay)
     982      DEALLOCATE (tau_strat_1020)
     983      DEALLOCATE (tausum_strat)
     984      DEALLOCATE (sulf_dep_dry)
     985      DEALLOCATE (sulf_dep_wet)
     986      DEALLOCATE (surf_PM25_sulf)
     987      DEALLOCATE (p_tropopause)
     988      DEALLOCATE (vsed_aer)
     989#endif
     990
    874991END SUBROUTINE phys_local_var_end
    875992
Note: See TracChangeset for help on using the changeset viewer.