Rearranged budget checks so that the L and ke budgets are not alteree…

…d during computation
MintonGroup · Aug 16, 2021 · 282a85a · 282a85a
1 parent 03a1e1f
commit 282a85a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/fragmentation/fragmentation.f90 b/src/fragmentation/fragmentation.f90
@@ -748,14 +748,13 @@ subroutine set_fragment_tan_vel(lerr)
             end do
             ke_frag_orbit = 0.5_DP * sum(kefrag(:))
             ke_radial = ke_frag_budget - ke_frag_spin - ke_frag_orbit
-            call calculate_fragment_ang_mtm()
-            L_frag_budget(:) = L_frag_budget(:) - L_frag_orb(:)
 
             ! If we are over the energy budget, flag this as a failure so we can try again
             lerr = (ke_radial < 0.0_DP)
             write(*,*) 'Tangential'
             write(*,*) 'Failure? ',lerr
-            write(*,*) '|L_remainder| : ',.mag.L_frag_budget(:) / Lmag_before
+            call calculate_fragment_ang_mtm()
+            write(*,*) '|L_remainder| : ',.mag.(L_frag_budget(:) - L_frag_tot(:)) / Lmag_before
             write(*,*) 'ke_frag_budget: ',ke_frag_budget
             write(*,*) 'ke_frag_spin  : ',ke_frag_spin
             write(*,*) 'ke_tangential : ',ke_frag_orbit