Changeset 3337 for LMDZ6

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:

• conf_phys_m.F90 (modified) (1 diff)
• rrtm/readaerosol_optic_rrtm.F90 (modified) (6 diffs)
• rrtm/recmwf_aero.F90 (modified) (1 diff)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/conf_phys_m.F90

@@ -416 +416 @@
     ! - flag_aerosol=6 => all aerosol
     ! - flag_aerosol=7 => natural aerosol + MACv2SP
+    ! - (in this case aerosols.1980.nc should point to aerosols.nat.nc)
 
     flag_aerosol_omp = 0

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

@@ -173 +173 @@
      !
      ! Read and interpolate sulfate
-     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 ) THEN 
+     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_ASSO4M_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sulfacc, sulfacc_pi,loadso4)
@@ -182 +182 @@
 
      ! Read and interpolate bcsol and bcins
-     IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 ) THEN 
+     IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         ! Get bc aerosol distribution 
@@ -195 +195 @@
 
      ! Read and interpolate pomsol and pomins
-     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 ) THEN
+     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
 
         CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
@@ -207 +207 @@
 
      ! Read and interpolate csssm, ssssm, assssm
-     IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 ) THEN 
+     IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys,rjourvrai, &
@@ -224 +224 @@
 
      ! Read and interpolate cidustm
-     IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 ) THEN 
+     IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_CIDUSTM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, cidust, cidust_pi, loaddust) 
@@ -234 +234 @@
      !
      ! Read and interpolate asno3m, csno3m, cino3m
-     IF (flag_aerosol .EQ. 6) THEN 
+     IF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, & 

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/rrtm/recmwf_aero.F90

@@ -82 +82 @@
 ! ok_ade---input-L- apply the Aerosol Direct Effect or not?
 ! ok_aie---input-L- apply the Aerosol Indirect Effect or not?
-! flag_aerosol-input-I- aerosol flag from 0 to 6
+! flag_aerosol-input-I- aerosol flag from 0 to 7
 ! flag_aerosol_strat-input-I- use stratospheric aerosols flag (T/F)
 ! PPIZA_NAT  : (KPROMA,KLEV,NSW); Single scattering albedo of natural aerosol