Changeset 16 for trunk/NEMO/OPA_SRC/FLO/floblk.F90

Timestamp:

2004-02-17T09:06:15+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/FLO/floblk.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/FLO/floblk.F90

@@ -17 +17 @@
    USE dom_oce         ! ocean space and time domain
    USE phycst          ! physical constants
+   USE in_out_manager  ! I/O manager
    USE lib_mpp         ! distribued memory computing library
 
@@ -105 +106 @@
       iloop = 0
 222   DO jfl = 1, jpnfl
-# if defined key_mpp
+# if   defined key_mpp_mpi   ||   defined key_mpp_shmem
          IF( (iil(jfl) >= (mig(nldi)-jpizoom+1)) .AND. (iil(jfl) <= (mig(nlei)-jpizoom+1)) .AND.   &
              (ijl(jfl) >= (mjg(nldj)-jpjzoom+1)) .AND. (ijl(jfl) <= (mjg(nlej)-jpjzoom+1)) ) THEN
@@ -320 +321 @@
             ! reinitialisation of the age of FLOAT
             zagefl(jfl) = zagenewfl(jfl)
-# if defined key_mpp
+# if   defined key_mpp_mpi   ||   defined key_mpp_shmem
          ELSE
             ! we put zgifl, zgjfl, zgkfl, zagefl
@@ -334 +335 @@
       
       ! synchronisation
-      ! sum of this arrays
-            
-# if defined key_mpp
-      CALL mpp_sum( zgifl , jpnfl )
-      CALL mpp_sum( zgjfl , jpnfl )
-      CALL mpp_sum( zgkfl , jpnfl )
-      CALL mpp_sum( zagefl, jpnfl )
-      CALL mpp_sum( iil   , jpnfl )
-      CALL mpp_sum( ijl   , jpnfl )
-# endif
+      IF( lk_mpp )   CALL mpp_sum( zgifl , jpnfl )   ! sums over the global domain
+      IF( lk_mpp )   CALL mpp_sum( zgjfl , jpnfl )
+      IF( lk_mpp )   CALL mpp_sum( zgkfl , jpnfl )
+      IF( lk_mpp )   CALL mpp_sum( zagefl, jpnfl )
+      IF( lk_mpp )   CALL mpp_sum( iil   , jpnfl )
+      IF( lk_mpp )   CALL mpp_sum( ijl   , jpnfl )
       
       ! in the case of open boundaries we need to test if the floats don't