Fixed more merge problems

MintonGroup · Jul 23, 2021 · 15ae06a · 15ae06a
1 parent a735a7d
commit 15ae06a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/src/io/io_read_surf.f90 b/src/io/io_read_surf.f90
@@ -77,7 +77,6 @@ subroutine io_read_surf(user,surf)
    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

diff --git a/src/io/io_updatePbar.f90 b/src/io/io_updatePbar.f90
@@ -39,20 +39,20 @@ subroutine io_updatePbar(message)
 perc=floor(100*real(pbarpos)/real(PBARRES))
 write(unit=bar(1:3),fmt="(i3)") perc
 endpoint = min(ceiling(real(pbarpos*PBARSIZE)/real(PBARRES)),PBARSIZE)
-do k = 1,endpoint - 1 
+do k = 1,endpoint !- 1 
    bar(6+k:6+k)=pbarchar(k:k)
 end do
-select case(flip)
-case(1)
-   bar(6+endpoint:6+endpoint)="/"
-case(2)
-   bar(6+endpoint:6+endpoint)="-"
-case(3)
-   bar(6+endpoint:6+endpoint)="\"
-case(4)
-   bar(6+endpoint:6+endpoint)="|"
-end select
-flip = flip + 1
+!select case(flip)
+!case(1)
+!   bar(6+endpoint:6+endpoint)="/"
+!case(2)
+!   bar(6+endpoint:6+endpoint)="-"
+!case(3)
+!   bar(6+endpoint:6+endpoint)="\"
+!case(4)
+!   bar(6+endpoint:6+endpoint)="|"
+!end select
+!flip = flip + 1
 if (flip > 4) flip = 1
 ! print the progress bar.  
 write(fmtlabel,'("(A1,A",I2.2,",1X,A",I2.2,",$)")') PBARSIZE+7,MESSAGESIZE

diff --git a/src/io/io_write_surf.f90 b/src/io/io_write_surf.f90
@@ -53,6 +53,12 @@ subroutine io_write_surf(user,surf)
    end do
    close(LUN)
 
+   open(LUN,file=TIMEFILE,status='replace',form='unformatted',recl=recsize,access='direct')
+   do i=1,user%numlayers 
+      write(LUN,rec=i) surf%timestamp(i)
+   end do
+   close(LUN)
+
    recsize = sizeof(stmp) * user%gridsize * user%gridsize
    open(LUN,file=POSFILE,status='replace',form='unformatted',recl=recsize,access='direct')
    do i=1,user%numlayers 
@@ -61,10 +67,8 @@ subroutine io_write_surf(user,surf)
    end do
    close(LUN)
 
-   if (user%doregotrack) then
-      !call io_write_regodist(user,surf)
-      call io_write_regotrack(user,surf) 
-   end if
+   if (user%doregotrack) call io_write_regotrack(user,surf) 
+
 !   if (user%docrustal_thinning) then
 !      recsize = sizeof(itmp) * user%gridsize * user%gridsize
 !      open(LUN,file=THICKFILE,status='replace',form='unformatted',recl=recsize,access='direct')