Fixed bug in crater slope collapse routine

MintonGroup · Dec 6, 2016 · 2a23de7 · 2a23de7
1 parent d97c906
commit 2a23de7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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)