Index: /trunk/LMDZ.VENUS/libf/phyvenus/physiq_mod.F
===================================================================
--- /trunk/LMDZ.VENUS/libf/phyvenus/physiq_mod.F	(revision 4085)
+++ /trunk/LMDZ.VENUS/libf/phyvenus/physiq_mod.F	(revision 4086)
@@ -988,5 +988,4 @@
 c END OF INITIALISATIONS
 c======================================================================
-c======================================================================
 
 c=======================================================
@@ -1075,4 +1074,5 @@
 
       else if (tr_scheme.eq.3) then
+
 !====================================================================
 ! Case 3: Full chemistry and/or clouds.
@@ -1088,14 +1088,14 @@
          zctime = dtime*real(chempas)             ! chemical timestep
 
-        IF (cl_scheme .eq. 2) THEN
-        DO i=1, klon
-          call aer_production(zctime,klev,pplay(i,:),
-     $          zzlev(i,:),zzlay(i,:),dM0_prod,dM3_prod)
-          tr_seri(i,:,i_m0_aer) = tr_seri(i,:,i_m0_aer) +
-     $                              dM0_prod(:)
-          tr_seri(i,:,i_m3_aer) = tr_seri(i,:,i_m3_aer) + 
-     $                              dM3_prod(:)
-        END DO
-        ENDIF
+         if (cl_scheme == 2) then
+            do i = 1,klon
+               call aer_production(zctime,klev,pplay(i,:),
+     $             zzlev(i,:),zzlay(i,:),dM0_prod,dM3_prod)
+               tr_seri(i,:,i_m0_aer) = tr_seri(i,:,i_m0_aer)
+     $                               + dM0_prod(:)
+               tr_seri(i,:,i_m3_aer) = tr_seri(i,:,i_m3_aer)
+     $                               + dM3_prod(:)
+            end do
+         end if
 
          if (mod(itap,chempas) == 0) then         ! <------- start of chemistry supercycling
@@ -1103,5 +1103,5 @@
 !        photochemistry and microphysics
 
-        call phytrac_chimie(debut,
+         call phytrac_chimie(debut,
      $                       gmtime,
      $                       nqmax,
@@ -1123,5 +1123,5 @@
      $                       o2_emission)
    
-        if (ok_sedim) then 
+         if (ok_sedim) then 
             if (cl_scheme == 1) then 
 
@@ -1168,49 +1168,41 @@
 !        sedimentation for detailed microphysics
 
-              d_tr_sed(:,:,:) = 0.
-
-!                 aerosols
+               d_tr_sed(:,:,:) = 0.
+
+!        aerosols
 
                call sedim_mad_aer(klon, klev, zctime, pplay, paprs,
-     $                           rho, zzlev,t_seri,d_tr_sed(:,:,1:2),
-     $                      tr_seri,nqmax)
-
-
-        d_tr_sed(:,:,i_m0_aer)= d_tr_sed(:,:,1) / zctime
-        d_tr_sed(:,:,i_m3_aer) = d_tr_sed(:,:,2) / zctime
-
-
-!                 mode 1
+     $                            rho, zzlev,t_seri,d_tr_sed(:,:,1:2),
+     $                            tr_seri,nqmax)
+
+               d_tr_sed(:,:,i_m0_aer) = d_tr_sed(:,:,1)/zctime
+               d_tr_sed(:,:,i_m3_aer) = d_tr_sed(:,:,2)/zctime
+
+!        mode 1
 
                d_tr_sed(:,:,:) = 0.
