From 2a23de7f2ed4c54068d1bb0114259442e6fc8a8a Mon Sep 17 00:00:00 2001 From: daminton Date: Tue, 6 Dec 2016 15:29:26 +0000 Subject: [PATCH] Fixed bug in crater slope collapse routine --- src/crater/crater_critical_slope.f90 | 6 ++---- src/crater/crater_slope_collapse.f90 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/crater/crater_critical_slope.f90 b/src/crater/crater_critical_slope.f90 index 277a896e..5a9b1bfa 100644 --- a/src/crater/crater_critical_slope.f90 +++ b/src/crater/crater_critical_slope.f90 @@ -35,11 +35,9 @@ function crater_critical_slope(user,crater,iradsq) result(critical) if (r < 0.2_DP) then critical = 0.0_DP else if (r < 0.98_DP) then - critical = 0.228_DP + 2 * 0.083_DP * r - 3 * 0.039_DP * r**2 - else if (r < 1.5_DP) then - critical = 0.187_DP - 2 * 0.018_DP * r - 3 * 0.015_DP * r**2 + critical = abs(0.228_DP + 2 * 0.083_DP * r - 3 * 0.039_DP * r**2) else - critical = CRITSLP + critical = max(abs(0.187_DP - 2 * 0.018_DP * r - 3 * 0.015_DP * r**2),CRITSLP) end if end function crater_critical_slope diff --git a/src/crater/crater_slope_collapse.f90 b/src/crater/crater_slope_collapse.f90 index ef69c00f..ff8b78a7 100644 --- a/src/crater/crater_slope_collapse.f90 +++ b/src/crater/crater_slope_collapse.f90 @@ -55,7 +55,7 @@ subroutine crater_slope_collapse(user,surf,crater,domain) ! Some preliminary setup diffmax = 0.25_DP - looplim = 1000*crater%fcratpx + looplim = 1000 * crater%fcratpx ! determine area to effect inc = max(min(crater%fcratpx,ceiling(SQRT2*user%gridsize)),1)