Changeset 4932 for branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2014-12-01T11:08:54+01:00 (10 years ago)

Author:

acc

Message:

Branch dev_r4879_UKMO_NOC_MERGE, Check in merged UKMO_OBSASM branch; all conflicts resolved

File:

• branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (1 diff)

branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -483 +483 @@
       CALL obs_grid_setup( )
       IF ( ( n1dint < 0 ).OR.( n1dint > 1 ) ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' Choice of vertical (1D) interpolation method', &
-            &                    ' is not available'
-         nstop = nstop + 1
+         CALL ctl_stop(' Choice of vertical (1D) interpolation method', &
+            &                    ' is not available')
       ENDIF
       IF ( ( n2dint < 0 ).OR.( n2dint > 4 ) ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' Choice of horizontal (2D) interpolation method', &
-            &                    ' is not available'
-         nstop = nstop + 1
+         CALL ctl_stop(' Choice of horizontal (2D) interpolation method', &
+            &                    ' is not available')
       ENDIF