realistic rim, floor, ejecta

MintonGroup · Sep 11, 2023 · 0953f0f · 0953f0f
1 parent 41c045c
commit 0953f0f
Show file tree

Hide file tree

Showing 3 changed files with 188 additions and 155 deletions.
diff --git a/src/globals/module_globals.f90 b/src/globals/module_globals.f90
@@ -278,13 +278,13 @@ module module_globals
    real(DP) :: bp2_y  
    real(DP) :: bp3_y   
    real(DP) :: bp4_y  
-   real(DP) :: slope1 
-   real(DP),dimension(5) :: bp2_x_k_b_sigma
-   real(DP),dimension(5) :: bp2_y_k_b_sigma
-   real(DP),dimension(5) :: bp3_y_k_b_sigma
-   real(DP),dimension(5) :: bp4_y_k_b_sigma
-   real(DP),dimension(5) :: slope1_k_b_sigma
-   real(DP),dimension(5) :: misfit_k_b_sigma
+   real(DP) :: slope12 
+   real(DP) :: misfit_k_b_sigma 
+   real(DP),dimension(6) :: bp2_x_k_b_sigma
+   real(DP),dimension(6) :: bp2_y_k_b_sigma
+   real(DP),dimension(6) :: bp3_y_k_b_sigma
+   real(DP),dimension(6) :: bp4_y_k_b_sigma
+   real(DP),dimension(6) :: slope12_k_b_sigma
 end type psdtype
 !----------------------------------------------------------
 

diff --git a/src/realistic/module_realistic.f90 b/src/realistic/module_realistic.f90
@@ -128,7 +128,7 @@ end subroutine realistic_crater_topography
 
 
 interface
-   subroutine realistic_rim(user,surf,crater,deltaMtot)
+   subroutine make_realistic_crater(user,surf,crater,deltaMtot)
       use module_globals
       use module_util
       use module_crater
@@ -138,12 +138,9 @@ subroutine realistic_rim(user,surf,crater,deltaMtot)
       type(surftype),dimension(:,:),intent(inout) :: surf
       type(cratertype),intent(inout) :: crater
       real(DP),intent(inout) :: deltaMtot
-   end subroutine realistic_rim
+   end subroutine make_realistic_crater
 end interface
 
-
-
-! Rim_crest:
 interface 
 
    subroutine Calculate_am_wl_phase_from_diameter(psd_1D,amplitude,wavelength,phase)
@@ -180,7 +177,7 @@ subroutine Calculate_am_wl_phase_from_targetPSD(psd_1D,wavelength,psd,amplitude,
       real(DP) ,dimension(:),allocatable,intent(out) :: amplitude,phase 
    end subroutine Calculate_am_wl_phase_from_targetPSD
 
-   subroutine Create_rim(arc_length,psd_1D,amplitude,wavelength,phase,rim_parameter)
+   subroutine Make_outline(arc_length,psd_1D,amplitude,wavelength,phase,rim_parameter)
       use module_globals
       implicit none
       ! in and out
@@ -190,7 +187,7 @@ subroutine Create_rim(arc_length,psd_1D,amplitude,wavelength,phase,rim_parameter
       real(DP),dimension(:),intent(in) :: wavelength
       real(DP),dimension(:),intent(in) :: phase
       real(DP),intent(out) :: rim_parameter
-   end subroutine Create_rim
+   end subroutine Make_outline
 
 end interface