Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history 
Committed changes from Ya-Huei's branch onto this one
  • Loading branch information
@daminton
daminton committed Jul 9, 2021
1 parent 988cfef commit b4f59d7
Show file tree
Hide file tree
Showing 85 changed files with 5,828 additions and 1,452 deletions.
16 changes: 12 additions & 4 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ io/io_get_token.f90\
io/io_input.f90\
io/io_read_prod.f90\
io/io_read_regotrack.f90\
io/io_read_porotrack.f90\
io/io_read_vdist.f90\
io/io_read_surf.f90\
io/io_ejecta_table.f90\
Expand All @@ -49,11 +48,13 @@ io/io_write_tally.f90\
io/io_write_surf.f90\
io/io_write_const.f90\
io/io_write_regotrack.f90\
io/io_write_porotrack.f90\
io/io_crater_profile.f90\
io/io_updatePbar.f90\
io/io_resetPbar.f90\
io/io_splash.f90\
io/io_write_age.f90\
io/io_write_pindex_map.f90\
io/io_write_age_depth.f90\
ejecta/ejecta_emplace.f90\
ejecta/ejecta_ray_pattern.f90\
ejecta/ejecta_blanket.f90\
Expand All @@ -72,20 +73,21 @@ crater/crater_averages.f90\
crater/crater_emplace.f90\
crater/crater_form_interior.f90\
crater/crater_form_exterior.f90\
crater/crater_form_exterior_func.f90\
crater/crater_form_exterior_rootfind.f90\
crater/crater_record.f90\
crater/crater_tally_true.f90\
crater/crater_tally_observed.f90\
crater/crater_slope_collapse.f90\
crater/crater_soften.f90\
crater/crater_soften_accumulate.f90\
crater/crater_subpixel_diffusion.f90\
crater/crater_make_list.f90\
crater/crater_critical_slope.f90\
crater/crater_superdomain.f90\
init/init_domain.f90\
init/init_dist.f90\
init/init_surf.f90\
init/init_regolith_stack.f90\
init/init_porosity_stack.f90\
seismic/seismic_shake.f90\
seismic/seismic_distance.f90\
seismic/seismic_kdiff_func.f90\
Expand All @@ -105,6 +107,12 @@ regolith/regolith_subpixel_streamtube.f90\
regolith/regolith_transport.f90\
regolith/regolith_traverse_streamtube.f90\
regolith/regolith_subcrater_mix.f90\
regolith/regolith_melt_glass.f90\
regolith/regolith_superdomain.f90\
regolith/regolith_melt_zone_superdomain.f90\
regolith/regolith_streamtube_volume_func.f90\
regolith/regolith_shock_damage_zone.f90\
regolith/regolith_shock_damage.f90\
porosity/porosity_form_interior.f90\
main/CTEM.f90
CLEANFILES = *.mod
92 changes: 61 additions & 31 deletions src/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -116,14 +116,16 @@ am_CTEM_OBJECTS = globals/module_globals.$(OBJEXT) \
util/util_destroy_list.$(OBJEXT) util/util_init_list.$(OBJEXT) \
io/io_read_const.$(OBJEXT) io/io_get_token.$(OBJEXT) \
io/io_input.$(OBJEXT) io/io_read_prod.$(OBJEXT) \
io/io_read_regotrack.$(OBJEXT) io/io_read_porotrack.$(OBJEXT) \
io/io_read_vdist.$(OBJEXT) io/io_read_surf.$(OBJEXT) \
io/io_ejecta_table.$(OBJEXT) io/io_write_dist.$(OBJEXT) \
io/io_write_tally.$(OBJEXT) io/io_write_surf.$(OBJEXT) \
io/io_write_const.$(OBJEXT) io/io_write_regotrack.$(OBJEXT) \
io/io_write_porotrack.$(OBJEXT) io/io_crater_profile.$(OBJEXT) \
io/io_read_regotrack.$(OBJEXT) io/io_read_vdist.$(OBJEXT) \
io/io_read_surf.$(OBJEXT) io/io_ejecta_table.$(OBJEXT) \
io/io_write_dist.$(OBJEXT) io/io_write_tally.$(OBJEXT) \
io/io_write_surf.$(OBJEXT) io/io_write_const.$(OBJEXT) \
io/io_write_regotrack.$(OBJEXT) io/io_crater_profile.$(OBJEXT) \
io/io_updatePbar.$(OBJEXT) io/io_resetPbar.$(OBJEXT) \
io/io_splash.$(OBJEXT) ejecta/ejecta_emplace.$(OBJEXT) \
io/io_splash.$(OBJEXT) io/io_write_age.$(OBJEXT) \
io/io_write_pindex_map.$(OBJEXT) \
io/io_write_age_depth.$(OBJEXT) \
ejecta/ejecta_emplace.$(OBJEXT) \
ejecta/ejecta_ray_pattern.$(OBJEXT) \
ejecta/ejecta_blanket.$(OBJEXT) \
ejecta/ejecta_blanket_func.$(OBJEXT) \
Expand All @@ -140,18 +142,19 @@ am_CTEM_OBJECTS = globals/module_globals.$(OBJEXT) \
crater/crater_emplace.$(OBJEXT) \
crater/crater_form_interior.$(OBJEXT) \
crater/crater_form_exterior.$(OBJEXT) \
crater/crater_form_exterior_func.$(OBJEXT) \
crater/crater_form_exterior_rootfind.$(OBJEXT) \
crater/crater_record.$(OBJEXT) \
crater/crater_tally_true.$(OBJEXT) \
crater/crater_tally_observed.$(OBJEXT) \
crater/crater_slope_collapse.$(OBJEXT) \
crater/crater_soften.$(OBJEXT) \
crater/crater_soften_accumulate.$(OBJEXT) \
crater/crater_subpixel_diffusion.$(OBJEXT) \
crater/crater_make_list.$(OBJEXT) \
crater/crater_critical_slope.$(OBJEXT) \
init/init_domain.$(OBJEXT) init/init_dist.$(OBJEXT) \
init/init_surf.$(OBJEXT) init/init_regolith_stack.$(OBJEXT) \
init/init_porosity_stack.$(OBJEXT) \
crater/crater_superdomain.$(OBJEXT) init/init_domain.$(OBJEXT) \
init/init_dist.$(OBJEXT) init/init_surf.$(OBJEXT) \
init/init_regolith_stack.$(OBJEXT) \
seismic/seismic_shake.$(OBJEXT) \
seismic/seismic_distance.$(OBJEXT) \
seismic/seismic_kdiff_func.$(OBJEXT) \
Expand All @@ -171,6 +174,12 @@ am_CTEM_OBJECTS = globals/module_globals.$(OBJEXT) \
regolith/regolith_transport.$(OBJEXT) \
regolith/regolith_traverse_streamtube.$(OBJEXT) \
regolith/regolith_subcrater_mix.$(OBJEXT) \
regolith/regolith_melt_glass.$(OBJEXT) \
regolith/regolith_superdomain.$(OBJEXT) \
regolith/regolith_melt_zone_superdomain.$(OBJEXT) \
regolith/regolith_streamtube_volume_func.$(OBJEXT) \
regolith/regolith_shock_damage_zone.$(OBJEXT) \
regolith/regolith_shock_damage.$(OBJEXT) \
porosity/porosity_form_interior.$(OBJEXT) main/CTEM.$(OBJEXT)
CTEM_OBJECTS = $(am_CTEM_OBJECTS)
CTEM_LDADD = $(LDADD)
Expand Down Expand Up @@ -346,7 +355,6 @@ io/io_get_token.f90\
io/io_input.f90\
io/io_read_prod.f90\
io/io_read_regotrack.f90\
io/io_read_porotrack.f90\
io/io_read_vdist.f90\
io/io_read_surf.f90\
io/io_ejecta_table.f90\
Expand All @@ -355,11 +363,13 @@ io/io_write_tally.f90\
io/io_write_surf.f90\
io/io_write_const.f90\
io/io_write_regotrack.f90\
io/io_write_porotrack.f90\
io/io_crater_profile.f90\
io/io_updatePbar.f90\
io/io_resetPbar.f90\
io/io_splash.f90\
io/io_write_age.f90\
io/io_write_pindex_map.f90\
io/io_write_age_depth.f90\
ejecta/ejecta_emplace.f90\
ejecta/ejecta_ray_pattern.f90\
ejecta/ejecta_blanket.f90\
Expand All @@ -378,20 +388,21 @@ crater/crater_averages.f90\
crater/crater_emplace.f90\
crater/crater_form_interior.f90\
crater/crater_form_exterior.f90\
crater/crater_form_exterior_func.f90\
crater/crater_form_exterior_rootfind.f90\
crater/crater_record.f90\
crater/crater_tally_true.f90\
crater/crater_tally_observed.f90\
crater/crater_slope_collapse.f90\
crater/crater_soften.f90\
crater/crater_soften_accumulate.f90\
crater/crater_subpixel_diffusion.f90\
crater/crater_make_list.f90\
crater/crater_critical_slope.f90\
crater/crater_superdomain.f90\
init/init_domain.f90\
init/init_dist.f90\
init/init_surf.f90\
init/init_regolith_stack.f90\
init/init_porosity_stack.f90\
seismic/seismic_shake.f90\
seismic/seismic_distance.f90\
seismic/seismic_kdiff_func.f90\
Expand All @@ -411,6 +422,12 @@ regolith/regolith_subpixel_streamtube.f90\
regolith/regolith_transport.f90\
regolith/regolith_traverse_streamtube.f90\
regolith/regolith_subcrater_mix.f90\
regolith/regolith_melt_glass.f90\
regolith/regolith_superdomain.f90\
regolith/regolith_melt_zone_superdomain.f90\
regolith/regolith_streamtube_volume_func.f90\
regolith/regolith_shock_damage_zone.f90\
regolith/regolith_shock_damage.f90\
porosity/porosity_form_interior.f90\
main/CTEM.f90

