From b6ec18ea2b046384d5e82337cedae1dceed61526 Mon Sep 17 00:00:00 2001 From: Austin Blevins Date: Thu, 23 Feb 2023 11:54:45 -0500 Subject: [PATCH] fixed a bug with melt distribution syntax --- src/regolith/regolith_streamtube_head.f90 | 6 +++--- src/regolith/regolith_subpixel_streamtube.f90 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/regolith/regolith_streamtube_head.f90 b/src/regolith/regolith_streamtube_head.f90 index 83cff8df..57e57c4e 100644 --- a/src/regolith/regolith_streamtube_head.f90 +++ b/src/regolith/regolith_streamtube_head.f90 @@ -68,7 +68,7 @@ subroutine regolith_streamtube_head(user,surfi,deltar,totmare,tots,age_collector age_collector(:) = age_collector(:) + current(M)%age(:) * recyratio headmeltvol = current(M)%meltfrac * vsgly * recyratio meltinejecta = meltinejecta + headmeltvol - distvol(:) = distvol + (current(M)%meltdist(:)*vsgly*recyratio) + distvol(:) = distvol(:) + (current(M)%meltdist(:)*vsgly*recyratio) totvol = totvol + vsgly else ! head is not intersected with layers. @@ -83,7 +83,7 @@ subroutine regolith_streamtube_head(user,surfi,deltar,totmare,tots,age_collector age_collector(:) = age_collector(:) + current(N)%age(:) * recyratio headmeltvol = current(N)%meltfrac * tothead * recyratio meltinejecta = meltinejecta + headmeltvol - distvol(:) = distvol + (current(N)%meltdist(:)*tothead*recyratio) + distvol(:) = distvol(:) + (current(N)%meltdist(:)*tothead*recyratio) totvol = totvol + tothead !current => current%next !N = N - 1 @@ -97,7 +97,7 @@ subroutine regolith_streamtube_head(user,surfi,deltar,totmare,tots,age_collector age_collector(:) = age_collector(:) + current(N)%age(:) * recyratio headmeltvol = current(N)%meltfrac * tothead*recyratio meltinejecta = meltinejecta + headmeltvol - distvol(:) = distvol + (current(N)%meltdist(:)*tothead*recyratio) + distvol(:) = distvol(:) + (current(N)%meltdist(:)*tothead*recyratio) totvol = totvol + tothead exit end if diff --git a/src/regolith/regolith_subpixel_streamtube.f90 b/src/regolith/regolith_subpixel_streamtube.f90 index 3d37d5e1..b8e16f16 100644 --- a/src/regolith/regolith_subpixel_streamtube.f90 +++ b/src/regolith/regolith_subpixel_streamtube.f90 @@ -114,7 +114,7 @@ subroutine regolith_subpixel_streamtube(user,surfi,deltar,ri,rip1,eradi,newlayer vsh = regolith_shock_damage(eradi,deltar,xmints,xsfints,0.0_DP,eradi) recyratio = max(vseg-vsh,0.0 )/ (user%pix**2) / (surfi%regolayer(M)%thickness) meltinejecta = surfi%regolayer(M)%meltfrac * vseg * recyratio - distvol = distvol + (surfi%regolayer(M)%meltdist(:)*vseg*recyratio) + distvol(:) = distvol(:) + (surfi%regolayer(M)%meltdist(:)*vseg*recyratio) totvol = vseg age_collector(:) = age_collector(:) + surfi%regolayer(M)%age(:) * recyratio vol = vol + sum(age_collector(:)) @@ -205,7 +205,7 @@ subroutine regolith_subpixel_streamtube(user,surfi,deltar,ri,rip1,eradi,newlayer !current => current%next meltinejecta = meltinejecta + mvl + mvr - distvol = distvol + (current(N)%meltdist(:)*((vsgly1*recyratio)+(vsgly2*recyratio2))) + distvol(:) = distvol(:) + (current(N)%meltdist(:)*((vsgly1*recyratio)+(vsgly2*recyratio2))) !distvol = distvol + (current(N)%meltdist(:)*(vsgly1+vsgly2)) totvol = totvol + vsgly1 + vsgly2 !N = N - 1