Changeset 1446 for LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/addfi_p.F

Timestamp:

Oct 22, 2010, 11:27:25 AM (14 years ago)

Author:

Ehouarn Millour

Message:

Implemented modifications to enable running with only one tracer for planet types different from "earth". Rem: If flag 'planet_type' is set to "earth" (default behaviour) then there must be at least 2 tracers for the dynamics to function properly.

These updates do not induce any changes in model outputs with respect to previous revisions.

EM

File:

• LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/addfi_p.F (modified) (5 diffs)

LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/addfi_p.F

@@ -1 +1 @@
 !
-! $Header$
+! $Id$
 !
       SUBROUTINE addfi_p(pdt, leapf, forward,
@@ -7 +7 @@
       USE parallel
       USE infotrac, ONLY : nqtot
+      USE control_mod, ONLY : planet_type
       IMPLICIT NONE
 c
@@ -154 +155 @@
 c$OMP END MASTER
  
-      DO iq = 1, 2
+      if (planet_type=="earth") then
+      ! earth case, special treatment for first 2 tracers (water)
+       DO iq = 1, 2
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
          DO k = 1,llm
@@ -163 +166 @@
          ENDDO
 c$OMP END DO NOWAIT
-      ENDDO
-
-      DO iq = 3, nqtot
+       ENDDO
+
+       DO iq = 3, nqtot
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
          DO k = 1,llm
@@ -174 +177 @@
          ENDDO
 c$OMP END DO NOWAIT
-      ENDDO
+       ENDDO
+      else
+      ! general case, treat all tracers equally)
+       DO iq = 1, nqtot
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+         DO k = 1,llm
+            DO j = ijb,ije
+               pq(j,k,iq)= pq(j,k,iq) + pdqfi(j,k,iq) * pdt
+               pq(j,k,iq)= AMAX1( pq(j,k,iq), qtestt )
+            ENDDO
+         ENDDO
+c$OMP END DO NOWAIT
+       ENDDO
+      endif ! of if (planet_type=="earth")
 
 c$OMP MASTER