From e3823decffc9664cb274b1a9654e20d4ac9a6f44 Mon Sep 17 00:00:00 2001 From: huang474 Date: Tue, 24 Jan 2017 22:33:12 +0000 Subject: [PATCH] Updated module_regolith.90. --- src/regolith/module_regolith.f90 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/regolith/module_regolith.f90 b/src/regolith/module_regolith.f90 index 99160783..516623bb 100644 --- a/src/regolith/module_regolith.f90 +++ b/src/regolith/module_regolith.f90 @@ -87,55 +87,53 @@ subroutine regolith_streamtube(user,surf,crater,domain,ejb,ejtble,xp,yp,xpi,ypi, type(ejbtype),dimension(ejtble),intent(in) :: ejb real(DP),intent(in) :: xp,yp,lrad,ebh integer(I4B),intent(in) :: xpi,ypi - real(DP),intent(in) :: rm + real(DP),intent(in) :: rm end subroutine regolith_streamtube end interface interface - subroutine regolith_traverse_streamtube(user,surfi,deltar,ri,rip1,eradi,erado,newlayer,vmare,totseb) + subroutine regolith_traverse_streamtube(user,surfi,deltar,ri,rip1,eradi,erado,vseg,newlayer,rm) use module_globals implicit none type(usertype),intent(in) :: user type(surftype),intent(inout) :: surfi - real(DP),intent(in) :: deltar,ri,rip1,eradi,erado + real(DP),intent(in) :: deltar,ri,rip1,eradi,erado,vseg,rm type(regodatatype),intent(inout) :: newlayer - real(DP),intent(out) :: vmare,totseb end subroutine regolith_traverse_streamtube end interface interface - subroutine regolith_subpixel_streamtube(user,surfi,deltar,ri,rip1,eradi,newlayer,vmare,totseb) + subroutine regolith_subpixel_streamtube(user,surfi,deltar,ri,rip1,eradi,vseg,newlayer,rm) use module_globals implicit none type(usertype),intent(in) :: user type(surftype),intent(inout) :: surfi - real(DP),intent(in) :: deltar,ri,rip1,eradi + real(DP),intent(in) :: deltar,ri,rip1,eradi,vseg type(regodatatype),intent(inout) :: newlayer - real(DP),intent(out) :: vmare,totseb + real(DP),intent(in) :: rm end subroutine regolith_subpixel_streamtube end interface interface - subroutine regolith_streamtube_lineseg(user,surfi,thetast,ri,rip1,zmin,zmax,erad,eradi,deltar,newlayer,vmare,& - totseb) + subroutine regolith_streamtube_lineseg(user,surfi,thetast,ri,rip1,zmin,zmax,erad,eradi,deltar,vseg,newlayer,rm) use module_globals implicit none type(usertype),intent(in) :: user type(surftype),intent(in) :: surfi - real(DP),intent(in) :: thetast,ri,rip1,zmin,zmax,erad,eradi,deltar + real(DP),intent(in) :: thetast,ri,rip1,zmin,zmax,erad,eradi,deltar,vseg,rm type(regodatatype),intent(inout) :: newlayer - real(DP),intent(inout) :: vmare,totseb end subroutine regolith_streamtube_lineseg end interface interface - subroutine regolith_streamtube_head(user,surfi,deltar,totmare,tots) + subroutine regolith_streamtube_head(user,surfi,deltar,newlayer,eradi,rm) use module_globals implicit none type(usertype),intent(in) :: user type(surftype),intent(in) :: surfi real(DP),intent(in) :: deltar - real(DP),intent(inout) :: totmare,tots + type(regodatatype),intent(inout) :: newlayer + real(DP),intent(in) :: eradi,rm end subroutine regolith_streamtube_head end interface