Numerous improvements to Fraggle and the collision regime code to fix…

… problems arising from mass distributions not being computed correctly, hit and runs not getting positions and velocities set correctly, and generally improving the robustness of Fraggle
MintonGroup · Feb 9, 2023 · 03f8291 · 03f8291
1 parent 9dd9035
commit 03f8291
Show file tree

Hide file tree

Showing 3 changed files with 145 additions and 81 deletions.
diff --git a/src/collision/collision_regime.f90 b/src/collision/collision_regime.f90
@@ -279,6 +279,8 @@ subroutine collision_regime_LS12_SI(Mcb, m1, m2, rad1, rad2, rh1, rh2, vb1, vb2,
 
       if (regime == COLLRESOLVE_REGIME_SUPERCATASTROPHIC) then
          Mlr  = max(Mtot * 0.1_DP * (Qr / (Qrd_pstar * SUPERCAT_QRATIO))**(ETA), min_mfrag)   !LS12 eq (44)
+      else if (regime == COLLRESOLVE_REGIME_HIT_AND_RUN) then
+         Mlr = m1
       else 
          Mlr = max((1.0_DP - Qr / Qrd_pstar / 2.0_DP) * Mtot, min_mfrag) ! [kg] # LS12 eq (5)
       end if