Fixed bugs where conservation report was being taken when it wasn't a…

…sked for
MintonGroup · Jan 15, 2023 · 8f31031 · 8f31031
1 parent 107fc88
commit 8f31031
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/swiftest/swiftest_driver.f90 b/src/swiftest/swiftest_driver.f90
@@ -79,8 +79,8 @@ program swiftest_driver
             else
                call nbody_system%conservation_report(param, lterminal=.false.) ! This will save the initial values of energy and momentum
             end if
+            call nbody_system%conservation_report(param, lterminal=.true.)
          end if
-         call nbody_system%conservation_report(param, lterminal=.true.)
          call system_history%take_snapshot(param,nbody_system)
          call nbody_system%dump(param)
 

diff --git a/src/swiftest/swiftest_io.f90 b/src/swiftest/swiftest_io.f90
@@ -1114,13 +1114,12 @@ module function swiftest_io_netcdf_read_frame_system(self, nc, param) result(ier
             call netcdf_io_check( nf90_get_var(nc%id, nc%radius_varid, rtemp, start=[1, tslot], count=[idmax,1]), "netcdf_io_read_frame_system nf90_getvar radius_varid"  )
             cb%radius = rtemp(1)
 
-            ! Set initial central body radius for SyMBA bookkeeping
-            cb%R0 = cb%radius
             if (npl > 0) pl%radius(:) = pack(rtemp, plmask)
          else
             cb%radius = param%rmin
             if (npl > 0) pl%radius(:) = 0.0_DP
          end if
+         cb%R0 = cb%radius
 
          if (param%lrotation) then
             call netcdf_io_check( nf90_get_var(nc%id, nc%Ip_varid,  vectemp, start=[1, 1, tslot], count=[NDIM,idmax,1]), "netcdf_io_read_frame_system nf90_getvar Ip_varid"  )