Changeset 4932 for branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.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/obs_read_vel.F90 (modified) (2 diffs)

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

@@ -130 +130 @@
       INTEGER :: iproftot
       INTEGER :: iuv3dt
+      INTEGER :: ios
+      INTEGER :: ioserrcount
       INTEGER, DIMENSION(kvars) :: iv3dt
       CHARACTER(len=8) :: cl_refdate
@@ -459 +461 @@
                
                ! Instrument type
-               READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype
+               READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 901 ) itype
+901            IF ( ios /= 0 ) THEN
+                  IF (ioserrcount == 0) CALL ctl_warn ( 'Problem converting an instrument type to integer. Setting type to zero' ) 
+                  ioserrcount = ioserrcount + 1
+                  itype = 0
+               ENDIF
                profdata%ntyp(iprof) = itype