Changeset 1454 for LMDZ5/trunk/libf/dyn3d/caladvtrac.F

Timestamp:

Nov 18, 2010, 1:01:24 PM (14 years ago)

Author:

Laurent Fairhead

Message:

Merge of LMDZ5V1.0-dev branch r1453 into LMDZ5 trunk r1434

---

Fusion entre la version r1453 de la branche de développement LMDZ5V1.0-dev
et le tronc LMDZ5 (r1434)

Location:

LMDZ5/trunk

Files:

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

LMDZ5/trunk/libf/dyn3d/caladvtrac.F

@@ -8 +8 @@
      *                   flxw, pk)
 c
-      USE infotrac
-      USE control_mod
+      USE infotrac, ONLY : nqtot
+      USE control_mod, ONLY : iapp_tracvl,planet_type
  
       IMPLICIT NONE
@@ -30 +30 @@
 c   ----------
       REAL pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm),masse(ip1jmp1,llm)
-      REAL p( ip1jmp1,llmp1),q( ip1jmp1,llm,nqtot),dq( ip1jmp1,llm,2 )
+      REAL p( ip1jmp1,llmp1),q( ip1jmp1,llm,nqtot)
+      real :: dq(ip1jmp1,llm,nqtot)
       REAL teta( ip1jmp1,llm),pk( ip1jmp1,llm)
       REAL               :: flxw(ip1jmp1,llm)
@@ -49 +50 @@
 cc
 c
+! Earth-specific stuff for the first 2 tracers (water)
+      if (planet_type.eq."earth") then
 C initialisation
-        dq = 0.
-
-        CALL SCOPY( 2 * ijp1llm, q, 1, dq, 1 )
-
+        dq(:,:,1:2)=q(:,:,1:2)
+       
 c  test des valeurs minmax
 cc        CALL minmaxq(q(1,1,1),1.e33,-1.e33,'Eau vapeur (a) ')
 cc        CALL minmaxq(q(1,1,2),1.e33,-1.e33,'Eau liquide(a) ')
-
+      endif ! of if (planet_type.eq."earth")
 c   advection
 
@@ -63 +64 @@
      *       p,  masse,q,iapptrac, teta,
      .       flxw, pk)
+
 c
 
-         IF( iapptrac.EQ.iapp_tracvl ) THEN
+      IF( iapptrac.EQ.iapp_tracvl ) THEN
+        if (planet_type.eq."earth") then
+! Earth-specific treatment for the first 2 tracers (water)
 c
 cc          CALL minmaxq(q(1,1,1),1.e33,-1.e33,'Eau vapeur     ')
@@ -78 +82 @@
           ENDDO
           
-          if (planet_type.eq."earth") then
-! Earth-specific treatment of first 2 tracers (water)
-            CALL qminimum( q, 2, finmasse )
-          endif
+          CALL qminimum( q, 2, finmasse )
 
           CALL SCOPY   ( ip1jmp1*llm, masse, 1, finmasse,       1 )
@@ -100 +101 @@
            ENDDO
 c
-         ELSE
-           DO iq = 1 , 2
-           DO l  = 1, llm
-             DO ij = 1,ip1jmp1
-              dq(ij,l,iq)  = 0.
-             ENDDO
-           ENDDO
-           ENDDO
+        endif ! of if (planet_type.eq."earth")
+      ELSE
+        if (planet_type.eq."earth") then
+! Earth-specific treatment for the first 2 tracers (water)
+          dq(:,:,1:2)=0.
+        endif ! of if (planet_type.eq."earth")
+      ENDIF ! of IF( iapptrac.EQ.iapp_tracvl )
 
-
-         ENDIF
-
-c
-
-c  ... On appelle  qminimum uniquement  pour l'eau vapeur et liquide  ..
-
- 
-      RETURN
       END