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

trunk/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -168 +168 @@
       IF(lk_dynspg_rl )   ioptio = ioptio + 1
 
-      IF( ( ioptio > 1 .AND. .NOT. lk_esopa ) .OR. ioptio == 0 ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' Choose only one surface pressure gradient scheme with a key cpp'
-         nstop = nstop + 1
-      ENDIF
+      IF( ( ioptio > 1 .AND. .NOT. lk_esopa ) .OR. ioptio == 0 )   &
+           &   CALL ctl_stop( ' Choose only one surface pressure gradient scheme with a key cpp' )
 
       IF( lk_esopa     )   nspg = -1
@@ -199 +196 @@
       ! --------------------------
       IF( lk_dynspg_ts ) THEN
-         IF( MOD( rdt , rdtbt ) /= 0. ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' The barotropic timestep must be an integer divisor of the baroclinic timestep'
-            nstop = nstop + 1
-         ENDIF
+         IF( MOD( rdt , rdtbt ) /= 0. )   &
+           &   CALL ctl_stop( ' The barotropic timestep must be an integer divisor of the baroclinic timestep' )
       ENDIF