From 6766f771624d8f513125ec3c62bba23d159abe2e Mon Sep 17 00:00:00 2001 From: Austin Blevins Date: Thu, 2 Mar 2023 11:45:20 -0500 Subject: [PATCH] fixed bugs causing nan's --- src/regolith/regolith_streamtube_lineseg.f90 | 1 + src/regolith/regolith_subpixel_streamtube.f90 | 2 ++ src/regolith/regolith_traverse_streamtube.f90 | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/regolith/regolith_streamtube_lineseg.f90 b/src/regolith/regolith_streamtube_lineseg.f90 index e8e673ba..03ad8b1e 100644 --- a/src/regolith/regolith_streamtube_lineseg.f90 +++ b/src/regolith/regolith_streamtube_lineseg.f90 @@ -65,6 +65,7 @@ subroutine regolith_streamtube_lineseg(user,surfi,thetast,ri,rip1,zmin,zmax,erad end if vol = 0.0_DP + vsh = 0.0_DP do N=M,2,-1 diff --git a/src/regolith/regolith_subpixel_streamtube.f90 b/src/regolith/regolith_subpixel_streamtube.f90 index ec82b36b..84317355 100644 --- a/src/regolith/regolith_subpixel_streamtube.f90 +++ b/src/regolith/regolith_subpixel_streamtube.f90 @@ -104,6 +104,8 @@ subroutine regolith_subpixel_streamtube(user,surfi,deltar,ri,rip1,eradi,newlayer mvl = 0.0_DP mvr = 0.0_DP recyratio2 = 0.0_DP + vsh = 0.0_DP + vsh2 = 0.0_DP ! Two cases: subpixel is inside the first layer, and its volume is simply the landing ejecta blanket. if (zend>=zmax) then diff --git a/src/regolith/regolith_traverse_streamtube.f90 b/src/regolith/regolith_traverse_streamtube.f90 index 31e13150..d62af82c 100644 --- a/src/regolith/regolith_traverse_streamtube.f90 +++ b/src/regolith/regolith_traverse_streamtube.f90 @@ -54,6 +54,8 @@ subroutine regolith_traverse_streamtube(user,surfi,deltar,ri,rip1,eradi,erado,ne !executable code + vsh = 0.0_DP + erad = (eradi + erado)/2.0 rzmax = erad * sqrt(3.0)/4.0 if (ri .eq. 0) then