Changeset 3677


Ignore:
Timestamp:
May 6, 2020, 5:18:32 PM (4 years ago)
Author:
oboucher
Message:

Changed the way to initialise nbtr_bin and other dimensions and indices
in the StratAer? module based on infotrac_phy rather than infotrac.

Also added a missing $OMP THREADPRIVATE(nqperes)

Location:
LMDZ6/trunk/libf
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

    r3666 r3677  
    2525                      indnum_fn_num,index_trac,&
    2626                      niso,ntraceurs_zone,ntraciso
     27#ifdef CPP_StratAer
     28  USE infotrac, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, &
     29                      id_SO2_strat, id_H2SO4_strat, id_BIN01_strat
     30
     31#endif
    2732#ifdef REPROBUS
    2833  USE CHEM_REP, ONLY : Init_chem_rep_phys
    … …  
    149154                         iso_indnum,zone_num,phase_num,&
    150155                         indnum_fn_num,index_trac,&
    151                          niso,ntraceurs_zone,ntraciso)
     156                         niso,ntraceurs_zone,ntraciso&
     157#ifdef CPP_StratAer
     158                         ,nbtr_bin,nbtr_sulgas&
     159                         ,id_OCS_strat,id_SO2_strat,id_H2SO4_strat,id_BIN01_strat&
     160#endif
     161                         )
    152162
    153163  ! Initializations for Reprobus

  • LMDZ6/trunk/libf/phylmd/StratAer/aer_sedimnt.F90

    r3526 r3677  
    1919  USE phys_local_var_mod, ONLY: mdw, budg_sed_part, DENSO4, f_r_wet, vsed_aer
    2020  USE dimphy, ONLY : klon,klev
    21   USE infotrac
     21  USE infotrac_phy
    2222  USE aerophys
    2323  USE YOMCST

  • LMDZ6/trunk/libf/phylmd/StratAer/calcaerosolstrato_rrtm.F90

    r3660 r3677  
    44SUBROUTINE calcaerosolstrato_rrtm(pplay,t_seri,paprs,debut)
    55
    6   USE infotrac, ONLY : nbtr
    76  USE phys_state_var_mod, ONLY: tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm, tau_aero_lw_rrtm
    87  USE phys_local_var_mod, ONLY: mdw, tausum_aero, tausum_strat, tau_strat_550, tau_strat_1020, stratomask

  • LMDZ6/trunk/libf/phylmd/StratAer/coagulate.F90

    r3526 r3677  
    2525  USE dimphy, ONLY : klon,klev
    2626  USE aerophys
    27   USE infotrac
     27  USE infotrac_phy
    2828  USE phys_local_var_mod, ONLY: DENSO4, f_r_wet
    2929  USE YOMCST

  • LMDZ6/trunk/libf/phylmd/StratAer/cond_evap_tstep_mod.F90

    r3526 r3677  
    2020
    2121      USE aerophys
    22       USE infotrac
     22      USE infotrac_phy
    2323      USE YOMCST, ONLY : RPI
    2424
    … …  
    141141
    142142      USE aerophys
    143       USE infotrac
     143      USE infotrac_phy
    144144      USE YOMCST, ONLY : RPI
    145145

  • LMDZ6/trunk/libf/phylmd/StratAer/interp_sulf_input.F90

    r3663 r3677  
    1616  USE dimphy
    1717  USE phys_cal_mod
    18   USE infotrac
     18  USE infotrac_phy
    1919  USE aerophys
    2020  USE YOMCST

  • LMDZ6/trunk/libf/phylmd/StratAer/micphy_tstep.F90

    r3527 r3677  
    77  USE dimphy, ONLY : klon,klev
    88  USE aerophys
    9   USE infotrac
     9  USE infotrac_phy
    1010  USE phys_local_var_mod, ONLY: mdw, budg_3D_nucl, budg_3D_cond_evap, budg_h2so4_to_part, R2SO4, DENSO4, f_r_wet
    1111  USE nucleation_tstep_mod

  • LMDZ6/trunk/libf/phylmd/StratAer/miecalc_aer.F90

    r3667 r3677  
    1818  USE aerophys
    1919  USE aero_mod
    20   USE infotrac, ONLY : nbtr, nbtr_bin, nbtr_sulgas, id_SO2_strat
     20  USE infotrac_phy, ONLY : nbtr, nbtr_bin, nbtr_sulgas, id_SO2_strat
    2121  USE dimphy
    2222  USE YOMCST  , ONLY : RG, RPI

  • LMDZ6/trunk/libf/phylmd/StratAer/nucleation_tstep_mod.F90

    r3536 r3677  
    99
    1010  USE aerophys
    11   USE infotrac
     11  USE infotrac_phy
    1212  USE YOMCST, ONLY : RPI, RD, RMD, RKBOL, RNAVO
    1313
    … …  
    7373
    7474  USE aerophys
    75   USE infotrac
     75  USE infotrac_phy
    7676
    7777  IMPLICIT NONE

  • LMDZ6/trunk/libf/phylmd/StratAer/ocs_to_so2.F90

    r3526 r3677  
    66  USE dimphy, ONLY : klon,klev
    77  USE aerophys
    8   USE infotrac
     8  USE infotrac_phy
    99  USE YOMCST, ONLY : RG
    1010  USE phys_local_var_mod, ONLY : OCS_lifetime, budg_3D_ocs_to_so2, budg_ocs_to_so2

  • LMDZ6/trunk/libf/phylmd/StratAer/so2_to_h2so4.F90

    r3526 r3677  
    66  USE dimphy, ONLY : klon,klev
    77  USE aerophys
    8   USE infotrac
     8  USE infotrac_phy
    99  USE YOMCST, ONLY : RG
    1010  USE phys_local_var_mod, ONLY : SO2_lifetime, budg_3D_so2_to_h2so4, budg_so2_to_h2so4

  • LMDZ6/trunk/libf/phylmd/StratAer/traccoag_mod.F90

    r3528 r3677  
    1717
    1818    USE dimphy
    19     USE infotrac
     19    USE infotrac_phy
    2020    USE aerophys
    2121    USE geometry_mod, ONLY : cell_area, boundslat

  • LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

    r3043 r3677  
    2121!$OMP THREADPRIVATE(nbtr)
    2222
     23#ifdef CPP_StratAer
     24! nbtr_bin: number of aerosol bins for StratAer model
     25! nbtr_sulgas: number of sulfur gases for StratAer model
     26  INTEGER, SAVE :: nbtr_bin, nbtr_sulgas
     27!$OMP THREADPRIVATE(nbtr_bin,nbtr_sulgas)
     28  INTEGER, SAVE :: id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat
     29!$OMP THREADPRIVATE(id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat)
     30#endif
     31
    2332! CRisi: nb traceurs pères= directement advectés par l'air
    2433  INTEGER, SAVE :: nqperes
     34!$OMP THREADPRIVATE(nqperes)
    2535
    2636! Name variables
    … …  
    94104                               iso_indnum_,zone_num_,phase_num_,&
    95105                               indnum_fn_num_,index_trac_,&
    96                                niso_,ntraceurs_zone_,ntraciso_)
     106                               niso_,ntraceurs_zone_,ntraciso_&
     107#ifdef CPP_StratAer
     108                               ,nbtr_bin_,nbtr_sulgas_&
     109                               ,id_OCS_strat_,id_SO2_strat_,id_H2SO4_strat_,id_BIN01_strat_&
     110#endif
     111                               )
    97112
    98113    ! transfer information on tracers from dynamics to physics
    … …  
    103118    INTEGER,INTENT(IN) :: nqo_
    104119    INTEGER,INTENT(IN) :: nbtr_
     120#ifdef CPP_StratAer
     121    INTEGER,INTENT(IN) :: nbtr_bin_
     122    INTEGER,INTENT(IN) :: nbtr_sulgas_
     123    INTEGER,INTENT(IN) :: id_OCS_strat_
     124    INTEGER,INTENT(IN) :: id_SO2_strat_
     125    INTEGER,INTENT(IN) :: id_H2SO4_strat_
     126    INTEGER,INTENT(IN) :: id_BIN01_strat_
     127#endif
    105128    CHARACTER(len=20),INTENT(IN) :: tname_(nqtot_) ! tracer short name for restart and diagnostics
    106129    CHARACTER(len=23),INTENT(IN) :: ttext_(nqtot_) ! tracer long name for diagnostics
    … …  
    140163    nqo=nqo_
    141164    nbtr=nbtr_
     165#ifdef CPP_StratAer
     166    nbtr_bin=nbtr_bin_
     167    nbtr_sulgas=nbtr_sulgas_
     168    id_OCS_strat=id_OCS_strat_
     169    id_SO2_strat=id_SO2_strat_
     170    id_H2SO4_strat=id_H2SO4_strat_
     171    id_BIN01_strat=id_BIN01_strat_
     172#endif
    142173    ALLOCATE(tname(nqtot))
    143174    tname(:) = tname_(:)
Note: See TracChangeset for help on using the changeset viewer.