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

trunk/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -105 +105 @@
          ioptio = ioptio+1
       ENDIF
-      IF( ioptio == 0 .OR. ioptio > 1 .AND. .NOT. lk_esopa ) THEN
-          IF(lwp) WRITE(numout,cform_err)
-          IF(lwp) WRITE(numout,*) ' one and only one vertical diffusion option has to be defined '
-          nstop = nstop + 1
-      ENDIF
+      IF( ioptio == 0 .OR. ioptio > 1 .AND. .NOT. lk_esopa ) &
+         CALL ctl_stop( ' one and only one vertical diffusion option has to be defined ' )
 
       ! ... Convection
@@ -133 +130 @@
          ENDIF
       ENDIF
-      IF ( ioptio > 1 .AND. .NOT. lk_esopa ) THEN
-          IF(lwp) WRITE(numout,cform_err)
-          IF(lwp) WRITE(numout,*) ' chose between ln_zdfnpc'
-          IF(lwp) WRITE(numout,*) '           and ln_zdfevd'
-          nstop = nstop + 1
-      ENDIF
-      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfkpp ) ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' except for TKE sor KPP physics, a convection scheme is'
-         IF(lwp) WRITE(numout,*) ' required: ln_zdfevd or ln_zdfnpc logicals'
-         nstop = nstop + 1
-      ENDIF
+      IF ( ioptio > 1 .AND. .NOT. lk_esopa ) &
+           CALL ctl_stop( ' chose between ln_zdfnpc', '           and ln_zdfevd' )
+      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfkpp ) ) &
+         CALL ctl_stop( ' except for TKE sor KPP physics, a convection scheme is', &
+         &              ' required: ln_zdfevd or ln_zdfnpc logicals' )
 
    END SUBROUTINE zdf_init