Changeset 5837 for branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2015-10-26T15:59:39+01:00 (9 years ago)

Author:

timgraham

Message:

Upgraded to r5518 of trunk (NEMO 3.6 stable)

File:

• branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (2 diffs)

branches/2014/dev_r4650_UKMO14.4_OBS_GENERAL_VINTERP/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -234 +234 @@
       ln_profb_enatim(:) = .TRUE.
       ln_velfb_av(:) = .FALSE.
-      ln_ignmis = .FALSE.      
+      ln_ignmis = .FALSE.
+
       CALL ini_date( dobsini )
       CALL fin_date( dobsend )
@@ -485 +486 @@
       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