Ignore:
Timestamp:
Jun 1, 2018, 5:52:22 PM (6 years ago)
Author:
acozic
Message:

merge with trunk 3338
Add a flag chemistry_couple

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/conf_phys_m.F90

    r2580 r3340  
    1717       iflag_cld_th, &
    1818       iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
    19        ok_ade, ok_aie, ok_cdnc, aerosol_couple, &
     19       ok_ade, ok_aie, ok_cdnc, aerosol_couple, chemistry_couple,  &
    2020       flag_aerosol, flag_aerosol_strat, new_aod, &
    2121       bl95_b0, bl95_b1,&
     
    7474    logical              :: ok_LES
    7575    LOGICAL              :: callstats
    76     LOGICAL              :: ok_ade, ok_aie, ok_cdnc, aerosol_couple
     76    LOGICAL              :: ok_ade, ok_aie, ok_cdnc
     77    LOGICAL              :: aerosol_couple, chemistry_couple
    7778    INTEGER              :: flag_aerosol
    7879    INTEGER              :: flag_aerosol_strat
     
    9293    logical,SAVE        :: ok_LES_omp   
    9394    LOGICAL,SAVE        :: callstats_omp
    94     LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, ok_cdnc_omp, aerosol_couple_omp
     95    LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, ok_cdnc_omp
     96    LOGICAL, SAVE       :: aerosol_couple_omp, chemistry_couple_omp
    9597    INTEGER, SAVE       :: flag_aerosol_omp
    9698    INTEGER, SAVE       :: flag_aerosol_strat_omp
     
    370372    aerosol_couple_omp = .false.
    371373    CALL getin('aerosol_couple',aerosol_couple_omp)
     374    !
     375    !Config Key  = chemistry_couple
     376    !Config Desc = read chemistry in file or calcul by inca
     377    !Config Def  = .FALSE.
     378    !Config Help = Used in physiq.F
     379    !
     380    chemistry_couple_omp = .FALSE.
     381    CALL getin('chemistry_couple',chemistry_couple_omp)
    372382    !
    373383    !Config Key  = flag_aerosol
     
    21342144    ok_cdnc = ok_cdnc_omp
    21352145    aerosol_couple = aerosol_couple_omp
     2146    chemistry_couple = chemistry_couple_omp
    21362147    flag_aerosol=flag_aerosol_omp
    21372148    flag_aerosol_strat=flag_aerosol_strat_omp
     
    23072318       CALL abort_physic('conf_phys', 'flag_aerosol cannot be to zero if ok_cdnc is activated ', 1)
    23082319    ENDIF
     2320
     2321    ! Read_climoz need to be zero if we are in couple mode for chemistry
     2322    IF (chemistry_couple .AND. read_climoz .ne. 0) THEN
     2323       CALL abort_physic('conf_phys', 'read_climoz need to be to zero if chemistry_couple=y ', 1)
     2324    ENDIF
     2325
    23092326
    23102327    ! ok_cdnc must be set to y if ok_aie is activated
     
    24172434    write(lunout,*)' ok_aie = ',ok_aie
    24182435    write(lunout,*)' aerosol_couple = ', aerosol_couple
     2436    write(lunout,*)' chemistry_couple = ', chemistry_couple
    24192437    write(lunout,*)' flag_aerosol = ', flag_aerosol
    24202438    write(lunout,*)' flag_aerosol_strat = ', flag_aerosol_strat
Note: See TracChangeset for help on using the changeset viewer.