Changeset 2298 for LMDZ5/branches/testing/libf/dyn3d/caladvtrac.F

Timestamp:

Jun 14, 2015, 9:13:32 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/caladvtrac.F (modified) (4 diffs)

LMDZ5/branches/testing/libf/dyn3d/caladvtrac.F

@@ -53 +53 @@
       if (planet_type.eq."earth") then
 C initialisation
-        dq(:,:,1:2)=q(:,:,1:2)
+! CRisi: il faut gérer tous les traceurs si on veut pouvoir faire des
+! isotopes
+!        dq(:,:,1:2)=q(:,:,1:2)
+        dq(:,:,1:nqtot)=q(:,:,1:nqtot)
        
 c  test des valeurs minmax
@@ -81 +84 @@
            ENDDO
           ENDDO
-          
-          CALL qminimum( q, 2, finmasse )
+
+          !write(*,*) 'caladvtrac 87'
+          CALL qminimum( q, nqtot, finmasse )
+          !write(*,*) 'caladvtrac 89'
 
           CALL SCOPY   ( ip1jmp1*llm, masse, 1, finmasse,       1 )
@@ -92 +97 @@
           dtvrtrac = iapp_tracvl * dtvr
 c
-           DO iq = 1 , 2
+           DO iq = 1 , nqtot
             DO l = 1 , llm
              DO ij = 1,ip1jmp1
@@ -105 +110 @@
         if (planet_type.eq."earth") then
 ! Earth-specific treatment for the first 2 tracers (water)
-          dq(:,:,1:2)=0.
+          dq(:,:,1:nqtot)=0.
         endif ! of if (planet_type.eq."earth")
       ENDIF ! of IF( iapptrac.EQ.iapp_tracvl )