From 083ddb1cb4537a02a5d2f9922ec72aed517dbd9b Mon Sep 17 00:00:00 2001 From: David Minton Date: Wed, 9 Feb 2022 14:40:35 -0500 Subject: [PATCH] Fixed bugs in profile near rim. --- src/crater/crater_realistic_topography.f90 | 10 +++++----- src/ejecta/ejecta_emplace.f90 | 6 +++--- src/ejecta/ejecta_table_define.f90 | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/crater/crater_realistic_topography.f90 b/src/crater/crater_realistic_topography.f90 index 6a185a26..ed1b29c4 100644 --- a/src/crater/crater_realistic_topography.f90 +++ b/src/crater/crater_realistic_topography.f90 @@ -642,11 +642,11 @@ subroutine ejecta_texture(user,surf,crater,deltaMtot,inc,ejecta_dem) splat_stretch = 16.0_DP splatmag = 0.10_DP - open(unit=12,file='params.txt',status='old') - read(12,*) num_octaves - read(12,*) xy_noise_fac - read(12,*) noise_height - close(12) + ! open(unit=12,file='params.txt',status='old') + ! read(12,*) num_octaves + ! read(12,*) xy_noise_fac + ! read(12,*) noise_height + ! close(12) ! Get the ejecta mass ejbmass = sum(ejecta_dem) diff --git a/src/ejecta/ejecta_emplace.f90 b/src/ejecta/ejecta_emplace.f90 index b9c40d63..04dee3f2 100644 --- a/src/ejecta/ejecta_emplace.f90 +++ b/src/ejecta/ejecta_emplace.f90 @@ -128,8 +128,8 @@ subroutine ejecta_emplace(user,surf,crater,domain,ejb,ejtble,deltaMtot,age,age_r if (user%doregotrack) call regolith_melt_zone(user,crater,crater%imp,crater%impvel,rm,dm) - crater%vdepth = crater%ejrim + crater%floordepth - crater%vrim = crater%ejrim + crater%rimheight + crater%vdepth = crater%rimheight + crater%floordepth + crater%vrim = crater%rimheight if (crater%ejdis <= crater%ejrad) return @@ -261,7 +261,7 @@ subroutine ejecta_emplace(user,surf,crater,domain,ejb,ejtble,deltaMtot,age,age_r areafrac = (1.0_DP - util_area_intersection(crater%ejrad,xbar,ybar,user%pix)) ebh = areafrac * ejdistribution(idistorted,jdistorted) * ebh - cumulative_elchange(i,j) = areafrac * cumulative_elchange(i,j) + ebh + cumulative_elchange(i,j) = areafrac * cumulative_elchange(i,j) + ebh + crater_profile(user, crater, lrad) if (user%dosoftening) then ! Do extra diffusive degradation over ejecta region diff --git a/src/ejecta/ejecta_table_define.f90 b/src/ejecta/ejecta_table_define.f90 index 91eb7b14..01ab7ce8 100644 --- a/src/ejecta/ejecta_table_define.f90 +++ b/src/ejecta/ejecta_table_define.f90 @@ -75,9 +75,9 @@ subroutine ejecta_table_define(user,crater,domain,ejb,ejtble,melt) ! This will be replaced r = lrad / crater%frad if (lrad >= crater%frad) then - thick = crater_profile(user, crater, r) + crater%ejrim * r**(-EJPROFILE) + thick = crater_profile(user, crater, r) + crater%ejrim * r**(-EJPROFILE) else - thick = max(crater_profile(user,crater,r) + crater%ejrim,VSMALL) + thick = max(crater_profile(user,crater,r),VSMALL) end if ejb(k)%thick = log(thick) ejb(k)%vesq = vejsq