Fixed merged files

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

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/io/io_write_tally.f90 b/src/io/io_write_tally.f90
@@ -42,7 +42,7 @@ subroutine io_write_tally(tdist,tlist,odist,olist,oposlist,depthdiam)
    distl = size(tdist,2)
    allocate(oldtdist(distc,distl))
 1000 format(3F16.4,2F15.0,F15.6)
-2000 format(ES23.15,1X,6(ES14.6,1X,:))
+2000 format(ES23.15,1X,7(ES14.6,1X,:))
    oldtdist = 0._DP
 
    inquire(file=tdistfile, exist=file_exists)
@@ -74,7 +74,7 @@ subroutine io_write_tally(tdist,tlist,odist,olist,oposlist,depthdiam)
    close(LUN)
 
    open(LUN, FILE=OLISTFILE, status='REPLACE')
-   write(LUN,'("#Dcrat(m)                 xpos(m)        ypos(m)        depth/diam")'  )
+   write(LUN,'("#Dcrat(m)                 xpos(m)        ypos(m)        time(y)        depth/diam")'  )
    do i=1,onum
 
       write(LUN,2000) olist(i),oposlist(:,i),depthdiam(i)
@@ -83,7 +83,7 @@ subroutine io_write_tally(tdist,tlist,odist,olist,oposlist,depthdiam)
 
 
    open(LUN, FILE=TLISTFILE, status='REPLACE')
-   write(LUN,'("#Dcrat(m)                 Dimp(m)        xpos(m)        ypos(m)        vimp(m/s)      sinang")')
+   write(LUN,'("#Dcrat(m)                 Dimp(m)        xpos(m)        ypos(m)        vimp(m/s)      sinang         time(y)")')
    do i=1,size(tlist,2)
       write(LUN,2000) tlist(:,i)
    end do

diff --git a/src/regolith/.regolith_streamtube_volume_func.f90.swp b/src/regolith/.regolith_streamtube_volume_func.f90.swp