From 3a153f2846e360af0ce929f5625d098e1563ea9c Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Fri, 23 Jul 2021 15:03:57 -0400
Subject: [PATCH] Fixed merged files

---
 src/io/io_write_tally.f90                       |   6 +++---
 .../.regolith_streamtube_volume_func.f90.swp    | Bin 12288 -> 0 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 src/regolith/.regolith_streamtube_volume_func.f90.swp

diff --git a/src/io/io_write_tally.f90 b/src/io/io_write_tally.f90
index 64dff416..a8df6774 100644
--- 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
deleted file mode 100644
index 7521f00f6821d3ca6d123bdab8e01a4a5c014b8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2J#QRE7{|v@00sjB(oj7%Qhay1cRO}+l1Uu<fRp00l{+I`o#uAu&O`Qg*R!)W
z4h1crfC^DSgG51r5DgM71SATeqoWBQfR}=T|LpGh-6Rqy2s9)AZg=P9d7k<2GqZ)K
zUwyT;MvLWnhVnFc?(?k+I}^L#UtnxI=KgSgF=;Z*=M^O#Q5uM9y{sJWl*3rLu_y~S
zJ~5yYIf`p%yJ7}Zwku=%m6dLDtrEqdP;MnsPDP1f;7N^+*-bCfO7M}6`=YlSc=1T|
z2C?sy2Un^meAq{;fK}iO1!6rYU7lid^;)uIUYMDtXP?<Tqob{|3RnfK0#*U5fK|XM
zU=^?mSOxyC3g~cxy@km=luhtjcAYqJ%^vN=Dqt0`3RnfK0#*U5fK|XMU=^?mSOu&C
zR)PPZ0^DV+_6TEZk0N;d|NmMxhi{)^>`O2Leb5D0K_1M4-=AdcS8x~n1l|K%U=y^!
zRq)3YV_$)HK?h8NZ=PW64)_9m1U>{GfcL=ym<JDopC4!JJMby^1nhtjxCQ#44Q_zz
z;CV0wCc$r$jQs-M21{TT{P-ASUxPc~9k2)1K@QA<yO{gO;7xEF7%gsq>tGT50DV3K
zwpazM0#*U5fK}jMRzUbJnG<kY20ooSCHL2@$Is9)M&rW!QBHF|*RKf0T}cH}GLOa*
zjjQr$U7j8BaCj>YZ_kSApYS^lmClMatmRL|n$}%p7>I*|v_#c%{Ss!e(ZWy86`tm*
zP^g=U<#=|J&b~r@R2n~YF%bzT5WU>$M!rZPS9~P2P(+Oex-C(yT&vG5TsCgb>&6r3
zSLPPxFD)MJharar<`5=B#i1GLYvJph^z+7B8gdb@#t_zuSxpk69EF~Aq$WS`g|QMx
zf<}QGd!jeak|H%<TWM}|d)-%Bo!)x8NlP!DPN5So>$s_*7xcLovGX(V`0!k!Xb~YN
z5vNng!)X+II)@48*>vH-6*kSLiQ0h{5$0t|g9ufo_MoH>%W8<jroN8QC5qJ`ZN_Uz
zp132DLF=&&W6ct?L`TOYcB$nbG#j(40taDbn5^9ft#HqYJ+1}mZDHO%98xeKPLUWI
z-{v7b|4QZnZ0hC)j^@UEC`>>NdMQv^ai8kd>YVYgp@P?iqfH}P&GA}OyXhk{y8EFS
z)Hv8a4qDpC>7-?xDd(KJWtis!d|8Pz1Zm>Lg7n3n$M?<BE0xl^W9k<uUA^dQI&>ka
z^nG+UI~w=Ml@Yc$yth>0<XCYgYhvCcs2Q7#UZya>>O0kUHli?9*lfS}GpS*cVW^~=
z#i?X!=5HHHS4$R=nNK8dpBugjBz26*FVj%&3ZFvxhVW>hg3(!lVvB&7N9>!5k}C$%
z7cT8`C3)Y&N=e3>6qP2MX&}8c`N!E!%Qs)%Tx+(w9iu>^Lg1HaIYK7$Y^@h*5Ah4L
ze`**<Izrxnkh#)#MTqZ*$@lTLQcjF?w<Vm9zje4re27b^eS{=-VvO+iNe*bn4NT@@
zAvm{Y2px5-FonbjepZ{Em7A@NZfm{G(v_O6wWWLQemQJUiIu|1z4UnPcw01ynnaCA
qBXsF(wbwT~twfi5`7%j+UpoS}hr{GGa+~FwF3bTw-1m8cp8W|K2FFAI