Index: LMDZ5/trunk/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90
===================================================================
--- LMDZ5/trunk/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90	(revision 2735)
+++ LMDZ5/trunk/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90	(revision 2736)
@@ -99,5 +99,5 @@
   REAL :: piz_MG_6bands(nbre_RH,nbands_sw_rrtm,nbclassbc)
   !
-  INTEGER :: id, classbc, classbc_pi
+  INTEGER :: aerindex, classbc, classbc_pi
   REAL :: tmp_var, tmp_var_pi, BC_massfra, BC_massfra_pi
 
@@ -584,5 +584,5 @@
 
     !--shortname for aerosol index
-    id=aerosol_name(m)
+    aerindex=aerosol_name(m)
 
     IF (soluble) THEN
@@ -594,6 +594,6 @@
            DO i=1, klon
 
-             tmp_var=m_allaer(i,k,spsol)/1.e6*zdh(i,k)*fac
-             tmp_var_pi=m_allaer_pi(i,k,spsol)/1.e6*zdh(i,k)*fac
+             tmp_var=m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*fac
+             tmp_var_pi=m_allaer_pi(i,k,aerindex)/1.e6*zdh(i,k)*fac
 
              ! Calculate the dry BC/(BC+SUL) mass ratio for all (natural+anthropogenic) aerosols
@@ -642,7 +642,7 @@
                              cg_MG_6bands(RH_num(i,k),inu,classbc))
 
-               tau_ae(i,k,id,inu)    = tmp_var*tau_ae2b_int
-               piz_ae(i,k,id,inu)    = piz_ae2b_int
-               cg_ae(i,k,id,inu)     = cg_ae2b_int
+               tau_ae(i,k,aerindex,inu)    = tmp_var*tau_ae2b_int
+               piz_ae(i,k,aerindex,inu)    = piz_ae2b_int
+               cg_ae(i,k,aerindex,inu)     = cg_ae2b_int
 
                !--natural aerosols
@@ -659,7 +659,7 @@
                              cg_MG_6bands(RH_num(i,k),inu,classbc_pi))
 
-               tau_ae_pi(i,k,id,inu) = tmp_var_pi* tau_ae2b_int
-               piz_ae_pi(i,k,id,inu) = piz_ae2b_int
-               cg_ae_pi(i,k,id,inu)  = cg_ae2b_int
+               tau_ae_pi(i,k,aerindex,inu) = tmp_var_pi* tau_ae2b_int
+               piz_ae_pi(i,k,aerindex,inu) = piz_ae2b_int
+               cg_ae_pi(i,k,aerindex,inu)  = cg_ae2b_int
                         
              ENDDO
@@ -672,6 +672,6 @@
          DO k=1, klev
            DO i=1, klon
-             tmp_var=m_allaer(i,k,spsol)/1.e6*zdh(i,k)*fac
-             tmp_var_pi=m_allaer_pi(i,k,spsol)/1.e6*zdh(i,k)*fac
+             tmp_var=m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*fac
+             tmp_var_pi=m_allaer_pi(i,k,aerindex)/1.e6*zdh(i,k)*fac
 
              DO inu=1,NSW
@@ -689,8 +689,8 @@
                              cg_aers_6bands(RH_num(i,k),inu,spsol))
 
-               tau_ae(i,k,id,inu)    = tmp_var*tau_ae2b_int
-               tau_ae_pi(i,k,id,inu) = tmp_var_pi* tau_ae2b_int
-               piz_ae(i,k,id,inu)    = piz_ae2b_int
-               cg_ae(i,k,id,inu)     = cg_ae2b_int
+               tau_ae(i,k,aerindex,inu)    = tmp_var*tau_ae2b_int
+               tau_ae_pi(i,k,aerindex,inu) = tmp_var_pi* tau_ae2b_int
+               piz_ae(i,k,aerindex,inu)    = piz_ae2b_int
+               cg_ae(i,k,aerindex,inu)     = cg_ae2b_int
                         
              ENDDO
@@ -700,6 +700,6 @@
          !--external mixture case for soluble BC
          IF (spsol.EQ.1) THEN
-           piz_ae_pi(:,:,id,:) = piz_ae(:,:,id,:)
-           cg_ae_pi(:,:,id,:)  = cg_ae(:,:,id,:)
+           piz_ae_pi(:,:,aerindex,:) = piz_ae(:,:,aerindex,:)
+           cg_ae_pi(:,:,aerindex,:)  = cg_ae(:,:,aerindex,:)
          ENDIF
 
@@ -710,6 +710,6 @@
        DO k=1, klev
          DO i=1, klon
-           tmp_var=m_allaer(i,k,naero_soluble+spinsol)/1.e6*zdh(i,k)*fac
-           tmp_var_pi=m_allaer_pi(i,k,naero_soluble+spinsol)/1.e6*zdh(i,k)*fac
+           tmp_var=m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*fac
+           tmp_var_pi=m_allaer_pi(i,k,aerindex)/1.e6*zdh(i,k)*fac
 
            DO inu=1,NSW
@@ -718,8 +718,8 @@
              cg_ae2b_int = cg_aeri_6bands(inu,spinsol) 
 
-             tau_ae(i,k,id,inu) = tmp_var*tau_ae2b_int
-             tau_ae_pi(i,k,id,inu) = tmp_var_pi*tau_ae2b_int
-             piz_ae(i,k,id,inu) = piz_ae2b_int
-             cg_ae(i,k,id,inu)= cg_ae2b_int
+             tau_ae(i,k,aerindex,inu) = tmp_var*tau_ae2b_int
+             tau_ae_pi(i,k,aerindex,inu) = tmp_var_pi*tau_ae2b_int
+             piz_ae(i,k,aerindex,inu) = piz_ae2b_int
+             cg_ae(i,k,aerindex,inu)= cg_ae2b_int
            ENDDO
          ENDDO