diff --git a/src/Makefile.in b/src/Makefile.in index 433e26bf..9a33fe0b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -115,17 +115,16 @@ am_CTEM_OBJECTS = globals/module_globals.$(OBJEXT) \ util/util_push.$(OBJEXT) util/util_traverse_pop.$(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_vdist.$(OBJEXT) \ + io/io_input.$(OBJEXT) io/io_read_craterlist.$(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_crater_profile.$(OBJEXT) \ + io/io_write_regotrack.$(OBJEXT) \ + io/io_write_porotrack.$(OBJEXT) io/io_crater_profile.$(OBJEXT) \ io/io_updatePbar.$(OBJEXT) io/io_resetPbar.$(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) \ + io/io_splash.$(OBJEXT) ejecta/ejecta_emplace.$(OBJEXT) \ ejecta/ejecta_ray_pattern.$(OBJEXT) \ ejecta/ejecta_blanket.$(OBJEXT) \ ejecta/ejecta_blanket_func.$(OBJEXT) \ @@ -142,19 +141,18 @@ 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) \ - crater/crater_superdomain.$(OBJEXT) init/init_domain.$(OBJEXT) \ - init/init_dist.$(OBJEXT) init/init_surf.$(OBJEXT) \ - init/init_regolith_stack.$(OBJEXT) \ + init/init_domain.$(OBJEXT) init/init_dist.$(OBJEXT) \ + init/init_surf.$(OBJEXT) init/init_regolith_stack.$(OBJEXT) \ + init/init_porosity_stack.$(OBJEXT) \ seismic/seismic_shake.$(OBJEXT) \ seismic/seismic_distance.$(OBJEXT) \ seismic/seismic_kdiff_func.$(OBJEXT) \ @@ -174,12 +172,6 @@ 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) @@ -315,16 +307,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -#ifort optimized flags -#AM_FCFLAGS = -O3 -openmp -parallel -xHost -ipo -assume byterecl -m64 -heap-arrays -FR -#AM_FCFLAGS = -O3 -openmp -parallel -assume byterecl -m64 -heap-arrays -FR -#ifort debug flags -#AM_FCFLAGS = -O3 -p -g -openmp -debug all -traceback -CB -assume byterecl -m64 -heap-arrays -FR #gfortran optimized flags -#AM_FCFLAGS = -O3 -fopenmp -ffree-form -g -fbounds-check -fbacktrace +AM_FCFLAGS = -O3 -fopenmp -ffree-form -g -fbounds-check -fbacktrace #gfortran debug flags -AM_FCFLAGS = -O0 -g -fopenmp -fbounds-check -Wall -Warray-bounds -Warray-temporaries -Wimplicit-interface -ffree-form +#AM_FCFLAGS = -O0 -g -fopenmp -fbounds-check -Wall -Warray-bounds -Warray-temporaries -Wimplicit-interface -ffree-form CTEM_SOURCES = globals/module_globals.f90\ util/module_util.f90\ io/module_io.f90\ @@ -353,8 +340,10 @@ util/util_init_list.f90\ io/io_read_const.f90\ io/io_get_token.f90\ io/io_input.f90\ +io/io_read_craterlist.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\ @@ -363,13 +352,11 @@ 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\ @@ -388,21 +375,20 @@ 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\ @@ -422,12 +408,6 @@ 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 @@ -453,8 +433,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__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -616,10 +596,14 @@ io/io_read_const.$(OBJEXT): io/$(am__dirstamp) \ io/io_get_token.$(OBJEXT): io/$(am__dirstamp) \ io/$(DEPDIR)/$(am__dirstamp) io/io_input.$(OBJEXT): io/$(am__dirstamp) io/$(DEPDIR)/$(am__dirstamp) +io/io_read_craterlist.$(OBJEXT): io/$(am__dirstamp) \ + io/$(DEPDIR)/$(am__dirstamp) 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) \ @@ -636,6 +620,8 @@ 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) \ @@ -644,12 +630,6 @@ 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) \ @@ -686,10 +666,6 @@ 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) \ @@ -700,14 +676,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) \ @@ -716,6 +692,8 @@ 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) \ @@ -754,18 +732,6 @@ 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): @@ -855,7 +821,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \