WebSVN – lagranto.ecmwf – Diff – /trunk/lib/iotra.f

 c     Auxiliary variables
       integer      i,j,n
       real         arr(ntra)
       integer      ntimes
-      real         times(1000)
+      real         times(10000)
       integer      ierr
       character*80 vars(ncol+2)
       integer      nvars
 c     Read ascii mode, sorted by trajectory (mode=1)
          write(fid,*)
 c        Write variable names
          str=''
          do i=1,ncol
+            varname = vars(i)
+            vars(i) = varname(1:9)
-            str=trim(str)//trim(vars(i))
+            str     = trim(str)//trim(vars(i))
          enddo
          write(fid,'(a6,a9,a8,a6,100a10)') (trim(vars(i)),i=1,ncol)
          write(fid,'(a6,a9,a8,a6,100a10)')
      >              '------','---------','--------','------',
      >              ('----------',i=5,ncol)
       character*500 str
       integer       nline0,nline1,nline2
       integer       isstr,isok
       character     ch
       character*80  vars(200)
+      integer       ios
 c     Open file
       if (mode.eq.1) then
          fid=10
          open(fid,file=filename)
          ntim = 0
 c        Get the first data block
          nline0  = 5
          nline1  = 5
-         read(fid,*,end=140)
+         read(fid,*,end=140,iostat=ios)
-read(fid,'(a500)',end=110) str
+read(fid,'(a500)',end=110,iostat=ios) str
          if (str.ne.'') then
             nline1 = nline1 + 1
             goto 100
          endif
 continue
 c        Get the total numbers of lines in the data block
          nline2 = nline1
+         if ( ios.eq.0 ) then
 read(fid,*,end=130)
-         nline2 = nline2 + 1
+            nline2 = nline2 + 1
-         goto 120
+            goto 120
 nline2 = nline2 + 1
+         endif
 c        Set the dimensions
          if (mode.eq.1) then
             ntim = nline1 - nline0
             ntra = (nline2-nline0+1)/(ntim+1)

Subversion Repositories lagranto.ecmwf

(root)/trunk/lib/iotra.f @ 39 – Rev 13 → 15