Pulled in collision regime fix from the master branch

MintonGroup · Mar 24, 2023 · d7e4d14 · d7e4d14
1 parent e5b28e4
commit d7e4d14
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/src/collision/collision_regime.f90 b/src/collision/collision_regime.f90
@@ -285,19 +285,12 @@ subroutine collision_regime_LS12_SI(Mcb, m1, m2, rad1, rad2, rh1, rh2, vb1, vb2,
          Mlr = max((1.0_DP - Qr / Qrd_pstar / 2.0_DP) * Mtot, min_mfrag) ! [kg] # LS12 eq (5)
       end if
       Mbig = max(m1,Mlr)
-      Msmall = Mtot - Mbig
-      if (Msmall < min_mfrag) then
-         regime = COLLRESOLVE_REGIME_MERGE
-         Mbig = Mtot
-         Mslr = 0.0_DP
-         Mslr_hitandrun = 0.0_DP
+      Msmall = mtot - Mbig
+      Mslr_hitandrun = max(calc_Qrd_rev(Msmall, Mbig, Mint, den1, den2, Vimp, c_star), min_mfrag)
+      if (regime == COLLRESOLVE_REGIME_HIT_AND_RUN ) then
+         Mslr = Mslr_hitandrun
       else
-         Mslr_hitandrun = max(calc_Qrd_rev(Msmall, Mbig, Mint, den1, den2, Vimp, c_star), min_mfrag)
-         if (regime == COLLRESOLVE_REGIME_HIT_AND_RUN ) then
-            Mslr = Mslr_hitandrun
-         else
-            Mslr = max(Mtot * (3.0_DP - BETA) * (1.0_DP - N1 * Mlr / Mtot) / (N2 * BETA), min_mfrag)  !LS12 eq (37)
-         end if
+         Mslr = max(Mtot * (3.0_DP - BETA) * (1.0_DP - N1 * Mlr / Mtot) / (N2 * BETA), min_mfrag)  !LS12 eq (37)
       end if
 
       Mresidual = Mtot - Mlr - Mslr