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

Commit

Permalink
Consolidated symba_fragmentation into symba_collision to avoid confusion
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminton
daminton committed Aug 12, 2021
1 parent 6ad5ffc commit 2cc6398
Show file tree
Hide file tree
Showing 4 changed files with 519 additions and 523 deletions.
16 changes: 8 additions & 8 deletions src/modules/symba_classes.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ module function symba_encounter_check_tp(self, system, dt, irec) result(lany_enc
logical :: lany_encounter !! Returns true if there is at least one close encounter
end function symba_encounter_check_tp

module function symba_fragmentation_casedisruption(system, param, family, x, v, mass, radius, L_spin, Ip, mass_res, Qloss) result(status)
module function symba_collision_casedisruption(system, param, family, x, v, mass, radius, L_spin, Ip, mass_res, Qloss) result(status)
implicit none
class(symba_nbody_system), intent(inout) :: system !! SyMBA nbody system object
class(symba_parameters), intent(in) :: param !! Current run configuration parameters with SyMBA additions
Expand All @@ -292,9 +292,9 @@ module function symba_fragmentation_casedisruption(system, param, family, x, v,
real(DP), dimension(:), intent(inout) :: mass_res !! The distribution of fragment mass obtained by the regime calculation
real(DP), intent(inout) :: Qloss !! Energy lost during collisionn
integer(I4B) :: status !! Status flag assigned to this outcome
end function symba_fragmentation_casedisruption
end function symba_collision_casedisruption

module function symba_fragmentation_casehitandrun(system, param, family, x, v, mass, radius, L_spin, Ip, mass_res, Qloss) result(status)
module function symba_collision_casehitandrun(system, param, family, x, v, mass, radius, L_spin, Ip, mass_res, Qloss) result(status)
implicit none
class(symba_nbody_system), intent(inout) :: system !! SyMBA nbody system object
class(symba_parameters), intent(in) :: param !! Current run configuration parameters with SyMBA additions
Expand All @@ -304,19 +304,19 @@ module function symba_fragmentation_casehitandrun(system, param, family, x, v, m
real(DP), dimension(:), intent(inout) :: mass_res !! The distribution of fragment mass obtained by the regime calculation
real(DP), intent(inout) :: Qloss !! Energy lost during collision
integer(I4B) :: status !! Status flag assigned to this outcome
end function symba_fragmentation_casehitandrun
end function symba_collision_casehitandrun

module function symba_fragmentation_casemerge(system, param, family, x, v, mass, radius, L_spin, Ip) result(status)
module function symba_collision_casemerge(system, param, family, x, v, mass, radius, L_spin, Ip) result(status)
implicit none
class(symba_nbody_system), intent(inout) :: system !! SyMBA nbody system object
class(symba_parameters), intent(in) :: param !! Current run configuration parameters with SyMBA additions
integer(I4B), dimension(:), intent(in) :: family !! List of indices of all bodies inovlved in the collision
real(DP), dimension(:,:), intent(in) :: x, v, L_spin, Ip !! Input values that represent a 2-body equivalent of a possibly 2+ body collision
real(DP), dimension(:), intent(in) :: mass, radius !! Input values that represent a 2-body equivalent of a possibly 2+ body collisio
integer(I4B) :: status !! Status flag assigned to this outcome
end function symba_fragmentation_casemerge
end function symba_collision_casemerge

module function symba_fragmentation_casesupercatastrophic(system, param, family, x, v, mass, radius, L_spin, Ip, mass_res, Qloss) result(status)
module function symba_collision_casesupercatastrophic(system, param, family, x, v, mass, radius, L_spin, Ip, mass_res, Qloss) result(status)
implicit none
class(symba_nbody_system), intent(inout) :: system !! SyMBA nbody system object
class(symba_parameters), intent(in) :: param !! Current run configuration parameters with SyMBA additions
Expand All @@ -326,7 +326,7 @@ module function symba_fragmentation_casesupercatastrophic(system, param, family,
real(DP), dimension(:), intent(inout) :: mass_res !! The distribution of fragment mass obtained by the regime calculation
real(DP), intent(inout) :: Qloss !! Energy lost during collision
integer(I4B) :: status !! Status flag assigned to this outcome
end function symba_fragmentation_casesupercatastrophic
end function symba_collision_casesupercatastrophic

module subroutine symba_io_write_discard(self, param)
use swiftest_classes, only : swiftest_parameters
Expand Down
Loading

0 comments on commit 2cc6398

Please sign in to comment.