Merge branch 'debug'

MintonGroup · Aug 12, 2021 · f19c68d · f19c68d
2 parents a4da062 + e2adfd0
commit f19c68d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/fragmentation/fragmentation.f90 b/src/fragmentation/fragmentation.f90
@@ -42,7 +42,7 @@ module subroutine fragmentation_initialize(system, param, family, x, v, L_spin,
       integer(I4B), parameter                 :: NFRAG_MIN = 7 !! The minimum allowable number of fragments (set to 6 because that's how many unknowns are needed in the tangential velocity calculation)
       real(DP)                                :: r_max_start, r_max_start_old, r_max, f_spin 
       real(DP), parameter                     :: Ltol = 10 * epsilon(1.0_DP)
-      real(DP), parameter                     :: Etol = 1e-9_DP
+      real(DP), parameter                     :: Etol = 1e-8_DP
       integer(I4B), parameter                 :: MAXTRY = 3000
       integer(I4B), parameter                 :: TANTRY = 3
       logical, dimension(size(IEEE_ALL))      :: fpe_halting_modes, fpe_quiet_modes

diff --git a/src/symba/symba_discard.f90 b/src/symba/symba_discard.f90
@@ -320,7 +320,7 @@ module subroutine symba_discard_pl(self, system, param)
                   if (param%lenergy) then
                      call system%get_energy_and_momentum(param)
                      Eorbit_after = system%te
-                     system%Ecollisions = Eorbit_after - Eorbit_before
+                     system%Ecollisions = system%Ecollisions + (Eorbit_after - Eorbit_before)
                   end if
                end if