Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (modified) (6 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

@@ -173 +173 @@
      !
      ! Read and interpolate sulfate
-     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 ) 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 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 ) THEN 
 
         ! Get bc aerosol distribution 
@@ -195 +195 @@
 
      ! Read and interpolate pomsol and pomins
-     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
+     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 ) 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 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 ) 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 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 ) 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 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol .EQ. 6) THEN 
 
         CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, &