Changeset 5581 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90

Timestamp:

2015-07-10T13:28:53+02:00 (9 years ago)

Author:

timgraham

Message:

Merged head of trunk into branch

File:

• branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) (6 diffs)

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90

@@ -128 +128 @@
          & zphi, &
          & zlam
-      REAL(dp), DIMENSION(:), ALLOCATABLE :: &
+      real(wp), DIMENSION(:), ALLOCATABLE :: &
          & zdat
       LOGICAL :: llvalprof
       TYPE(obfbdata), POINTER, DIMENSION(:) :: &
          & inpfiles
-      REAL(dp), DIMENSION(knumfiles) :: &
+      real(wp), DIMENSION(knumfiles) :: &
          & djulini, &
          & djulend
@@ -143 +143 @@
       INTEGER :: is3dt
       INTEGER :: ip3dt
+      INTEGER :: ios
+      INTEGER :: ioserrcount
       INTEGER, DIMENSION(kvars) :: &
          & iv3dt
@@ -280 +282 @@
                &           krefdate = irefdate(jj) )
 
+            ioserrcount=0
             IF ( ldavtimset ) THEN
                DO ji = 1, inpfiles(jj)%nobs
@@ -287 +290 @@
                   !  to be the  end of the day
                   !
-                  READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype
+                  READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 900 ) itype
+900               IF ( ios /= 0 ) THEN
+                     itype = 0         ! Set type to zero if there is a problem in the string conversion
+                  ENDIF
                   IF ( ANY (idailyavtypes == itype ) ) THEN
                      inpfiles(jj)%ptim(ji) = &
@@ -468 +474 @@
       itypsmpp(:) = 0
       
-      
+      ioserrcount = 0      
       DO jk = 1, iproftot
          
@@ -552 +558 @@
                
                ! 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