Changeset 15 for trunk/NEMO/OPA_SRC/stpctl.F90

Timestamp:

2004-02-17T08:25:44+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/stpctl.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/stpctl.F90

@@ -55 +55 @@
       INTEGER, DIMENSION(3) ::   ilocu      ! 
       INTEGER, DIMENSION(2) ::   ilocs      ! 
-#if defined key_dynspg_rl
-      INTEGER  ::   jni                     ! dummy loop indice
-      REAL(wp) ::   zfact                   ! temporary scalar
-#endif
       !!----------------------------------------------------------------------
       !!  OPA 8.5, LODYC-IPSL (2002)
@@ -115 +111 @@
         END DO 
       END DO        
-#if defined key_mpp    
-      CALL mpp_max( zumax )
-#endif
+      IF( lk_mpp )   CALL mpp_max( zumax )   ! max over the global domain
+
       IF( MOD( kt, nwrite ) == 1 ) THEN
          IF(lwp) WRITE(numout,*) ' ==>> time-step= ',kt,' abs(U) max: ', zumax
@@ -126 +121 @@
          ij = ilocu(2) + njmpp - 1
          ik = ilocu(3)
-#if defined key_mpp
-         CALL mpp_isl( ii )
-         CALL mpp_isl( ij )
-         CALL mpp_isl( ik )
-#endif
+         IF( lk_mpp ) THEN
+            CALL mpp_isl( ii )
+            CALL mpp_isl( ij )
+            CALL mpp_isl( ik )
+         ENDIF
          IF(lwp) THEN
             WRITE(numout,cform_err)
@@ -155 +150 @@
          END DO
       END DO
-#if defined key_mpp    
-      CALL mpp_min( zsmin )
-#endif
+      IF( lk_mpp )   CALL mpp_min( zsmin )   ! min over the global domain
+
       IF( MOD( kt, nwrite ) == 1 ) THEN
          IF(lwp) WRITE(numout,*) ' ==>> time-step= ',kt,' SSS min:', zsmin
@@ -165 +159 @@
          ii = ilocs(1) + nimpp - 1
          ij = ilocs(2) + njmpp - 1
-#if defined key_mpp
-         CALL mpp_isl( ii )
-         CALL mpp_isl( ij )
-#endif
+         IF( lk_mpp )   CALL mpp_isl( ii )
+         IF( lk_mpp )   CALL mpp_isl( ij )
+
          IF(lwp) THEN
             WRITE(numout,cform_err)