Changeset 682 for trunk/NEMO/OPA_SRC/opa.F90

Timestamp:

2007-06-29T18:32:23+02:00 (17 years ago)

Author:

rblod

Message:

nemo_v2_bugfix_050 : SM : Do not call step once one processes have nstop /= 0

File:

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

trunk/NEMO/OPA_SRC/opa.F90

@@ -94 +94 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/opa.F90,v 1.38 2007/06/05 10:32:02 opalod Exp $ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -122 +122 @@
       
       CALL opa_init  ! Initializations
+
+      ! check that all process are still there... If some process have an error,
+      ! they will never enter in step and other processes will wait until the end of the cpu time!
+      IF( lk_mpp )   CALL mpp_max(nstop)
 
       IF( lk_cfg_1d ) THEN 
@@ -132 +136 @@
 #endif
             istp = istp + 1
+
+            IF( lk_mpp )   CALL mpp_max(nstop)
+ 
          END DO
       ELSE
@@ -142 +149 @@
 #endif
             istp = istp + 1
+
+            IF( lk_mpp )   CALL mpp_max(nstop)
+            
          END DO
       ENDIF
@@ -150 +160 @@
       IF(lwp) WRITE(numout,cform_aaa)       ! Flag AAAAAAA
 
-      IF( nstop /= 0 ) THEN                 ! error print
-      IF(lwp) WRITE(numout,cform_err)
-      IF(lwp) WRITE(numout,*) nstop, ' error have been found' 
+      IF( nstop /= 0 .AND. lwp ) THEN                 ! error print
+         WRITE(numout,cform_err)
+         WRITE(numout,*) nstop, ' error have been found' 
       ENDIF