Expand All @@ -436,8 +453,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
Expand Down Expand Up @@ -603,8 +620,6 @@ io/io_read_prod.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_read_regotrack.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_read_porotrack.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_read_vdist.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_read_surf.$(OBJEXT): io/$(am__dirstamp) \
Expand All @@ -621,8 +636,6 @@ io/io_write_const.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_write_regotrack.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_write_porotrack.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_crater_profile.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_updatePbar.$(OBJEXT): io/$(am__dirstamp) \
Expand All @@ -631,6 +644,12 @@ io/io_resetPbar.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_splash.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_write_age.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_write_pindex_map.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
io/io_write_age_depth.$(OBJEXT): io/$(am__dirstamp) \
io/$(DEPDIR)/$(am__dirstamp)
ejecta/ejecta_emplace.$(OBJEXT): ejecta/$(am__dirstamp) \
ejecta/$(DEPDIR)/$(am__dirstamp)
ejecta/ejecta_ray_pattern.$(OBJEXT): ejecta/$(am__dirstamp) \
Expand Down Expand Up @@ -667,6 +686,10 @@ crater/crater_form_interior.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_form_exterior.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_form_exterior_func.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_form_exterior_rootfind.$(OBJEXT): \
crater/$(am__dirstamp) crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_record.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_tally_true.$(OBJEXT): crater/$(am__dirstamp) \
Expand All @@ -677,14 +700,14 @@ crater/crater_slope_collapse.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_soften.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_soften_accumulate.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_subpixel_diffusion.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_make_list.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_critical_slope.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
crater/crater_superdomain.$(OBJEXT): crater/$(am__dirstamp) \
crater/$(DEPDIR)/$(am__dirstamp)
init/init_domain.$(OBJEXT): init/$(am__dirstamp) \
init/$(DEPDIR)/$(am__dirstamp)
init/init_dist.$(OBJEXT): init/$(am__dirstamp) \
Expand All @@ -693,8 +716,6 @@ init/init_surf.$(OBJEXT): init/$(am__dirstamp) \
init/$(DEPDIR)/$(am__dirstamp)
init/init_regolith_stack.$(OBJEXT): init/$(am__dirstamp) \
init/$(DEPDIR)/$(am__dirstamp)
init/init_porosity_stack.$(OBJEXT): init/$(am__dirstamp) \
init/$(DEPDIR)/$(am__dirstamp)
seismic/seismic_shake.$(OBJEXT): seismic/$(am__dirstamp) \
seismic/$(DEPDIR)/$(am__dirstamp)
seismic/seismic_distance.$(OBJEXT): seismic/$(am__dirstamp) \
Expand Down Expand Up @@ -733,6 +754,18 @@ regolith/regolith_traverse_streamtube.$(OBJEXT): \
regolith/$(am__dirstamp) regolith/$(DEPDIR)/$(am__dirstamp)
regolith/regolith_subcrater_mix.$(OBJEXT): regolith/$(am__dirstamp) \
regolith/$(DEPDIR)/$(am__dirstamp)
regolith/regolith_melt_glass.$(OBJEXT): regolith/$(am__dirstamp) \
regolith/$(DEPDIR)/$(am__dirstamp)
regolith/regolith_superdomain.$(OBJEXT): regolith/$(am__dirstamp) \
regolith/$(DEPDIR)/$(am__dirstamp)
regolith/regolith_melt_zone_superdomain.$(OBJEXT): \
regolith/$(am__dirstamp) regolith/$(DEPDIR)/$(am__dirstamp)
regolith/regolith_streamtube_volume_func.$(OBJEXT): \
regolith/$(am__dirstamp) regolith/$(DEPDIR)/$(am__dirstamp)
regolith/regolith_shock_damage_zone.$(OBJEXT): \
regolith/$(am__dirstamp) regolith/$(DEPDIR)/$(am__dirstamp)
regolith/regolith_shock_damage.$(OBJEXT): regolith/$(am__dirstamp) \
regolith/$(DEPDIR)/$(am__dirstamp)
porosity/porosity_form_interior.$(OBJEXT): porosity/$(am__dirstamp) \
porosity/$(DEPDIR)/$(am__dirstamp)
main/$(am__dirstamp):
Expand Down Expand Up @@ -822,10 +855,7 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

