Merge branch 'debug'

MintonGroup · Jan 25, 2023 · 7cd75e5 · 7cd75e5
2 parents 127be37 + efd84a7
commit 7cd75e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/swiftest/swiftest_driver.f90 b/src/swiftest/swiftest_driver.f90
@@ -106,7 +106,6 @@ program swiftest_driver
                   if (idump == dump_cadence) then
                      idump = 0
                      call nbody_system%dump(param)
-
                   end if
 
                   call integration_timer%report(message="Integration steps:", unit=display_unit, nsubsteps=istep_out)

diff --git a/src/swiftest/swiftest_io.f90 b/src/swiftest/swiftest_io.f90
@@ -129,7 +129,11 @@ module subroutine swiftest_io_conservation_report(self, param, lterminal)
 
       associate(nbody_system => self, pl => self%pl, cb => self%cb, npl => self%pl%nbody, display_unit => param%display_unit, nc => self%system_history%nc)
 
-         call pl%vb2vh(cb)
+         select type(self)
+         class is (helio_nbody_system) ! Don't convert vh to vb for Helio-based integrators, because they are already have that calculated
+         class is (whm_nbody_system)
+            call pl%vh2vb(cb)
+         end select
          call pl%rh2rb(cb)
 
          call nbody_system%get_energy_and_momentum(param)