Changeset 1346 for trunk/NEMO/OPA_SRC/DIA/diaptr.F90

Timestamp:

2009-03-27T17:25:46+01:00 (15 years ago)

Author:

rblod

Message:

Correct a mistake in previous commit for mono processor case, see ticket #361

File:

• trunk/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -86 +86 @@
       &                              surf_jk_r_ipc       
 #if defined key_diaeiv
-   REAL(wp), DIMENSION(jpj,jpk) ::   v_msf_eiv_glo, v_msf_eiv_atl, v_msf_eiv_pac, v_msf_eiv_ind, v_msf_eiv_ipc !: bolus "meridional" Stream-Function
+   REAL(wp), DIMENSION(jpj,jpk) ::   v_msf_eiv_glo, v_msf_eiv_atl, v_msf_eiv_pac,  &
+      &                              v_msf_eiv_ind, v_msf_eiv_ipc !: bolus "meridional" Stream-Function
 #endif
  
@@ -129 +130 @@
       END DO
       !
-      IF( lk_mpp )   CALL mpp_sum( p_fval, ijpj, ncomm_znl)     !!bug  I presume
+#if defined key_mpp_mpi
+      CALL mpp_sum( p_fval, ijpj, ncomm_znl)     !!bug  I presume
+#endif
       !
    END FUNCTION ptr_vj_3d
@@ -161 +164 @@
       END DO
       !
-      IF( lk_mpp )   CALL mpp_sum( p_fval, ijpj, ncomm_znl )     !!bug  I presume
+#if defined key_mpp_mpi
+      CALL mpp_sum( p_fval, ijpj, ncomm_znl )     !!bug  I presume
+#endif
       ! 
    END FUNCTION ptr_vj_2d
@@ -210 +215 @@
       END IF
       !
-      IF(lk_mpp) THEN
-         ish(1) = jpj*jpk  ;  ish2(1) = jpj  ;  ish2(2) = jpk
-         zwork(:)= RESHAPE( p_fval, ish )
-         CALL mpp_sum( zwork, jpj*jpk, ncomm_znl )
-         p_fval(:,:)= RESHAPE( zwork, ish2 )
-      END IF
+#if defined key_mpp_mpi
+      ish(1) = jpj*jpk  ;  ish2(1) = jpj  ;  ish2(2) = jpk
+      zwork(:)= RESHAPE( p_fval, ish )
+      CALL mpp_sum( zwork, jpj*jpk, ncomm_znl )
+      p_fval(:,:)= RESHAPE( zwork, ish2 )
+#endif
       !
    END FUNCTION ptr_vjk
@@ -265 +270 @@
       END IF
       p_fval(:,:) = p_fval(:,:) * 0.5
-      IF(lk_mpp) THEN
-         ish(1) = jpj*jpk   ;   ish2(1) = jpj   ;   ish2(2) = jpk
-         zwork(:)= RESHAPE( p_fval, ish )
-         CALL mpp_sum( zwork, jpj*jpk, ncomm_znl )
-         p_fval(:,:)= RESHAPE(zwork,ish2)
-      END IF
+#if defined key_mpp_mpi
+      ish(1) = jpj*jpk   ;   ish2(1) = jpj   ;   ish2(2) = jpk
+      zwork(:)= RESHAPE( p_fval, ish )
+      CALL mpp_sum( zwork, jpj*jpk, ncomm_znl )
+      p_fval(:,:)= RESHAPE(zwork,ish2)
+#endif
       !
    END FUNCTION ptr_tjk
@@ -655 +660 @@
             END DO
             ! provide the correct zphi to all local domains
-            IF( lk_mpp )   CALL mpp_sum( zphi, jpj, ncomm_znl )        
+#if defined key_mpp_mpi
+            CALL mpp_sum( zphi, jpj, ncomm_znl )        
+#endif
 
             !                                        ! =======================
@@ -666 +673 @@
          !
          ! Work only on westmost processor (will not work if mppini2 is used)
+#if defined key_mpp_mpi
          IF ( l_znl_root ) THEN 
+#endif
             !
             ! OPEN netcdf file 
@@ -848 +857 @@
 
          END IF
+#if defined key_mpp_mpi
       END IF
-
+#endif
+
+#if defined key_mpp_mpi
       IF( MOD( itmod, nf_ptr ) == 0 .AND. l_znl_root ) THEN
-
+#else
+      IF( MOD( itmod, nf_ptr ) == 0  ) THEN
+#endif
          niter = niter + 1