Ignore:
Timestamp:
Nov 29, 2019, 9:25:41 AM (4 years ago)
Author:
jghattas
Message:

Put back changes done in commit [3604] which were removed temporary in commit [3607].

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/conf_phys_m.F90

    r3607 r3609  
    1717       iflag_cld_th, &
    1818       iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
    19        ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, aerosol_couple, &
     19       ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat, aerosol_couple, &
    2020       chemistry_couple, flag_aerosol, flag_aerosol_strat,         &
    2121       flag_aer_feedback, new_aod, &
     
    6464    ! bl95_b*: parameters in the formula to link CDNC to aerosol mass conc
    6565    ! ok_volcan: activate volcanic diags (SW heat & LW cool rate, SW & LW flux)
     66    ! flag_volc_surfstrat: VolMIP flag, activate forcing surface cooling rate (=1), strato heating rate (=2) or nothing (=0, default)
    6667    !
    6768
     
    7778    INTEGER              :: flag_aerosol
    7879    INTEGER              :: flag_aerosol_strat
     80    INTEGER              :: flag_volc_surfstrat !VolMIP flag for surf/strat runs
    7981    LOGICAL              :: flag_aer_feedback
    8082    LOGICAL              :: flag_bc_internal_mixture
     
    99101    INTEGER, SAVE       :: flag_aerosol_omp
    100102    INTEGER, SAVE       :: flag_aerosol_strat_omp
     103    INTEGER, SAVE       :: flag_volc_surfstrat_omp !VolMIP flag for surf/strat runs
    101104    LOGICAL, SAVE       :: flag_aer_feedback_omp
    102105    LOGICAL, SAVE       :: flag_bc_internal_mixture_omp
     
    407410
    408411    !
     412    !Config Key  = flag_volc_surfstrat
     413    !Config Desc = impose cooling rate at the surface (=1),
     414    !              heating rate in the strato (=2), or nothing (=0)
     415    !Config Def  = 0
     416    !Config Help = Used in radlwsw_m.F
     417    !
     418    flag_volc_surfstrat_omp = 0
     419    CALL getin('flag_volc_surfstrat', flag_volc_surfstrat_omp)
     420   
     421    !
    409422    !Config Key  = aerosol_couple
    410423    !Config Desc = read aerosol in file or calcul by inca
     
    23042317    ok_cdnc = ok_cdnc_omp
    23052318    ok_volcan = ok_volcan_omp
     2319    flag_volc_surfstrat=flag_volc_surfstrat_omp
    23062320    aerosol_couple = aerosol_couple_omp
    23072321    chemistry_couple = chemistry_couple_omp
     
    25222536    IF (flag_bc_internal_mixture .AND. flag_aerosol.NE.6) THEN
    25232537       CALL abort_physic('conf_phys', 'flag_bc_internal_mixture can only be activated with flag_aerosol=6',1)
     2538    ENDIF
     2539
     2540    IF (flag_volc_surfstrat.LT.0.OR.flag_volc_surfstrat.GT.2) THEN
     2541       CALL abort_physic('conf_phys', 'flag_volc_surfstrat can only be 0 1 or 2',1)
    25242542    ENDIF
    25252543
     
    26372655    WRITE(lunout,*)' ok_ade = ',ok_ade
    26382656    WRITE(lunout,*)' ok_volcan = ',ok_volcan
     2657    WRITE(lunout,*)' flag_volc_surfstrat = ',flag_volc_surfstrat
    26392658    WRITE(lunout,*)' ok_aie = ',ok_aie
    26402659    WRITE(lunout,*)' ok_alw = ',ok_alw
Note: See TracChangeset for help on using the changeset viewer.