-                  call sedim_mad_m1 (klon, klev, zctime, pplay, paprs,
+               call sedim_mad_m1(klon, klev, zctime, pplay, paprs,
      $                           rho, zzlev,t_seri,d_tr_sed(:,:,1:5),
-     $                      tr_seri,nqmax,r1tab,RHOtab,sigma1)
-
-
-        d_tr_sed(:,:,i_m0_mode1drop)= d_tr_sed(:,:,1) / zctime
-        d_tr_sed(:,:,i_m0_mode1ccn) = d_tr_sed(:,:,2) / zctime
-        d_tr_sed(:,:,i_m3_mode1ccn) = d_tr_sed(:,:,3) / zctime
-        d_tr_sed(:,:,i_m3_mode1sa)  = d_tr_sed(:,:,4) / zctime
-        d_tr_sed(:,:,i_m3_mode1wv)  = d_tr_sed(:,:,5) / zctime
-
-!                 mode 2
+     $                           tr_seri,nqmax,r1tab,RHOtab,sigma1)
+
+               d_tr_sed(:,:,i_m0_mode1drop) = d_tr_sed(:,:,1)/zctime
+               d_tr_sed(:,:,i_m0_mode1ccn)  = d_tr_sed(:,:,2)/zctime
+               d_tr_sed(:,:,i_m3_mode1ccn)  = d_tr_sed(:,:,3)/zctime
+               d_tr_sed(:,:,i_m3_mode1sa)   = d_tr_sed(:,:,4)/zctime
+               d_tr_sed(:,:,i_m3_mode1wv)   = d_tr_sed(:,:,5)/zctime
+
+!        mode 2
 
                d_tr_sed(:,:,:) = 0.
-                  call sedim_mad_m2 (klon, klev, zctime, pplay, paprs,
-     $                            rho,zzlev,t_seri,d_tr_sed(:,:,1:5),
-     $                      tr_seri,nqmax,r2tab,RHOtab,sigma2)
-
-
-        d_tr_sed(:,:,i_m0_mode2drop)= d_tr_sed(:,:,1) / zctime
-        d_tr_sed(:,:,i_m0_mode2ccn) = d_tr_sed(:,:,2) / zctime
-        d_tr_sed(:,:,i_m3_mode2ccn) = d_tr_sed(:,:,3) / zctime
-        d_tr_sed(:,:,i_m3_mode2sa)  = d_tr_sed(:,:,4) / zctime
-        d_tr_sed(:,:,i_m3_mode2wv)  = d_tr_sed(:,:,5) / zctime
+               call sedim_mad_m2(klon, klev, zctime, pplay, paprs,
+     $                           rho,zzlev,t_seri,d_tr_sed(:,:,1:5),
+     $                           tr_seri,nqmax,r2tab,RHOtab,sigma2)
+
+               d_tr_sed(:,:,i_m0_mode2drop) = d_tr_sed(:,:,1)/zctime
+               d_tr_sed(:,:,i_m0_mode2ccn)  = d_tr_sed(:,:,2)/zctime
+               d_tr_sed(:,:,i_m3_mode2ccn)  = d_tr_sed(:,:,3)/zctime
+               d_tr_sed(:,:,i_m3_mode2sa)   = d_tr_sed(:,:,4)/zctime
+               d_tr_sed(:,:,i_m3_mode2wv)   = d_tr_sed(:,:,5)/zctime
           
-!        tendency due to sedimentation
-
-
-
 #endif
             end if  ! cl_scheme
@@ -1219,115 +1211,110 @@
 !        update gaseous tracers (chemistry)
 
-        do iq = 1, nqmax - nmicro
-               tr_seri(:,:,iq) = max(tr_seri(:,:,iq) 
-     $                         + d_tr_chem(:,:,iq)*zctime,1.e-30)
-            end do
+         do iq = 1, nqmax - nmicro
+            tr_seri(:,:,iq) = max(tr_seri(:,:,iq) 
+     $                          + d_tr_chem(:,:,iq)*zctime,1.e-30)
+         end do
 
 !        update condensed tracers (condensation + sedimentation)
         
