Changeset 474 for trunk/NEMO/OPA_SRC/geo2ocean.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/geo2ocean.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/geo2ocean.F90

@@ -255 +255 @@
 
          CASE default
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) 'geo2oce : bad grid argument : ', cgrid
-            nstop = nstop + 1
+            WRITE(ctmp1,*) 'geo2oce : bad grid argument : ', cgrid
+            CALL ctl_stop( ctmp1 )
        END SELECT
       
@@ -327 +326 @@
       IF( kchoix == 0 ) THEN
          IF( nmem == 0 ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) 'repere : e r r o r  in kchoix : ', kchoix
-            IF(lwp) WRITE(numout,*) ' for the first call , you must indicate '
-            IF(lwp) WRITE(numout,*) ' the direction of change '
-            IF(lwp) WRITE(numout,*) ' kchoix = 1 geo       --> stretched '
-            IF(lwp) WRITE(numout,*) ' kchoix =-1 stretched --> geo '
-            nstop = nstop + 1
+            WRITE(ctmp1,*) 'repere : e r r o r  in kchoix : ', kchoix
+            CALL ctl_stop( ctmp1, ' for the first call , you must indicate ',   &
+                 &                ' the direction of change ',   &
+                 &                ' kchoix = 1 geo       --> stretched ',   &
+                 &                ' kchoix =-1 stretched --> geo ' )
          ELSE
             kchoix = nmem
@@ -340 +337 @@
          nmem = kchoix
       ELSE
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) 'repere : e r r o r  in kchoix : ', kchoix
-         IF(lwp) WRITE(numout,*) ' kchoix must be equal to -1, 0 or 1 '
-         nstop = nstop + 1
+         WRITE(ctmp1,*) 'repere : e r r o r  in kchoix : ', kchoix
+         CALL ctl_stop( ctmp1, ' kchoix must be equal to -1, 0 or 1 ' )
       ENDIF