Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Removed old discard io stuff that is no longer necessary now that col…
Browse files Browse the repository at this point in the history
…lision info is stored in the before/after snapshots in collisions.nc
  • Loading branch information
daminton committed Jan 11, 2023
1 parent db38bcf commit 9859c24
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 55 deletions.
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ SET(FAST_MATH_FILES
${SRC}/symba/symba_drift.f90
${SRC}/symba/symba_encounter_check.f90
${SRC}/symba/symba_gr.f90
${SRC}/symba/symba_io.f90
${SRC}/symba/symba_step.f90
${SRC}/symba/symba_util.f90
${SRC}/walltime/walltime_implementations.f90
Expand Down
5 changes: 1 addition & 4 deletions src/collision/collision_resolve.f90
Original file line number Diff line number Diff line change
Expand Up @@ -583,10 +583,7 @@ module subroutine collision_resolve_plpl(self, nbody_system, param, t, dt, irec)

if ((nbody_system%pl_adds%nbody == 0) .and. (nbody_system%pl_discards%nbody == 0)) exit

! Save the add/discard information to file
call nbody_system%write_discard(param)

! Rearrange the arrays: Remove discarded bodies, add any new bodies, resort, and recompute all indices and encounter lists
! Rearrange the arrays: Remove discarded bodies, add any new bodies, re-sort, and recompute all indices and encounter lists
call pl%rearray(nbody_system, param)

! Destroy the add/discard list so that we don't append the same body multiple times if another collision is detected
Expand Down
24 changes: 0 additions & 24 deletions src/swiftest/swiftest_io.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2943,30 +2943,6 @@ module subroutine swiftest_io_toupper(string)
end subroutine swiftest_io_toupper


module subroutine swiftest_io_write_discard(self, param)
!! author: David A. Minton
!!
!! Write the metadata of the discarded body to the output file
implicit none
class(swiftest_nbody_system), intent(inout) :: self !! SyMBA nbody system object
class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters
! Internals

associate(pl => self%pl, npl => self%pl%nbody, pl_adds => self%pl_adds, nc => self%system_history%nc)

call nc%open(param)
if (self%tp_discards%nbody > 0) call self%tp_discards%write_info(nc, param)
if (self%pl_discards%nbody == 0) return

call self%pl_discards%write_info(nc, param)
call nc%close()
end associate

return

end subroutine swiftest_io_write_discard


module subroutine swiftest_io_write_frame_system(self, param)
!! author: The Purdue Swiftest Team - David A. Minton, Carlisle A. Wishard, Jennifer L.L. Pouplin, and Jacob R. Elliott
!!
Expand Down
7 changes: 0 additions & 7 deletions src/swiftest/swiftest_module.f90
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@ module swiftest
procedure :: write_hdr => swiftest_io_netcdf_write_hdr_system !! Write a header for an output frame in NetCDF format
procedure :: read_particle_info => swiftest_io_netcdf_read_particle_info_system !! Read in particle metadata from file
procedure :: read_in => swiftest_io_read_in_system !! Reads the initial conditions for an nbody system
procedure :: write_discard => swiftest_io_write_discard !! Write out information about discarded and merged planets and test particles in SyMBA
procedure :: write_frame_system => swiftest_io_write_frame_system !! Write a frame of input data from file
procedure :: obl_pot => swiftest_obl_pot_system !! Compute the contribution to the total gravitational potential due solely to the oblateness of the central body
procedure :: dealloc => swiftest_util_dealloc_system !! Deallocates all allocatables and resets all values to defaults. Acts as a base for a finalizer
Expand Down Expand Up @@ -864,12 +863,6 @@ module subroutine swiftest_io_toupper(string)
character(*), intent(inout) :: string !! String to make upper case
end subroutine swiftest_io_toupper

module subroutine swiftest_io_write_discard(self, param)
implicit none
class(swiftest_nbody_system), intent(inout) :: self !! SyMBA nbody system object
class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters
end subroutine swiftest_io_write_discard

module subroutine swiftest_io_write_frame_system(self, param)
implicit none
class(swiftest_nbody_system), intent(inout) :: self !! Swiftest nbody_system object
Expand Down
3 changes: 0 additions & 3 deletions src/symba/symba_discard.f90
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,6 @@ module subroutine symba_discard_pl(self, nbody_system, param)

call symba_discard_nonplpl_conservation(self, nbody_system, param)

! Save the add/discard information to file
call nbody_system%write_discard(param)

call pl%rearray(nbody_system, param)

if (param%lenergy) then
Expand Down
16 changes: 0 additions & 16 deletions src/symba/symba_io.f90

This file was deleted.

0 comments on commit 9859c24

Please sign in to comment.