-            if (cl_scheme == 1) then 
-               tr_seri(:,:,i_h2so4liq) = max(tr_seri(:,:,i_h2so4liq) 
-     $                                 + d_tr_sed(:,:,1)*zctime, 1.e-30)
-               tr_seri(:,:,i_h2oliq)   = max(tr_seri(:,:,i_h2oliq) 
-     $                                 + d_tr_sed(:,:,2)*zctime, 1.e-30)
-            else if (cl_scheme == 2) then
-
-        tr_seri(:,:,i_m0_aer) = tr_seri(:,:,i_m0_aer) 
-     $         + d_tr_micro(:,:,i_m0_aer)*zctime
-     $         +   d_tr_sed(:,:,i_m0_aer)*zctime
-        tr_seri(:,:,i_m3_aer) = tr_seri(:,:,i_m3_aer) 
-     $         + d_tr_micro(:,:,i_m3_aer)*zctime
-     $         +   d_tr_sed(:,:,i_m3_aer)*zctime
-
-        tr_seri(:,:,i_m0_mode1drop) = tr_seri(:,:,i_m0_mode1drop) 
-     $         + d_tr_micro(:,:,i_m0_mode1drop)*zctime
-     $         +   d_tr_sed(:,:,i_m0_mode1drop)*zctime
-        tr_seri(:,:,i_m0_mode1ccn) = tr_seri(:,:,i_m0_mode1ccn) 
-     $         + d_tr_micro(:,:,i_m0_mode1ccn)*zctime
-     $         +   d_tr_sed(:,:,i_m0_mode1ccn)*zctime
-
-
-        tr_seri(:,:,i_m3_mode1sa) = tr_seri(:,:,i_m3_mode1sa) 
-     $         + d_tr_micro(:,:,i_m3_mode1sa)*zctime
-     $         +   d_tr_sed(:,:,i_m3_mode1sa)*zctime
-        tr_seri(:,:,i_m3_mode1wv) = tr_seri(:,:,i_m3_mode1wv) 
-     $         + d_tr_micro(:,:,i_m3_mode1wv)*zctime
-     $         +   d_tr_sed(:,:,i_m3_mode1wv)*zctime
-        tr_seri(:,:,i_m3_mode1ccn) = tr_seri(:,:,i_m3_mode1ccn) 
-     $         + d_tr_micro(:,:,i_m3_mode1ccn)*zctime
-     $         +   d_tr_sed(:,:,i_m3_mode1ccn)*zctime
-
-        tr_seri(:,:,i_m0_mode2drop) = tr_seri(:,:,i_m0_mode2drop) 
-     $         + d_tr_micro(:,:,i_m0_mode2drop)*zctime
-     $         +   d_tr_sed(:,:,i_m0_mode2drop)*zctime
-        tr_seri(:,:,i_m0_mode2ccn) = tr_seri(:,:,i_m0_mode2ccn) 
-     $         + d_tr_micro(:,:,i_m0_mode2ccn)*zctime
-     $         +   d_tr_sed(:,:,i_m0_mode2ccn)*zctime
-
-        tr_seri(:,:,i_m3_mode2sa) = tr_seri(:,:,i_m3_mode2sa) 
-     $         + d_tr_micro(:,:,i_m3_mode2sa)*zctime
-     $         +   d_tr_sed(:,:,i_m3_mode2sa)*zctime
-        tr_seri(:,:,i_m3_mode2wv) = tr_seri(:,:,i_m3_mode2wv) 
-     $         + d_tr_micro(:,:,i_m3_mode2wv)*zctime
-     $         +   d_tr_sed(:,:,i_m3_mode2wv)*zctime
-        tr_seri(:,:,i_m3_mode2ccn) = tr_seri(:,:,i_m3_mode2ccn) 
-     $         + d_tr_micro(:,:,i_m3_mode2ccn)*zctime
-     $         +   d_tr_sed(:,:,i_m3_mode2ccn)*zctime
-
-
-        tr_seri(:,:,i_h2so4liq) = RHOas * (4.D0*PI/3.D0)*
-     $  (tr_seri(:,:,i_m3_mode2sa) + tr_seri(:,:,i_m3_mode1sa))
-
-        tr_seri(:,:,i_h2oliq) = RHOwv * (4.D0*PI/3.D0)*
-     $  (tr_seri(:,:,i_m3_mode2wv) + tr_seri(:,:,i_m3_mode1wv))
-
-        do k = 1, klev
-                  do i = 1, klon
-                       if (tr_seri(i,k,i_m3_mode1sa) .LT. 1e-18) then
-                        tr_seri(:,:,i_m0_aer) = tr_seri(:,:,i_m0_aer)+ 
-     $                  tr_seri(i,k,i_m0_mode1ccn)
-
-                        tr_seri(:,:,i_m3_aer) = tr_seri(:,:,i_m3_aer)+ 
-     $                  tr_seri(i,k,i_m3_mode1ccn)
-
-                        tr_seri(i,k,i_m3_mode1sa) = 0.D0
-                        tr_seri(i,k,i_m3_mode1wv) = 0.D0
-
-                        tr_seri(i,k,i_m3_mode1ccn) = 0.D0
-
-                        tr_seri(i,k,i_m0_mode1drop) = 0.D0
-                        tr_seri(i,k,i_m0_mode1ccn) = 0.D0 
-                       endif
+         if (cl_scheme == 1) then 
+
+            tr_seri(:,:,i_h2so4liq) = max(tr_seri(:,:,i_h2so4liq) 
+     $                              + d_tr_sed(:,:,1)*zctime, 1.e-30)
+            tr_seri(:,:,i_h2oliq)   = max(tr_seri(:,:,i_h2oliq) 
+     $                              + d_tr_sed(:,:,2)*zctime, 1.e-30)
+
+         else if (cl_scheme == 2) then
+
+            tr_seri(:,:,i_m0_aer) = tr_seri(:,:,i_m0_aer) 
+     $                            + d_tr_micro(:,:,i_m0_aer)*zctime
+     $                            + d_tr_sed(:,:,i_m0_aer)*zctime
+            tr_seri(:,:,i_m3_aer) = tr_seri(:,:,i_m3_aer) 
+     $                            + d_tr_micro(:,:,i_m3_aer)*zctime
+     $                            + d_tr_sed(:,:,i_m3_aer)*zctime
+
+            tr_seri(:,:,i_m0_mode1drop) = tr_seri(:,:,i_m0_mode1drop) 
+     $                           + d_tr_micro(:,:,i_m0_mode1drop)*zctime
+     $                           + d_tr_sed(:,:,i_m0_mode1drop)*zctime
+            tr_seri(:,:,i_m0_mode1ccn) = tr_seri(:,:,i_m0_mode1ccn) 
+     $                           + d_tr_micro(:,:,i_m0_mode1ccn)*zctime
+     $                           + d_tr_sed(:,:,i_m0_mode1ccn)*zctime
+
+            tr_seri(:,:,i_m3_mode1sa) = tr_seri(:,:,i_m3_mode1sa) 
+     $                           + d_tr_micro(:,:,i_m3_mode1sa)*zctime
+     $                           + d_tr_sed(:,:,i_m3_mode1sa)*zctime
+            tr_seri(:,:,i_m3_mode1wv) = tr_seri(:,:,i_m3_mode1wv) 
+     $                           + d_tr_micro(:,:,i_m3_mode1wv)*zctime
+     $                           + d_tr_sed(:,:,i_m3_mode1wv)*zctime
+            tr_seri(:,:,i_m3_mode1ccn) = tr_seri(:,:,i_m3_mode1ccn) 
+     $                           + d_tr_micro(:,:,i_m3_mode1ccn)*zctime
+     $                           + d_tr_sed(:,:,i_m3_mode1ccn)*zctime
+
+            tr_seri(:,:,i_m0_mode2drop) = tr_seri(:,:,i_m0_mode2drop) 
+     $                           + d_tr_micro(:,:,i_m0_mode2drop)*zctime
+     $                           + d_tr_sed(:,:,i_m0_mode2drop)*zctime
+            tr_seri(:,:,i_m0_mode2ccn) = tr_seri(:,:,i_m0_mode2ccn) 
+     $                           + d_tr_micro(:,:,i_m0_mode2ccn)*zctime
+     $                           + d_tr_sed(:,:,i_m0_mode2ccn)*zctime
+
+            tr_seri(:,:,i_m3_mode2sa) = tr_seri(:,:,i_m3_mode2sa) 
+     $                           + d_tr_micro(:,:,i_m3_mode2sa)*zctime
+     $                           + d_tr_sed(:,:,i_m3_mode2sa)*zctime
+            tr_seri(:,:,i_m3_mode2wv) = tr_seri(:,:,i_m3_mode2wv) 
+     $                           + d_tr_micro(:,:,i_m3_mode2wv)*zctime
+     $                           + d_tr_sed(:,:,i_m3_mode2wv)*zctime
+            tr_seri(:,:,i_m3_mode2ccn) = tr_seri(:,:,i_m3_mode2ccn) 
+     $                           + d_tr_micro(:,:,i_m3_mode2ccn)*zctime
+     $                           + d_tr_sed(:,:,i_m3_mode2ccn)*zctime
+
+            tr_seri(:,:,i_h2so4liq) = RHOas*(4.D0*PI/3.D0)
+     $                              *(tr_seri(:,:,i_m3_mode2sa) 
+     $                              + tr_seri(:,:,i_m3_mode1sa))
+
+            tr_seri(:,:,i_h2oliq) = RHOwv*(4.D0*PI/3.D0)
+     $                            *(tr_seri(:,:,i_m3_mode2wv) 
+     $                            + tr_seri(:,:,i_m3_mode1wv))
+
+            do k = 1, klev
+               do i = 1, klon
+                  if (tr_seri(i,k,i_m3_mode1sa) < 1e-18) then
+                     tr_seri(:,:,i_m0_aer) = tr_seri(:,:,i_m0_aer) 
+     $                                     + tr_seri(i,k,i_m0_mode1ccn)
+
+                     tr_seri(:,:,i_m3_aer) = tr_seri(:,:,i_m3_aer) 
+     $                                     + tr_seri(i,k,i_m3_mode1ccn)
+
+                     tr_seri(i,k,i_m3_mode1sa) = 0.D0
+                     tr_seri(i,k,i_m3_mode1wv) = 0.D0
+                     tr_seri(i,k,i_m3_mode1ccn) = 0.D0
+                     tr_seri(i,k,i_m0_mode1drop) = 0.D0
+                     tr_seri(i,k,i_m0_mode1ccn) = 0.D0 
+                  end if
        
