Index: /LMDZ5/trunk/libf/phylmd/physiq.F90
===================================================================
--- /LMDZ5/trunk/libf/phylmd/physiq.F90	(revision 2324)
+++ /LMDZ5/trunk/libf/phylmd/physiq.F90	(revision 2325)
@@ -3107,5 +3107,5 @@
      !jq - Johannes Quaas, 27/11/2003 (quaas@lmd.jussieu.fr)
      IF (flag_aerosol .gt. 0) THEN
-        IF (iflag_rrtm .EQ. 0) THEN !--old radiation
+         IF (iflag_rrtm .EQ. 0) THEN !--old radiation
            IF (.NOT. aerosol_couple) THEN
               !
@@ -3124,4 +3124,7 @@
 !
 #ifdef CPP_RRTM
+           IF (NSW.EQ.6) THEN
+!--new aerosol properties
+!
              CALL readaerosol_optic_rrtm( debut, aerosol_couple, &
              new_aod, flag_aerosol, itap, jD_cur-jD_ref, &
@@ -3131,9 +3134,32 @@
              tausum_aero, tau3d_aero)
 
-             CALL aeropt_lw_rrtm
+           ELSE IF (NSW.EQ.2) THEN 
+!--for now we use the old aerosol properties
+!
+              CALL readaerosol_optic( &
+                   debut, new_aod, flag_aerosol, itap, jD_cur-jD_ref, &
+                   pdtphys, pplay, paprs, t_seri, rhcl, presnivs,  &
+                   mass_solu_aero, mass_solu_aero_pi,  &
+                   tau_aero, piz_aero, cg_aero,  &
+                   tausum_aero, tau3d_aero)
+!
+                   !--natural aerosols
+                   tau_aero_sw_rrtm(:,:,1,:)=tau_aero(:,:,3,:)
+                   piz_aero_sw_rrtm(:,:,1,:)=piz_aero(:,:,3,:)
+                   cg_aero_sw_rrtm (:,:,1,:)=cg_aero (:,:,3,:)
+                   !--all aerosols
+                   tau_aero_sw_rrtm(:,:,2,:)=tau_aero(:,:,2,:)
+                   piz_aero_sw_rrtm(:,:,2,:)=piz_aero(:,:,2,:)
+                   cg_aero_sw_rrtm (:,:,2,:)=cg_aero (:,:,2,:)
+           ELSE
+              abort_message='Only NSW=2 or 6 are possible with aerosols and iflag_rrtm=1'
+              call abort_physic(modname,abort_message,1)
+           ENDIF
+
+           CALL aeropt_lw_rrtm
+!
 #else
-
-              abort_message='You should compile with -rrtm if running with iflag_rrtm=1'
-              call abort_physic(modname,abort_message,1)
+           abort_message='You should compile with -rrtm if running with iflag_rrtm=1'
+           call abort_physic(modname,abort_message,1)
 #endif
               !
Index: /LMDZ5/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90
===================================================================
--- /LMDZ5/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90	(revision 2324)
+++ /LMDZ5/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90	(revision 2325)
@@ -301,26 +301,5 @@
   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,11 +315,4 @@
        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