Changeset 474 for trunk/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2006-05-11T17:24:19+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_061: SM: end of ctl_stop + mpi optimization in _bilap

File:

• trunk/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -152 +152 @@
           IF(lwp) WRITE(numout,*) '         ocean lateral  strong-slip '
         ELSE
-          IF(lwp) WRITE(numout,cform_err)
-          IF(lwp) WRITE(numout,*) ' shlat is negative = ', shlat
-          nstop = nstop + 1
+          WRITE(ctmp1,*) ' shlat is negative = ', shlat
+          CALL ctl_stop( ctmp1 )
       ENDIF
 
@@ -507 +506 @@
       IF(lwp)WRITE(numout,*) 'dom_msk_nsa : noslip accurate boundary condition'
       IF(lwp)WRITE(numout,*) '~~~~~~~~~~~   using Schchepetkin and O Brian scheme'
-      IF( lk_mpp ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*) ' mpp version is not yet implemented'
-         nstop = nstop + 1
-      ENDIF
+      IF( lk_mpp ) CALL ctl_stop( ' mpp version is not yet implemented' )
 
       ! mask for second order calculation of vorticity
@@ -606 +601 @@
          IF( npcoa(1,jk) > itest .OR. npcoa(2,jk) > itest .OR.   &
              npcoa(3,jk) > itest .OR. npcoa(4,jk) > itest ) THEN
-            WRITE(numout,*)
-            WRITE(numout,*) ' level jk = ',jk
-            WRITE(numout,*) ' straight coast index arraies are too small.:'
-            WRITE(numout,*) ' npe, npw, nps, npn = ', npcoa(1,jk), npcoa(2,jk),   &
+            
+            WRITE(ctmp1,*) ' level jk = ',jk
+            WRITE(ctmp2,*) ' straight coast index arraies are too small.:'
+            WRITE(ctmp3,*) ' npe, npw, nps, npn = ', npcoa(1,jk), npcoa(2,jk),   &
                 &                                     npcoa(3,jk), npcoa(4,jk)
-            WRITE(numout,*) ' 2*(jpi+jpj) = ',itest,'. we stop.'
-            STOP   !!bug nstop to be used
+            WRITE(ctmp4,*) ' 2*(jpi+jpj) = ',itest,'. we stop.'
+            CALL ctl_stop( ctmp1, ctmp2, ctmp3, ctmp4 )
         ENDIF
       END DO
@@ -664 +659 @@
                &                  '  Point(',icoord(jl,1),',',icoord(jl,2),')'
          END DO
-         IF(lwp) WRITE(numout,*) 'We stop...'   !!cr print format to be used
-         nstop = nstop + 1
+         CALL ctl_stop( 'We stop...' )
       ENDIF