Changeset 1446 for LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3dpar/advtrac_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/advtrac_p.F (modified) (4 diffs)

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

@@ -132 +132 @@
 ccc         CALL filtreg ( massem ,jjp1, llm,-2, 2, .TRUE., 1 )
 c
-      ENDIF
+      ENDIF ! of IF(iadvtr.EQ.0)
 
       iadvtr   = iadvtr+1
@@ -266 +266 @@
 cym      ----> Revérifier lors de la parallélisation des autres schemas
    
-cym          call massbar_p(massem,massebx,masseby)          
+cym          call massbar_p(massem,massebx,masseby)  
 
           call vlspltgen_p( q,iadv, 2., massem, wg ,
@@ -452 +452 @@
 c$OMP BARRIER
 
-      ijb=ij_begin
-      ije=ij_end
+      if (planet_type=="earth") then
+
+        ijb=ij_begin
+        ije=ij_end
 
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
-       DO l = 1, llm
+        DO l = 1, llm
          DO ij = ijb, ije
            finmasse(ij,l) =  p(ij,l) - p(ij,l+1) 
          ENDDO
-       ENDDO
+        ENDDO
 c$OMP END DO
 
-       CALL qminimum_p( q, 2, finmasse )
+        CALL qminimum_p( q, 2, finmasse )
 
 c------------------------------------------------------------------
@@ -496 +498 @@
 c$OMP BARRIER   
           iadvtr=0
+      endif ! of if (planet_type=="earth")
        ENDIF ! if iadvtr.EQ.iapp_tracvl