Changeset 3337 for LMDZ6


Ignore:
Timestamp:
May 29, 2018, 3:55:14 PM (6 years ago)
Author:
jghattas
Message:

As done on the trunk rev [3333] by O.Boucher:

Add a missing flag_aerosol == 7 in reaerosol_optic_rrtm
Beware flag_aerosol = 7 requires aerosols.1980.nc to point to aerosols.nat.nc

Location:
LMDZ6/branches/IPSLCM6.0.15/libf/phylmd
Files:
3 edited

Legend:

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

    r3328 r3337  
    416416    ! - flag_aerosol=6 => all aerosol
    417417    ! - flag_aerosol=7 => natural aerosol + MACv2SP
     418    ! - (in this case aerosols.1980.nc should point to aerosols.nat.nc)
    418419
    419420    flag_aerosol_omp = 0
  • LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

    r2953 r3337  
    173173     !
    174174     ! Read and interpolate sulfate
    175      IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 ) THEN
     175     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
    176176
    177177        CALL readaerosol_interp(id_ASSO4M_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sulfacc, sulfacc_pi,loadso4)
     
    182182
    183183     ! Read and interpolate bcsol and bcins
    184      IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 ) THEN
     184     IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
    185185
    186186        ! Get bc aerosol distribution
     
    195195
    196196     ! Read and interpolate pomsol and pomins
    197      IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 ) THEN
     197     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
    198198
    199199        CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
     
    207207
    208208     ! Read and interpolate csssm, ssssm, assssm
    209      IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 ) THEN
     209     IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
    210210
    211211        CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys,rjourvrai, &
     
    224224
    225225     ! Read and interpolate cidustm
    226      IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 ) THEN
     226     IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
    227227
    228228        CALL readaerosol_interp(id_CIDUSTM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, cidust, cidust_pi, loaddust)
     
    234234     !
    235235     ! Read and interpolate asno3m, csno3m, cino3m
    236      IF (flag_aerosol .EQ. 6) THEN
     236     IF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
    237237
    238238        CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, &
  • LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/rrtm/recmwf_aero.F90

    r3106 r3337  
    8282! ok_ade---input-L- apply the Aerosol Direct Effect or not?
    8383! ok_aie---input-L- apply the Aerosol Indirect Effect or not?
    84 ! flag_aerosol-input-I- aerosol flag from 0 to 6
     84! flag_aerosol-input-I- aerosol flag from 0 to 7
    8585! flag_aerosol_strat-input-I- use stratospheric aerosols flag (T/F)
    8686! PPIZA_NAT  : (KPROMA,KLEV,NSW); Single scattering albedo of natural aerosol
Note: See TracChangeset for help on using the changeset viewer.