-                       if (tr_seri(i,k,i_m3_mode2sa) .LT. 1e-18) then
-                        tr_seri(:,:,i_m0_aer) = tr_seri(:,:,i_m0_aer)+ 
-     $                  tr_seri(i,k,i_m0_mode2ccn)
-
-                        tr_seri(:,:,i_m3_aer) = tr_seri(:,:,i_m3_aer)+ 
-     $                  tr_seri(i,k,i_m3_mode2ccn)
-
-                        tr_seri(i,k,i_m3_mode2sa) = 0.D0
-                        tr_seri(i,k,i_m3_mode2wv) = 0.D0
-                        tr_seri(i,k,i_m3_mode2ccn) = 0.D0
-
-                        tr_seri(i,k,i_m0_mode2drop) = 0.D0
-                        tr_seri(i,k,i_m0_mode2ccn) = 0.D0 
-                       endif
-                enddo
-        enddo
-
-        tr_seri(:,:,i_h2o) = tr_seri(:,:,i_h2o) 
-     $         + d_tr_micro(:,:,i_h2o)*zctime
-        tr_seri(:,:,i_h2so4) = tr_seri(:,:,i_h2so4) 
-     $         + d_tr_micro(:,:,i_h2so4)*zctime
-
-            end if  ! cl_scheme
+                  if (tr_seri(i,k,i_m3_mode2sa) < 1e-18) then
+                     tr_seri(:,:,i_m0_aer) = tr_seri(:,:,i_m0_aer)
+     $                                     + tr_seri(i,k,i_m0_mode2ccn)
+
+                     tr_seri(:,:,i_m3_aer) = tr_seri(:,:,i_m3_aer)
+     $                                     + tr_seri(i,k,i_m3_mode2ccn)
+
+                     tr_seri(i,k,i_m3_mode2sa) = 0.D0
+                     tr_seri(i,k,i_m3_mode2wv) = 0.D0
+                     tr_seri(i,k,i_m3_mode2ccn) = 0.D0
+                     tr_seri(i,k,i_m0_mode2drop) = 0.D0
+                     tr_seri(i,k,i_m0_mode2ccn) = 0.D0 
+                  end if
+               end do
+            end do
+
+            tr_seri(:,:,i_h2o) = tr_seri(:,:,i_h2o) 
+     $                         + d_tr_micro(:,:,i_h2o)*zctime
+            tr_seri(:,:,i_h2so4) = tr_seri(:,:,i_h2so4) 
+     $                         + d_tr_micro(:,:,i_h2so4)*zctime
+
+         end if     ! cl_scheme          <------- end of microphysics option
          end if     ! mod(itap,chempas)  <------- end of chemistry supercycling
 
-!=========
-! End Case 3: Full chemistry and/or clouds.
-!====================================================================
-
-         end if     ! tr_scheme
+         end if     ! tr_scheme          <------- end of chemistry option
       end if        ! iflag_trac
 
