Ignore:
Timestamp:
Jun 29, 2018, 12:31:11 PM (6 years ago)
Author:
Laurent Fairhead
Message:

First attempt at merging with trunk

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phytrac_mod.F90

    r2784 r3356  
    4949!$OMP THREADPRIVATE(d_tr_trsp,d_tr_sscav,d_tr_sat,d_tr_uscav,qPr,qDi)
    5050!$OMP THREADPRIVATE(d_tr_insc,d_tr_bcscav,d_tr_evapls,d_tr_ls,qPrls)
    51 !$OMP THREADPRIVATE(d_tr,d_tr_cl,d_tr_dry,flux_tr_dry,d_tr_dec,d_tr_cv)
     51!$OMP THREADPRIVATE(d_tr_cl,d_tr_dry,flux_tr_dry,d_tr_dec,d_tr_cv)
    5252
    5353
     
    104104    USE traccoag_mod
    105105    USE phys_local_var_mod, ONLY: mdw
     106    USE phys_local_var_mod, ONLY: budg_dep_dry_ocs,   budg_dep_wet_ocs
     107    USE phys_local_var_mod, ONLY: budg_dep_dry_so2,   budg_dep_wet_so2
    106108    USE phys_local_var_mod, ONLY: budg_dep_dry_h2so4, budg_dep_wet_h2so4
    107109    USE phys_local_var_mod, ONLY: budg_dep_dry_part,  budg_dep_wet_part
    108     USE infotrac, ONLY: nbtr_sulgas, id_SO2_strat, id_H2SO4_strat
     110    USE infotrac, ONLY: nbtr_sulgas, id_OCS_strat, id_SO2_strat, id_H2SO4_strat
    109111    USE aerophys
    110112#endif
     
    507509                ENDIF
    508510
     511             CASE('repr')
     512                 flag_cvltr(it)=.false.
     513
    509514             CASE('inca')
    510515!                IF ((it.EQ.id_Rn222) .OR. ((it.GE.id_SO2) .AND. (it.LE.id_NH3)) ) THEN
     
    701706       IF (type_trac=='coag') THEN
    702707         ! initialize wet deposition flux of sulfur
     708         budg_dep_wet_ocs(:)=0.0
     709         budg_dep_wet_so2(:)=0.0
    703710         budg_dep_wet_h2so4(:)=0.0
    704711         budg_dep_wet_part(:)=0.0
     
    709716         DO it = 1, nbtr
    710717         !do not include SO2 because most of it comes trom the troposphere
    711            IF (it==id_H2SO4_strat) THEN
     718           IF (it==id_OCS_strat) THEN
     719             budg_dep_wet_ocs(i)=budg_dep_wet_ocs(i)+d_tr_cv(i,k,it)*(mSatom/mOCSmol) &
     720                            & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
     721           ELSEIF (it==id_SO2_strat) THEN
     722             budg_dep_wet_so2(i)=budg_dep_wet_so2(i)+d_tr_cv(i,k,it)*(mSatom/mSO2mol) &
     723                            & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
     724           ELSEIF (it==id_H2SO4_strat) THEN
    712725             budg_dep_wet_h2so4(i)=budg_dep_wet_h2so4(i)+d_tr_cv(i,k,it)*(mSatom/mH2SO4mol) &
    713726                            & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
     
    734747             d_tr_th(i,k,it)=0.
    735748             tr_seri(i,k,it)=MAX(tr_seri(i,k,it),0.)
    736              tr_seri(i,k,it)=MIN(tr_seri(i,k,it),1.e10)
     749! the next safeguard causes some problem for stratospheric aerosol tracers (particle number)
     750! and there is little justification for it so it is commented out (4 December 2017) by OB
     751! if reinstated please keep the ifndef CPP_StratAer
     752!#ifndef CPP_StratAer
     753!             tr_seri(i,k,it)=MIN(tr_seri(i,k,it),1.e10)
     754!#endif
    737755          END DO
    738756       END DO
     
    770788
    771789         ! initialize dry deposition flux of sulfur
     790         budg_dep_dry_ocs(:)=0.0
     791         budg_dep_dry_so2(:)=0.0
    772792         budg_dep_dry_h2so4(:)=0.0
    773793         budg_dep_dry_part(:)=0.0
     
    804824             IF (type_trac=='coag') THEN
    805825               ! compute dry deposition flux of sulfur (sum over gases and particles)
    806                IF (it==id_H2SO4_strat) THEN
     826               IF (it==id_OCS_strat) THEN
     827                 budg_dep_dry_ocs(:)=budg_dep_dry_ocs(:)-source(:,it)*(mSatom/mOCSmol)
     828               ELSEIF (it==id_SO2_strat) THEN
     829                 budg_dep_dry_so2(:)=budg_dep_dry_so2(:)-source(:,it)*(mSatom/mSO2mol)
     830               ELSEIF (it==id_H2SO4_strat) THEN
    807831                 budg_dep_dry_h2so4(:)=budg_dep_dry_h2so4(:)-source(:,it)*(mSatom/mH2SO4mol)
    808832               ELSEIF (it.GT.nbtr_sulgas) THEN
     
    890914           DO k = 1, klev
    891915           DO it = 1, nbtr
    892              IF (it==id_H2SO4_strat) THEN
     916             IF (it==id_OCS_strat) THEN
     917               budg_dep_wet_ocs(i)=budg_dep_wet_ocs(i)+d_tr_ls(i,k,it)*(mSatom/mOCSmol) &
     918                              & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
     919             ELSEIF (it==id_SO2_strat) THEN
     920               budg_dep_wet_so2(i)=budg_dep_wet_so2(i)+d_tr_ls(i,k,it)*(mSatom/mSO2mol) &
     921                              & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
     922             ELSEIF (it==id_H2SO4_strat) THEN
    893923               budg_dep_wet_h2so4(i)=budg_dep_wet_h2so4(i)+d_tr_ls(i,k,it)*(mSatom/mH2SO4mol) &
    894924                              & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
Note: See TracChangeset for help on using the changeset viewer.