Merge branch 'master' into debug

MintonGroup · May 11, 2023 · 8b1acfb · 8b1acfb
2 parents df48d5e + 43f7dbb
commit 8b1acfb
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/collision/collision_regime.f90 b/src/collision/collision_regime.f90
@@ -265,11 +265,7 @@ subroutine collision_regime_LS12_SI(Mcb, m1, m2, rad1, rad2, rh1, rh2, vb1, vb2,
                regime = COLLRESOLVE_REGIME_HIT_AND_RUN !hit and run
             end if 
          else if (Vimp > Verosion .and. Vimp < Vsupercat) then
-            if (m2 < 0.001_DP * m1) then 
-               regime = COLLRESOLVE_REGIME_MERGE !cratering regime"
-            else 
-               regime = COLLRESOLVE_REGIME_DISRUPTION !disruption
-            end if 
+            regime = COLLRESOLVE_REGIME_DISRUPTION !disruption
          else if (Vimp > Vsupercat) then 
             regime = COLLRESOLVE_REGIME_SUPERCATASTROPHIC ! supercatastrophic
          else