Index: trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F90
===================================================================
--- trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F90	(revision 3340)
+++ trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F90	(revision 3497)
@@ -276,7 +276,4 @@
       real zdmassmr_col(ngrid)    ! Atmospheric Column Mass tendency for mass_redistribution (kg_of_air/m2/s).
       real zdpsrfmr(ngrid)        ! Pressure tendency for mass_redistribution routine (Pa/s).
-
-      ! Temporal tracers :
-      real ppq(ngrid,nlayer,nq)   ! Tracers (kg/kg_of_air).
       
     
@@ -842,5 +839,4 @@
 
                ! standard callcorrk
-               !call callcorrk(ngrid,nlayer,ppq,nq,qsurf,zday,                      &
                call callcorrk(ngrid,nlayer,pq,nq,qsurf,zday,                      &
                               albedo,albedo_equivalent,emis,mu0,pplev,pplay,zzlev,&
@@ -1119,18 +1115,14 @@
                ENDDO
             ENDIF
-            ! In case there is no clouds, in the troposphere the moments are  fixed to evacuate all aerosols
+            ! In case there is no clouds, in the troposphere the moments are fixed to evacuate all aerosols
             IF (.NOT. callclouds) THEN
-               DO l = 1, nlayer
-                  DO ig=1,ngrid
-                     IF (pplay(ig,l) .gt. 1000.) THEN
-                        pdq(ig,l,1)=0.
-                        pdq(ig,l,2)=0.
-                        IF (pplay(ig,l) .gt. 5000.) THEN
-                           pdq(ig,l,3)=0.
-                           pdq(ig,l,4)=0.
-                        ENDIF
-                     ENDIF
-                  ENDDO
-               ENDDO
+               WHERE (pplay(:,:) .gt. 1000.)
+                  pdq(:,:,1) = 0.
+                  pdq(:,:,2) = 0.
+               ENDWHERE
+               WHERE (pplay(:,:) .gt. 5000.)
+                  pdq(:,:,3) = 0.
+                  pdq(:,:,4) = 0.
+               ENDWHERE
             ENDIF
 #endif
@@ -1262,5 +1254,12 @@
             else
                ! Fill lakes with precipitation :
-               tankCH4(:) = tankCH4(:) + (mmd_ice_prec(:,1) / 425. * ptimestep) ! [m]
+               !if (REAL(latitude_deg(ig)) .ge. 70.0) then
+               !   tankCH4(ig) = 200.0 ! [m]
+               !else if (REAL(latitude_deg(ig)) .le. -70.0) then
+               !   tankCH4(ig) = 50.0  ! [m]
+               !else
+               !   tankCH4(ig) = 0.0   ! [m]
+               !endif
+               tankCH4(:) = tankCH4(:) + (mmd_ice_prec(:,1) / 422. * ptimestep) ! [m]
                
                ! Evaporation of lakes :
@@ -1415,74 +1414,32 @@
       enddo
 
-      ! [BBT TEMPO] Firstcall : Initialize Tracers
-      !if (firstcall) then
-      !   do ig = 1, ngrid
-      !      ! Aerosols :
-      !      !-----------
-      !      WHERE (pq(ig,:24,3) < 3.0e7) &
-      !               pdq(ig,:24,3) = (3.0e7 - pq(ig,:24,3)) / ptimestep   ! M0 aerf
-      !      WHERE (pq(ig,:24,4) < 1.5e-12) &
-      !               pdq(ig,:24,4) = (1.5e-12 - pq(ig,:24,4)) / ptimestep ! M3 aerf
-      !      ! Lakes :
-      !      !--------
-      !      if (REAL(latitude_deg(ig)) .ge. 70.0) then
-      !         tankCH4(ig) = 100.0 ! [m]
-      !      else if (REAL(latitude_deg(ig)) .le. -70.0) then
-      !         tankCH4(ig) = 20.0  ! [m]
-      !      else
-      !         tankCH4(ig) = 0.0   ! [m]
-      !      endif
-      !      ! Species :
-      !      !----------
-      !      do iq = 1, size(ices_indx)
-      !         ! CH4 :
-      !         !------
-      !         if(trim(nameOfTracer(gazs_indx(iq))) .eq. "CH4") then
-      !            WHERE (pq(ig,:,gazs_indx(iq))/rat_mmol(gazs_indx(iq)) > 0.05) &
-      !               pdq(ig,:,gazs_indx(iq)) = (0.05 * rat_mmol(gazs_indx(iq)) - pq(ig,:,gazs_indx(iq))) / ptimestep
-      !            WHERE (pq(ig,:,gazs_indx(iq))/rat_mmol(gazs_indx(iq)) < 0.014) &
-      !               pdq(ig,:,gazs_indx(iq)) = (0.014 * rat_mmol(gazs_indx(iq)) - pq(ig,:,gazs_indx(iq))) / ptimestep
-      !         endif
-      !         ! C2H2 :
-      !         !-------
-      !         if(trim(nameOfTracer(gazs_indx(iq))) .eq. "C2H2") then
-      !            WHERE (pq(ig,26:,gazs_indx(iq))/rat_mmol(gazs_indx(iq)) < 3.0e-6) &
-      !               pdq(ig,26:,gazs_indx(iq)) = (5.0e-6 * rat_mmol(gazs_indx(iq)) - pq(ig,26:,gazs_indx(iq))) / ptimestep
-      !         endif
-      !         ! C2H6 :
-      !         !-------
-      !         if(trim(nameOfTracer(gazs_indx(iq))) .eq. "C2H6") then
-      !            WHERE (pq(ig,26:,gazs_indx(iq))/rat_mmol(gazs_indx(iq)) < 2.0e-5) &
-      !               pdq(ig,26:,gazs_indx(iq)) = (2.0e-5 * rat_mmol(gazs_indx(iq)) - pq(ig,26:,gazs_indx(iq))) / ptimestep
-      !         endif
-      !         ! HCN :
-      !         !------
-      !         if(trim(nameOfTracer(gazs_indx(iq))) .eq. "HCN") then
-      !            WHERE (pq(ig,26:,gazs_indx(iq))/rat_mmol(gazs_indx(iq)) < 8.0e-6) &
-      !               pdq(ig,26:,gazs_indx(iq)) = (8.0e-6 * rat_mmol(gazs_indx(iq)) - pq(ig,26:,gazs_indx(iq))) / ptimestep
-      !         endif
-      !      enddo
-      !   enddo
-      !endif
-      ! [BdBdT : Forcage de la photochimie]
-      do ig = 1, ngrid
-         do iq = 1, size(ices_indx)
-            ! C2H2 :
-            !-------
-            if(trim(nameOfTracer(gazs_indx(iq))) .eq. "C2H2") then
-               pdq(ig,nlayer-3:,gazs_indx(iq)) = (4.0e-5 * rat_mmol(gazs_indx(iq)) - pq(ig,nlayer-3:,gazs_indx(iq))) / ptimestep
-            endif
-            ! C2H6 :
-            !-------
-            if(trim(nameOfTracer(gazs_indx(iq))) .eq. "C2H6") then
-               pdq(ig,nlayer-3:,gazs_indx(iq)) = (1.0e-4 * rat_mmol(gazs_indx(iq)) - pq(ig,nlayer-3:,gazs_indx(iq))) / ptimestep
-            endif
-            ! HCN :
-            !------
-            if(trim(nameOfTracer(gazs_indx(iq))) .eq. "HCN") then
-               pdq(ig,nlayer-3:,gazs_indx(iq)) = (4.0e-5 * rat_mmol(gazs_indx(iq)) - pq(ig,nlayer-3:,gazs_indx(iq))) / ptimestep
-            endif
+      ! [Forcage de la photochimie pour les nuages]
+      if (callclouds) then
+         do ig = 1, ngrid
+            do iq = 1, size(ices_indx)
+               ! C2H2 :
+               !-------
+               if(trim(nameOfTracer(gazs_indx(iq))) .eq. "C2H2") then
+                  pdq(ig,nlayer-3:,gazs_indx(iq)) = (4.0e-5 * rat_mmol(gazs_indx(iq)) - pq(ig,nlayer-3:,gazs_indx(iq))) / ptimestep
+               endif
+               ! C2H6 :
+               !-------
+               if(trim(nameOfTracer(gazs_indx(iq))) .eq. "C2H6") then
+                  pdq(ig,nlayer-3:,gazs_indx(iq)) = (8.0e-5 * rat_mmol(gazs_indx(iq)) - pq(ig,nlayer-3:,gazs_indx(iq))) / ptimestep
+               endif
+               ! HCN :
+               !------
+               if(trim(nameOfTracer(gazs_indx(iq))) .eq. "HCN") then
+                  pdq(ig,nlayer-3:,gazs_indx(iq)) = (2.0e-5 * rat_mmol(gazs_indx(iq)) - pq(ig,nlayer-3:,gazs_indx(iq))) / ptimestep
+               endif
+               ! AC6H6 :
+               !--------
+               if(trim(nameOfTracer(gazs_indx(iq))) .eq. "AC6H6") then
+                  pdq(ig,nlayer-3:,gazs_indx(iq)) = (2.0e-5 * rat_mmol(gazs_indx(iq)) - pq(ig,nlayer-3:,gazs_indx(iq))) / ptimestep
+               endif
+            enddo
          enddo
-      enddo
+      endif
+
       zq(:,:,:) = pq(:,:,:) + pdq(:,:,:)*ptimestep
 
@@ -1830,9 +1787,7 @@
       ! Optical diagnostics :
       !--------------------------------------------------------
-
-      if (1.eq.0) then  ! not by default...
-
       ! Haze opacity :
-      CALL send_xios_field('ttauhv_14',zpopthv(:,:,14,2)) ! 14 --> 1.076 um
+      CALL send_xios_field('ttauhv_08',zpopthv(:,:,8,2))  ! 08 --> 1.983 um
+      CALL send_xios_field('ttauhv_15',zpopthv(:,:,15,2)) ! 15 --> 1.000 um
       CALL send_xios_field('ttauhv_20',zpopthv(:,:,20,2)) ! 20 --> 0.671 um
       CALL send_xios_field('ttauhv_23',zpopthv(:,:,23,2)) ! 23 --> 0.346 um
@@ -1841,5 +1796,6 @@
       CALL send_xios_field('ttauhi_23',zpopthi(:,:,23,2)) ! 23 --> 4.849 um
       ! Haze extinction :
-      CALL send_xios_field('kkhv_14',zpopthv(:,:,14,3))
+      CALL send_xios_field('kkhv_08',zpopthv(:,:,8,3))
+      CALL send_xios_field('kkhv_15',zpopthv(:,:,15,3))
       CALL send_xios_field('kkhv_20',zpopthv(:,:,20,3))
       CALL send_xios_field('kkhv_23',zpopthv(:,:,23,3))
@@ -1848,5 +1804,6 @@
       CALL send_xios_field('kkhi_23',zpopthi(:,:,23,3))
       ! Haze single scattering albedo :
-      CALL send_xios_field('wwhv_14',zpopthv(:,:,14,4))
+      CALL send_xios_field('wwhv_08',zpopthv(:,:,8,4))
+      CALL send_xios_field('wwhv_15',zpopthv(:,:,15,4))
       CALL send_xios_field('wwhv_20',zpopthv(:,:,20,4))
       CALL send_xios_field('wwhv_23',zpopthv(:,:,23,4))
@@ -1855,5 +1812,6 @@
       CALL send_xios_field('wwhi_23',zpopthi(:,:,23,4))
       ! Haze asymmetry parameter :
-      CALL send_xios_field('gghv_14',zpopthv(:,:,14,5))
+      CALL send_xios_field('gghv_08',zpopthv(:,:,8,5))
+      CALL send_xios_field('gghv_15',zpopthv(:,:,15,5))
       CALL send_xios_field('gghv_20',zpopthv(:,:,20,5))
       CALL send_xios_field('gghv_23',zpopthv(:,:,23,5))
@@ -1865,5 +1823,6 @@
       IF (callclouds) THEN
          ! Opacity :
-         CALL send_xios_field('ttauv_14',zpopttv(:,:,14,2)) ! 14 --> 1.076 um
+         CALL send_xios_field('ttauv_08',zpopttv(:,:,8,2))  ! 08 --> 1.983 um
+         CALL send_xios_field('ttauv_15',zpopttv(:,:,15,2)) ! 15 --> 1.000 um
          CALL send_xios_field('ttauv_20',zpopttv(:,:,20,2)) ! 20 --> 0.671 um
          CALL send_xios_field('ttauv_23',zpopttv(:,:,23,2)) ! 23 --> 0.346 um
@@ -1872,5 +1831,6 @@
          CALL send_xios_field('ttaui_23',zpoptti(:,:,23,2)) ! 23 --> 4.849 um
          ! Extinction :
-         CALL send_xios_field('kkv_14',zpopttv(:,:,14,3))
+         CALL send_xios_field('kkv_08',zpopttv(:,:,8,3))
+         CALL send_xios_field('kkv_15',zpopttv(:,:,15,3))
          CALL send_xios_field('kkv_20',zpopttv(:,:,20,3))
          CALL send_xios_field('kkv_23',zpopttv(:,:,23,3))
@@ -1879,5 +1839,6 @@
          CALL send_xios_field('kki_23',zpoptti(:,:,23,3))
          ! Single scattering albedo :
-         CALL send_xios_field('wwv_14',zpopttv(:,:,14,4))
+         CALL send_xios_field('wwv_08',zpopttv(:,:,8,4))
+         CALL send_xios_field('wwv_15',zpopttv(:,:,15,4))
          CALL send_xios_field('wwv_20',zpopttv(:,:,20,4))
          CALL send_xios_field('wwv_23',zpopttv(:,:,23,4))
@@ -1886,5 +1847,6 @@
          CALL send_xios_field('wwi_23',zpoptti(:,:,23,4))
          ! Asymmetry parameter :
-         CALL send_xios_field('ggv_14',zpopttv(:,:,14,5))
+         CALL send_xios_field('ggv_08',zpopttv(:,:,8,5))
+         CALL send_xios_field('ggv_15',zpopttv(:,:,15,5))
          CALL send_xios_field('ggv_20',zpopttv(:,:,20,5))
          CALL send_xios_field('ggv_23',zpopttv(:,:,23,5))
@@ -1900,6 +1862,4 @@
          CALL send_xios_field('dconti_17',zpoptti(:,:,17,8))
       ENDIF      
-
-      endif  ! 1.eq.0 ...
 
       ! Diagnostics for haze and clouds (4D) :
