Changeset 474 for trunk/NEMO/OPA_SRC/TRA/traadv_ctl.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/TRA/traadv_ctl.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/TRA/traadv_ctl.F90

@@ -85 +85 @@
          ln_traadv_muscl2 = .TRUE.
       ELSEIF( ioptio > 1 .OR. ioptio == 0 ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' Choose one advection scheme in namelist nam_traadv'
-         IF(lwp) WRITE(numout,*) '        ***                              ***********'
-         nstop = nstop + 1
+         CALL ctl_stop( ' Choose one advection scheme in namelist nam_traadv', &
+              &         '        ***                              ***********' )
       ENDIF
 
-      IF( n_cla == 1 .AND. .NOT. ln_traadv_cen2 ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '     cross-land advection only with 2nd order advection scheme'
-         nstop = nstop + 1
-      ENDIF
+      IF( n_cla == 1 .AND. .NOT. ln_traadv_cen2 ) &
+           &   CALL ctl_stop( '     cross-land advection only with 2nd order advection scheme' )
 
    END SUBROUTINE tra_adv_ctl