Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
writing melt volume instead of fraction works now
  • Loading branch information
Austin Blevins committed Feb 23, 2023
1 parent 1c768a5 commit 0a64f69
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/init/init_regolith_stack.f90
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ subroutine init_regolith_stack(user,surf,domain)
bedrock%comp = 0._DP
bedrock%age(:) = 0.0_SP
allocate(bedrock%meltdist(domain%rcnum))
allocate(bedrock%distvol(domain%rcnum))
bedrock%meltdist(:) = 0.0_SP
bedrock%distvol(:) = 0.0_SP

do yp = 1, user%gridsize
do xp = 1, user%gridsize
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_write_regotrack.f90
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ subroutine io_write_regotrack(user,surf,domain)
write(FMD) distvol(:,:)
write(FEJM) ejm(:)
!write(FEJMF) ejmf(:)
deallocate(meltfrac,thickness,comp,age,distvol,ejm,ejmf)
deallocate(meltvolume,thickness,comp,age,distvol,ejm,ejmf)
end do
end do
close(FMELT)
Expand Down
2 changes: 2 additions & 0 deletions src/regolith/regolith_interior.f90
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ subroutine regolith_interior(user,surf,crater,domain,incval,nmeltsheet,vmeltshee

hmeltsheet = vmeltsheet / (nmeltsheet*user%pix*user%pix)
allocate(newlayer%meltdist(domain%rcnum))
allocate(newlayer%distvol(domain%rcnum))

inc = incval

Expand Down Expand Up @@ -80,6 +81,7 @@ subroutine regolith_interior(user,surf,crater,domain,incval,nmeltsheet,vmeltshee
end do

deallocate(newlayer%meltdist)
deallocate(newlayer%distvol)

return
end subroutine regolith_interior
Expand Down
4 changes: 4 additions & 0 deletions src/regolith/regolith_mix.f90
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ subroutine regolith_mix(surfi,mixing_depth,domain)
newlayer%meltfrac = 0.0_DP
newlayer%age(:) = 0.0_DP
allocate(newlayer%meltdist(domain%rcnum))
allocate(newlayer%distvol(domain%rcnum))
newlayer%meltdist(:) = 0.0_SP
newlayer%distvol(:) = 0.0_SP
newlayer%ejm = 0.0_DP
newlayer%ejmf = 0.0_DP

Expand All @@ -60,6 +62,7 @@ subroutine regolith_mix(surfi,mixing_depth,domain)
newlayer%meltfrac = newlayer%meltfrac + poppedarray(i)%thickness * poppedarray(i)%meltfrac
newlayer%age(:) = newlayer%age(:) + poppedarray(i)%age(:)
newlayer%meltdist(:) = newlayer%meltdist(:) + poppedarray(i)%thickness * poppedarray(i)%meltdist(:)
newlayer%distvol(:) = newlayer%distvol(:) + poppedarray(i)%thickness * poppedarray(i)%distvol(:)
newlayer%ejm = newlayer%ejm + poppedarray(i)%thickness * poppedarray(i)%ejm
newlayer%ejmf = newlayer%ejmf + poppedarray(i)%thickness * poppedarray(i)%ejmf
end do
Expand All @@ -68,6 +71,7 @@ subroutine regolith_mix(surfi,mixing_depth,domain)
newlayer%comp = newlayer%comp / newlayer%thickness
newlayer%meltfrac = newlayer%meltfrac / newlayer%thickness
newlayer%meltdist(:) = newlayer%meltdist(:) / newlayer%thickness
newlayer%distvol(:) = newlayer%distvol(:) / newlayer%thickness
newlayer%ejm = newlayer%ejm / newlayer%thickness
newlayer%ejmf = newlayer%ejmf / newlayer%thickness

Expand Down
4 changes: 4 additions & 0 deletions src/util/util_init_array.f90
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ subroutine util_init_array(regolayer,domain,initstat)
regolayer(1)%meltfrac = 0.0_DP
regolayer(1)%porosity = 0.0_DP
regolayer(1)%age(:) = 0.0_SP
regolayer(1)%ejm = 0.0_DP
regolayer(1)%ejmf = 0.0_DP
allocate(regolayer(1)%meltdist(domain%rcnum))
regolayer(1)%meltdist(:) = 0.0_SP
allocate(regolayer(1)%distvol(domain%rcnum))
regolayer(1)%distvol(:) = 0.0_SP
end if
! else
! write(*,*) 'util_init_list: Initialization failed. Exhausted memory.'
Expand Down

0 comments on commit 0a64f69

Please sign in to comment.