From 14a5677b8346a757a257b597151b7497469fd7a8 Mon Sep 17 00:00:00 2001 From: David Minton Date: Tue, 10 Sep 2019 10:35:07 -0400 Subject: [PATCH 1/4] Updated version number for stable version --- src/globals/module_globals.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/globals/module_globals.f90 b/src/globals/module_globals.f90 index 51ed36c1..91a64547 100644 --- a/src/globals/module_globals.f90 +++ b/src/globals/module_globals.f90 @@ -14,7 +14,7 @@ module module_globals implicit none public -character(len=*),parameter :: CTEMVER = "1.3 DEVELOPMENT" +character(len=*),parameter :: CTEMVER = "1.4 DEVELOPMENT" ! Symbolic names for kind types of 4-, 2-, and 1-byte integers: integer, parameter :: I8B = selected_int_kind(17) From c45cbbffa0c3bc6cc8f22b069d7413dbd729fd86 Mon Sep 17 00:00:00 2001 From: David Minton Date: Tue, 10 Sep 2019 10:35:07 -0400 Subject: [PATCH 2/4] Updated version number for stable version. This is the version of the code used in Minton et al. (2019) --- src/globals/module_globals.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/globals/module_globals.f90 b/src/globals/module_globals.f90 index 51ed36c1..91a64547 100644 --- a/src/globals/module_globals.f90 +++ b/src/globals/module_globals.f90 @@ -14,7 +14,7 @@ module module_globals implicit none public -character(len=*),parameter :: CTEMVER = "1.3 DEVELOPMENT" +character(len=*),parameter :: CTEMVER = "1.4 DEVELOPMENT" ! Symbolic names for kind types of 4-, 2-, and 1-byte integers: integer, parameter :: I8B = selected_int_kind(17) From cfad544d9050d28b9a205a2ed5593d4a4a33e1e9 Mon Sep 17 00:00:00 2001 From: David Minton Date: Tue, 10 Sep 2019 10:38:53 -0400 Subject: [PATCH 3/4] Updated reference to Minton et al. 2019 to correct year --- src/globals/module_globals.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/globals/module_globals.f90 b/src/globals/module_globals.f90 index 91a64547..f2c0c31d 100644 --- a/src/globals/module_globals.f90 +++ b/src/globals/module_globals.f90 @@ -184,9 +184,9 @@ module module_globals real(DP) :: regcoh ! target surface regolith layer cohesion ! Crater diffusion input parameters - real(DP) :: Kd1 ! Degradation function coefficient (from Minton et al. (2018)) - real(DP) :: psi ! Degradation function exponent (from Minton et al. (2018)) - real(DP) :: fe ! Scale factor for size of degradation region (from Minton et al. (2018)) + real(DP) :: Kd1 ! Degradation function coefficient (from Minton et al. (2019)) + real(DP) :: psi ! Degradation function exponent (from Minton et al. (2019)) + real(DP) :: fe ! Scale factor for size of degradation region (from Minton et al. (2019)) ! Ejecta softening variables logical :: dosoftening ! Set T to use the extra crater softening model From 3740b60ebaca55db4c0c40fa9da94820154a6dbf Mon Sep 17 00:00:00 2001 From: Rigel Date: Wed, 2 Oct 2019 09:58:47 -0400 Subject: [PATCH 4/4] added x_r & y_r positions --- src/crater/crater_emplace.f90 | 9 ++++++--- src/crater/crater_form_interior.f90 | 6 +++--- src/crater/module_crater.f90 | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/crater/crater_emplace.f90 b/src/crater/crater_emplace.f90 index 6e58bce2..79b91a44 100644 --- a/src/crater/crater_emplace.f90 +++ b/src/crater/crater_emplace.f90 @@ -64,7 +64,7 @@ subroutine crater_emplace(user,surf,crater,domain,deltaMtot) real(DP),intent(out) :: deltaMtot ! Internal variables - real(DP) :: lradsq,newelev + real(DP) :: lradsq,newelev, x_relative, y_relative integer(I4B) :: xpi,ypi,i,j,inc,incsq,iradsq real(DP) :: xp,yp,fradsq,deltaMi,rimheight logical :: lastloop @@ -94,10 +94,13 @@ subroutine crater_emplace(user,surf,crater,domain,deltaMtot) ! periodic boundary conditions call util_periodic(xpi,ypi,user%gridsize) - lradsq = (crater%xl - xp)**2 + (crater%yl - yp)**2 + x_relative = (crater%xl - xp) + y_relative = (crater%yl - yp) + + lradsq = x_relative**2 + y_relative**2 if (lradsq > crater%frad**2) cycle - call crater_form_interior(user,surf(xpi,ypi),crater,lradsq,newelev,deltaMi) + call crater_form_interior(user,surf(xpi,ypi),crater,x_relative, y_relative,newelev,deltaMi) deltaMtot = deltaMtot + deltaMi ! do porosity computation if (user%doporosity) diff --git a/src/crater/crater_form_interior.f90 b/src/crater/crater_form_interior.f90 index 941e3cff..52f73875 100644 --- a/src/crater/crater_form_interior.f90 +++ b/src/crater/crater_form_interior.f90 @@ -18,7 +18,7 @@ ! Notes : ! !********************************************************************************************************************************** -subroutine crater_form_interior(user,surfi,crater,lradsq,newelev,deltaMi) +subroutine crater_form_interior(user,surfi,crater,x_relative, y_relative ,newelev,deltaMi) use module_globals use module_util use module_crater, EXCEPT_THIS_ONE => crater_form_interior @@ -28,7 +28,7 @@ subroutine crater_form_interior(user,surfi,crater,lradsq,newelev,deltaMi) type(usertype),intent(in) :: user type(surftype),intent(inout) :: surfi type(cratertype),intent(in) :: crater - real(DP),intent(in) :: lradsq + real(DP),intent(in) :: x_relative, y_relative real(DP),intent(in) :: newelev real(DP),intent(out) :: deltaMi @@ -42,7 +42,7 @@ subroutine crater_form_interior(user,surfi,crater,lradsq,newelev,deltaMi) ! Executable code !change digital elevation map - r = sqrt(lradsq) / crater%frad + r = sqrt(x_relative**2+y_relative**2) / crater%frad ! Use empirical crater form from Fassett et al. 2014 if (r < 0.2_DP) then cform = -0.181_DP * crater%fcrat diff --git a/src/crater/module_crater.f90 b/src/crater/module_crater.f90 index d6cddf87..ede92236 100644 --- a/src/crater/module_crater.f90 +++ b/src/crater/module_crater.f90 @@ -108,13 +108,13 @@ end subroutine crater_emplace end interface interface - subroutine crater_form_interior(user,surfi,crater,lradsq,newelev,deltaMi) + subroutine crater_form_interior(user,surfi,crater,x_relative, y_relative, newelev,deltaMi) use module_globals implicit none type(usertype),intent(in) :: user type(surftype),intent(inout) :: surfi type(cratertype),intent(in) :: crater - real(DP),intent(in) :: lradsq + real(DP),intent(in) :: x_relative, y_relative real(DP),intent(in) :: newelev real(DP),intent(out) :: deltaMi end subroutine crater_form_interior