distdir-am: $(DISTFILES)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Expand Down
9 changes: 3 additions & 6 deletions src/crater/crater_emplace.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ subroutine crater_emplace(user,surf,crater,domain,deltaMtot)
real(DP),intent(out) :: deltaMtot

! Internal variables
real(DP) :: lradsq,newelev, x_relative, y_relative
real(DP) :: lradsq,newelev
integer(I4B) :: xpi,ypi,i,j,inc,incsq,iradsq
real(DP) :: xp,yp,fradsq,deltaMi,rimheight
logical :: lastloop
Expand Down Expand Up @@ -94,13 +94,10 @@ subroutine crater_emplace(user,surf,crater,domain,deltaMtot)

! periodic boundary conditions
call util_periodic(xpi,ypi,user%gridsize)
x_relative = (crater%xl - xp)
y_relative = (crater%yl - yp)

lradsq = x_relative**2 + y_relative**2
lradsq = (crater%xl - xp)**2 + (crater%yl - yp)**2

if (lradsq > crater%frad**2) cycle
call crater_form_interior(user,surf(xpi,ypi),crater,x_relative, y_relative,newelev,deltaMi)
call crater_form_interior(user,surf(xpi,ypi),crater,lradsq,newelev,deltaMi)
deltaMtot = deltaMtot + deltaMi

! do porosity computation if (user%doporosity)
Expand Down
6 changes: 3 additions & 3 deletions src/crater/crater_form_interior.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
! Notes :
!
!**********************************************************************************************************************************
subroutine crater_form_interior(user,surfi,crater,x_relative, y_relative ,newelev,deltaMi)
subroutine crater_form_interior(user,surfi,crater,lradsq,newelev,deltaMi)
use module_globals
use module_util
use module_crater, EXCEPT_THIS_ONE => crater_form_interior
Expand All @@ -28,7 +28,7 @@ subroutine crater_form_interior(user,surfi,crater,x_relative, y_relative ,newele
type(usertype),intent(in) :: user
type(surftype),intent(inout) :: surfi
type(cratertype),intent(in) :: crater
real(DP),intent(in) :: x_relative, y_relative
real(DP),intent(in) :: lradsq
real(DP),intent(in) :: newelev
real(DP),intent(out) :: deltaMi

Expand All @@ -42,7 +42,7 @@ subroutine crater_form_interior(user,surfi,crater,x_relative, y_relative ,newele
! Executable code

!change digital elevation map
r = sqrt(x_relative**2+y_relative**2) / crater%frad
r = sqrt(lradsq) / crater%frad
! Use empirical crater form from Fassett et al. 2014
if (r < 0.2_DP) then
cform = -0.181_DP * crater%fcrat
Expand Down
Loading

0 comments on commit b4f59d7

Please sign in to comment.