Fixed merge

MintonGroup · Jul 23, 2021 · a735a7d · a735a7d
1 parent d681cc4
commit a735a7d
Showing 1 changed file with 13 additions and 1 deletion.
diff --git 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)