From a735a7d5026c5aa827ab89bdb446f2f083991187 Mon Sep 17 00:00:00 2001 From: David Minton Date: Fri, 23 Jul 2021 15:00:07 -0400 Subject: [PATCH] Fixed merge --- src/io/io_read_surf.f90 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/io/io_read_surf.f90 b/src/io/io_read_surf.f90 index 85fb3e32..ec09a37e 100644 --- a/src/io/io_read_surf.f90 +++ b/src/io/io_read_surf.f90 @@ -48,6 +48,7 @@ subroutine io_read_surf(user,surf) read(LUN,rec=1) surf%dem close(LUN) + open(LUN,file=EJCOVFILE,status='old',form='unformatted',recl=recsize,access='direct',iostat=ioerr) if (ioerr/=0) then write(*,*) 'Error! Cannot read file ',trim(adjustl(EJCOVFILE)) @@ -66,6 +67,17 @@ subroutine io_read_surf(user,surf) end do close(LUN) + open(LUN,file=TIMEFILE,status='old',form='unformatted',recl=recsize,access='direct',iostat=ioerr) + if (ioerr/=0) then + write(*,*) 'Error! Cannot read file ',trim(adjustl(DIAMFILE)) + stop + end if + do i=1,user%numlayers + read(LUN,rec=i) surf%timestamp(i) + end do + close(LUN) + + recsize = sizeof(stmp) * user%gridsize * user%gridsize open(LUN,file=POSFILE,status='old',form='unformatted',recl=recsize,access='direct',iostat=ioerr) if (ioerr/=0) then @@ -79,7 +91,7 @@ subroutine io_read_surf(user,surf) close(LUN) if (user%doregotrack) call io_read_regotrack(user,surf) - + !if (user%docrustal_thinning) then ! recsize=sizeof(itmp)*user%gridsize*user%gridsize ! open(LUN,file=THICKFILE,status='old',form='unformatted',recl=recsize,access='direct',iostat=ioerr)