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

trunk/NEMO/OPA_SRC/TRA/traldf.F90

@@ -168 +168 @@
       IF( ln_traldf_lap   )   ioptio = ioptio + 1
       IF( ln_traldf_bilap )   ioptio = ioptio + 1
-      IF( ioptio /= 1 )   THEN
-          IF(lwp) WRITE(numout,cform_err)
-          IF(lwp) WRITE(numout,*) '          use ONE of the 2 lap/bilap operator type on tracer'
-          nstop = nstop + 1
-      ENDIF
+      IF( ioptio /= 1 ) CALL ctl_stop( '          use ONE of the 2 lap/bilap operator type on tracer' )
       ioptio = 0
       IF( ln_traldf_level )   ioptio = ioptio + 1
       IF( ln_traldf_hor   )   ioptio = ioptio + 1
       IF( ln_traldf_iso   )   ioptio = ioptio + 1
-      IF( ioptio /= 1 ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '          use only ONE direction (level/hor/iso)'
-         nstop = nstop + 1
-      ENDIF
+      IF( ioptio /= 1 ) CALL ctl_stop( '          use only ONE direction (level/hor/iso)' )
 
       ! defined the type of lateral diffusion from ln_traldf_... logicals
@@ -221 +213 @@
       ENDIF
 
-      IF( ierr == 1 ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' iso-level in z-coordinate - partial step, not allowed'
-         nstop = nstop + 1
-      ENDIF
-      IF( ierr == 2 ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' isoneutral bilaplacian operator does not exist'
-         nstop = nstop + 1
-      ENDIF
-      IF( lk_traldf_eiv .AND. .NOT.ln_traldf_iso ) THEN
-         IF(lwp) WRITE(numout,*) '          eddy induced velocity on tracers'
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' the eddy induced velocity on tracers requires isopycnal laplacian diffusion'
-         nstop = nstop + 1
-      ENDIF
+      IF( ierr == 1 ) CALL ctl_stop( ' iso-level in z-coordinate - partial step, not allowed' )
+      IF( ierr == 2 ) CALL ctl_stop( ' isoneutral bilaplacian operator does not exist' )
+      IF( lk_traldf_eiv .AND. .NOT.ln_traldf_iso ) &
+           & CALL ctl_stop( '          eddy induced velocity on tracers', &
+           &                ' the eddy induced velocity on tracers requires isopycnal laplacian diffusion' )
       IF( nldf == 1 .OR. nldf == 3 ) THEN      ! rotation
-         IF( .NOT.lk_ldfslp ) THEN
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) '          the rotation of the diffusive tensor require key_ldfslp'
-            nstop = nstop + 1
-         ENDIF
+         IF( .NOT.lk_ldfslp ) CALL ctl_stop( '          the rotation of the diffusive tensor require key_ldfslp' )
       ENDIF
 
@@ -320 +297 @@
       va    (:,:,:) = sa (:,:,:)
       zavt  (:,:,:) = avt(:,:,:)
-      IF( lk_zdfddm ) THEN
-          IF(lwp) WRITE(numout,cform_err)
-          IF(lwp) WRITE(numout,*) ' key_traldf_ano with key_zdfddm not implemented'
-          nstop = nstop + 1
-      ENDIF
+      IF( lk_zdfddm ) THEN CALL ctl_stop( ' key_traldf_ano with key_zdfddm not implemented' )
       ! set tb, sb to reference values and avr to zero
       tb (:,:,:) = zt_ref(:,:,:)