Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed a bug where volumes weren't calculating correctly in the melt zone
  • Loading branch information
Austin Blevins committed Feb 8, 2023
1 parent e763d0d commit 279c84a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 3 additions & 1 deletion src/regolith/regolith_melt_glass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,10 @@ subroutine regolith_melt_glass(user,crater,domain,age,age_resolution,ebh,rm,erad
volm1 = vst - volv1
melt = volm1
newlayer%meltvolume = melt
newlayer%totvolume = melt
newlayer%totvolume = volm1
newlayer%meltfrac = 1.0
newlayer%ejm = melt
newlayer%ejmf = 1.0
xmints = rints
else if (eradi > rints) then
depthb = crater%imp / 2.0
Expand Down
9 changes: 4 additions & 5 deletions src/regolith/regolith_streamtube.f90
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ subroutine regolith_streamtube(user,surf,crater,domain,ejb,ejtble,xp,yp,xpi,ypi,

! Executalbe code

meltinejecta = 0.0_DP
totvol = 0.0_DP

! ****** Interpolate radial distance, erad, for a given pixel *******
! outeredge = crater%frad + domain%ejbres * (EJBTABSIZE - 0.5_DP)
! inneredge = crater%frad + 0.5_DP * domain%ejbres
Expand Down Expand Up @@ -239,6 +236,8 @@ subroutine regolith_streamtube(user,surf,crater,domain,ejb,ejtble,xp,yp,xpi,ypi,
totmare = 0.0_DP
tots = 0.0_DP
depthb = crater%imp / 2.0_DP
meltinejecta = 0.0_DP
totvol = 0.0_DP

! if (eradc<=user%testimp) then
! write(*,*) lrad/crater%frad, user%testimp, crater%frad, rm, deltar, eradc, eradi, erado, ebh, newlayer%meltfrac
Expand Down Expand Up @@ -271,7 +270,7 @@ subroutine regolith_streamtube(user,surf,crater,domain,ejb,ejtble,xp,yp,xpi,ypi,
newlayer%meltvolume = newlayer%meltvolume + meltinejecta
newlayer%meltfrac = newlayer%meltvolume / newlayer%totvolume
if (newlayer%meltfrac > 1.0_DP) then
write(*,*) "Melt fraction >1!", xpi,ypi,crater%timestamp,crater%fcrat,crater%xlpx,crater%ylpx,&
write(*,*) "Melt fraction >1! (Subpixel)", xpi,ypi,crater%timestamp,crater%fcrat,crater%xlpx,crater%ylpx,&
newlayer%meltvolume, newlayer%totvolume, newlayer%ejm, newlayer%ejmf, totvol
end if

Expand Down Expand Up @@ -321,7 +320,7 @@ subroutine regolith_streamtube(user,surf,crater,domain,ejb,ejtble,xp,yp,xpi,ypi,
newlayer%meltvolume = newlayer%meltvolume + meltinejecta
newlayer%meltfrac = newlayer%meltvolume / newlayer%totvolume
if (newlayer%meltfrac > 1.0_DP) then
write(*,*) "Melt fraction >1!", xpi,ypi,crater%timestamp,crater%fcrat,crater%xlpx,crater%ylpx,&
write(*,*) "Melt fraction >1! (Traverse)", xpi,ypi,crater%timestamp,crater%fcrat,crater%xlpx,crater%ylpx,&
newlayer%meltvolume, newlayer%totvolume, newlayer%ejm, newlayer%ejmf, totvol
end if

Expand Down

0 comments on commit 279c84a

Please sign in to comment.