Made some changes that allow the merged code to be compiled (tested i…

…n gfortran)
MintonGroup · Sep 8, 2023 · bb93155 · bb93155
1 parent 49d5976
commit bb93155
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -6,13 +6,13 @@ HEAPARR = -heap-arrays
 OPTREPORT = -qopt-report=5 
 IPRODUCTION = -g -traceback -no-wrap-margin -assume byterecl -O3 -qopt-prefetch=0 -sox $(PAR) $(SIMDVEC) $(HEAPARR)
 IDEBUG = -O0 -g -traceback -debug all -nogen-interfaces -assume byterecl -m64 -heap-arrays -FR -no-pie -no-ftz -fpe-all=0 -mp1 -fp-model strict -fpe0 -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin -init=snan,arrays 
-AM_FCFLAGS =  $(IDEBUG)
+#AM_FCFLAGS =  $(IDEBUG)
 #ifort debug flags
 
 #gfortran optimized flags
-#AM_FCFLAGS =  -O3 -fopenmp -ffree-form  -g -fbounds-check -fbacktrace
+#AM_FCFLAGS =  -O3 -fopenmp -ffree-form  -g -fbounds-check -fbacktrace -ffree-line-length-512
 #gfortran debug flags
-#AM_FCFLAGS =  -O0 -g -fopenmp -fbounds-check -Wall -Warray-bounds -Warray-temporaries -Wimplicit-interface -ffree-form -fsanitize-address-use-after-scope -fstack-check  -fsanitize=bounds-strict -fsanitize=undefined -fsanitize=signed-integer-overflow -fsanitize=object-size -fstack-protector-all
+AM_FCFLAGS =  -O0 -g -fopenmp -fbounds-check -Wall -Warray-bounds -Warray-temporaries -Wimplicit-interface -ffree-form -fstack-check -fstack-protector-all -ffree-line-length-512
 
 CTEM_SOURCES = globals/module_globals.f90\
 util/module_util.f90\
@@ -43,6 +43,9 @@ util/util_destroy_list.f90\
 util/util_init_array.f90\
 util/util_perlin_noise.f90\
 util/util_random_number_normal.f90\
+util/util_npf_timefunc.f90\
+util/util_tscale.f90\
+util/util_t_from_scale.f90\
 io/io_read_const.f90\
 io/io_get_token.f90\
 io/io_input.f90\

diff --git a/src/ejecta/ejecta_emplace.f90 b/src/ejecta/ejecta_emplace.f90
@@ -1,4 +1,4 @@
-!****f* ejecta/ejecta_emplace
+!***** ejecta/ejecta_emplace
 ! Name
 !   ejecta_emplace -- Calculate ejecta mass during excavation stage.
 ! SYNOPSIS

diff --git a/src/realistic/realistic_crater_topography.f90 b/src/realistic/realistic_crater_topography.f90
@@ -33,7 +33,7 @@ subroutine realistic_crater_topography(user,surf,crater,domain,ejecta_dem)
    use module_globals
    use module_util
    use module_crater
-   use module_realistic!, EXCEPT_THIS_ONE => realistic_crater_topography
+   use module_realistic, EXCEPT_THIS_ONE => realistic_crater_topography
    implicit none
 
    ! in and out
@@ -68,7 +68,7 @@ subroutine realistic_rim(user,surf,crater,deltaMtot)
    use module_globals
    use module_util
    use module_crater
-   use module_realistic!, EXCEPT_THIS_ONE => realistic_rim
+   use module_realistic, EXCEPT_THIS_ONE => realistic_rim
    implicit none
 
    ! in and out
@@ -181,7 +181,7 @@ end subroutine realistic_rim
 
 subroutine Calculate_am_wl_phase_from_diameter(psd_1D,amplitude,wavelength,phase)
    use module_globals
-   use module_realistic
+   use module_realistic, EXCEPT_THIS_ONE => Calculate_am_wl_phase_from_diameter
    implicit none
    ! in and out
    type(psdtype),intent(inout) :: psd_1D
@@ -207,7 +207,7 @@ end subroutine Calculate_am_wl_phase_from_diameter
 
 subroutine Calculate_breakpoint_slope_from_diameter(psd_1D)
    use module_globals
-   use module_realistic
+   use module_realistic, EXCEPT_THIS_ONE => Calculate_breakpoint_slope_from_diameter
    use module_util
    implicit none
    ! in and out
@@ -266,7 +266,7 @@ end subroutine Calculate_breakpoint_slope_from_diameter
 
 subroutine Calculate_targetPSD_from_breakpoint_slope(psd_1D,wavelength,psd)
    use module_globals
-   use module_realistic
+   use module_realistic, EXCEPT_THIS_ONE => Calculate_targetPSD_from_breakpoint_slope
    use module_util
    implicit none
    !in and out
@@ -356,7 +356,7 @@ end subroutine Calculate_targetPSD_from_breakpoint_slope
 
 subroutine Calculate_am_wl_phase_from_targetPSD(psd_1D,wavelength,psd,amplitude,phase)
    use module_globals
-   use module_realistic
+   use module_realistic, EXCEPT_THIS_ONE => Calculate_am_wl_phase_from_targetPSD
    implicit none
    !in and out
    type(psdtype), intent(in)  :: psd_1D
@@ -380,7 +380,7 @@ end subroutine Calculate_am_wl_phase_from_targetPSD
 
 subroutine Create_rim(arc_length,psd_1D,amplitude,wavelength,phase,rim_parameter)
    use module_globals
-   use module_realistic
+   use module_realistic, EXCEPT_THIS_ONE => Create_rim
    implicit none
    ! in and out
    real(DP),intent(in) :: arc_length

diff --git a/src/util/util_random_number_normal.f90 b/src/util/util_random_number_normal.f90
@@ -52,7 +52,6 @@
 
 subroutine util_random_number_uniform(u)
    use module_globals
-   use module_util 
    implicit none
    real(DP),intent(out) :: u
    real(DP) :: r
@@ -62,7 +61,6 @@ end subroutine util_random_number_uniform
 
 subroutine util_random_number_normal(x)
    use module_globals
-   use module_util 
    implicit none
    real(DP),intent(out) :: x
    real(DP) :: u1,u2