Changeset 474 for trunk/NEMO/OPA_SRC/DOM

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

Location:

trunk/NEMO/OPA_SRC/DOM

Files:

• domcfg.F90 (modified) (3 diffs)
• dommsk.F90 (modified) (4 diffs)
• domstp.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DOM/domcfg.F90

@@ -65 +65 @@
                                                                   ' north fold with F-point pivot'
       ENDIF
-      IF( jperio <  0 .OR. jperio > 6 ) THEN
-          IF(lwp) WRITE(numout,cform_err)
-          IF(lwp) WRITE(numout,*) 'jperio is out of range'
-          nstop = nstop + 1
-      ENDIF
-
+      IF( jperio <  0 .OR. jperio > 6 ) CALL ctl_stop( 'jperio is out of range' )
 
       ! global domain versus zoom and/or local domain
@@ -161 +156 @@
       ! zoom control
       IF( jpiglo + jpizoom - 1  >  jpidta .OR.   &
-          jpjglo + jpjzoom - 1  >  jpjdta      ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*)' global or zoom domain exceed the data domain ! '
-         nstop = nstop + 1
-      ENDIF
+          jpjglo + jpjzoom - 1  >  jpjdta      ) &
+          &   CALL ctl_stop( ' global or zoom domain exceed the data domain ! ' )
 
       ! set zoom flag
@@ -185 +177 @@
          WRITE(numout,*) '             lzoom_n = ', lzoom_n, ' (T = forced closed North boundary)'
       ENDIF
-      IF(  ( lzoom_e .OR. lzoom_w )  .AND.  ( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 )  ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*)' Your zoom choice is inconsistent with east-west cyclic boundary condition'
-         nstop = nstop + 1
-      ENDIF
-      IF(  lzoom_n  .AND.  ( 3 <= jperio .AND. jperio <= 6 )  ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*)' Your zoom choice is inconsistent with North fold boundary condition'
-         nstop = nstop + 1
-      ENDIF
-      IF(  lzoom  .AND.  lk_isl  ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*)' key_islands and zoom are not allowed'
-         nstop = nstop + 1
-      ENDIF
+      IF(  ( lzoom_e .OR. lzoom_w )  .AND.  ( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 )  )   &
+           &   CALL ctl_stop( ' Your zoom choice is inconsistent with east-west cyclic boundary condition' )
+      IF(  lzoom_n  .AND.  ( 3 <= jperio .AND. jperio <= 6 )  )   &
+           &   CALL ctl_stop( ' Your zoom choice is inconsistent with North fold boundary condition' )
+      IF(  lzoom  .AND.  lk_isl  ) CALL ctl_stop( ' key_islands and zoom are not allowed' )
 
       ! Pre-defined arctic/antarctic zoom of ORCA configuration flag

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
 

trunk/NEMO/OPA_SRC/DOM/domstp.F90

@@ -88 +88 @@
             IF(lwp) WRITE(numout,*)'               accelerating the convergence'
             IF(lwp) WRITE(numout,*)'               dynamics time step = ', rdt/3600., ' hours'
-            IF( ln_sco .AND. rdtmin /= rdtmax ) THEN
-               IF(lwp) WRITE(numout,cform_err)
-               IF(lwp) WRITE(numout,*)' depth dependent acceleration of &
-                                      &convergence not implemented in s-coordinates'
-               nstop = nstop + 1
-            ENDIF
+            IF( ln_sco .AND. rdtmin /= rdtmax )   &
+                 & CALL ctl_stop ( ' depth dependent acceleration of convergence not implemented in s-coordinates' )
             IF(lwp) WRITE(numout,*)'         tracers   time step :  dt (hours)  level'
 
@@ -108 +104 @@
          CASE DEFAULT              ! E R R O R 
 
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' nacc value e r r o r, nacc= ',nacc
-            IF(lwp) WRITE(numout,*) ' we stop'
-            nstop = nstop + 1
+            WRITE(ctmp1,*) ' nacc value e r r o r, nacc= ',nacc
+            CALL ctl_stop( ctmp1 )
 
       END SELECT