Changeset 2325 for LMDZ5/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

Timestamp:

Jul 8, 2015, 10:17:34 PM (9 years ago)

Author:

oboucher

Message:

Enabling aerosols for the case RRTM + NSW=2
In this case we use the old aerosol properties

File:

• LMDZ5/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

@@ -301 +301 @@
   END DO
 
-! AI 12 juin 2015
-! Modif Olivier pour prendre en compte des prop optiq aero ancienne pour RRTM 2bds 
-
-IF (NSW.EQ.2) THEN
-!--old aerosol properties
-
-   ! old aeropt_2bands for rrtm
-   CALL aeropt_2bands( &
-         pdel, m_allaer, pdtphys, rhcl, &
-         tau_aero, piz_aero, cg_aero,   &
-         m_allaer_pi, flag_aerosol, &
-         pplay, t_seri, presnivs)
-
-   ! aeropt_5wv only for validation and diagnostics.
-   CALL aeropt_5wv(                    &
-        pdel, m_allaer,                &
-        pdtphys, rhcl, aerindex,       &
-        flag_aerosol, pplay, t_seri,   &
-        tausum_aero, tau3d_aero, presnivs)
-
-ELSEIF (NSW.EQ.6) THEN
-!--new aerosol propertie
+!--new aerosol properties
   ! aeropt_6bands for rrtm
   CALL aeropt_6bands_rrtm( &
@@ -336 +315 @@
        flag_aerosol, pplay, t_seri,   &
        tausum_aero, tau3d_aero )
-
-ELSE
-
-    PRINT *,'Cas NSW non prevu pour RRTM - NSW=',NSW
-    STOP
-
-ENDIF
 
   ! Diagnostics calculation for CMIP5 protocol