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

Commit

Permalink
Small bit of maintenence on param reader
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Jan 7, 2023
1 parent d58f672 commit 5a3efb8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/swiftest/swiftest_io.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1812,6 +1812,7 @@ module subroutine swiftest_io_remove_nul_char(string)
return
end subroutine swiftest_io_remove_nul_char


module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, iomsg)
!! author: The Purdue Swiftest Team - David A. Minton, Carlisle A. Wishard, Jennifer L.L. Pouplin, and Jacob R. Elliott
!!
Expand Down Expand Up @@ -1919,7 +1920,7 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i
param%qmin_coord = param_value
case ("CHK_QMIN_RANGE")
read(param_value, *, err = 667, iomsg = iomsg) param%qmin_alo
ifirst = ilast + 1
ifirst = ilast + 2
param_value = swiftest_io_get_token(line, ifirst, ilast, iostat)
read(param_value, *, err = 667, iomsg = iomsg) param%qmin_ahi
case ("EXTRA_FORCE")
Expand Down
10 changes: 5 additions & 5 deletions src/symba/symba_module.f90
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module symba
contains
procedure :: encounter_check => symba_encounter_check_list_plpl !! Checks if massive bodies are going through close encounters with each other
procedure :: kick => symba_kick_list_plpl !! Kick barycentric velocities of active massive bodies within SyMBA recursion
final :: symba_final_list_plpl !! Finalizes the SyMBA test particle object - deallocates all allocatables
final :: symba_final_list_plpl !! Finalizes the SyMBA test particle object - deallocates all allocatables
end type symba_list_plpl


Expand All @@ -88,20 +88,20 @@ module symba
contains
procedure :: encounter_check => symba_encounter_check_list_pltp !! Checks if massive bodies are going through close encounters with test particles
procedure :: kick => symba_kick_list_pltp !! Kick barycentric velocities of active test particles within SyMBA recursion
final :: symba_final_list_pltp !! Finalizes the SyMBA test particle object - deallocates all allocatables
final :: symba_final_list_pltp !! Finalizes the SyMBA test particle object - deallocates all allocatables
end type symba_list_pltp


type, extends(helio_nbody_system) :: symba_nbody_system
integer(I4B) :: irec !! nbody_system recursion level
integer(I4B) :: irec = -1 !! nbody_system recursion level
contains
procedure :: initialize => symba_util_setup_initialize_system !! Performs SyMBA-specific initilization steps
procedure :: initialize => symba_util_setup_initialize_system !! Performs SyMBA-specific initilization steps
procedure :: step => symba_step_system !! Advance the SyMBA nbody system forward in time by one step
procedure :: interp => symba_step_interp_system !! Perform an interpolation step on the SymBA nbody system
procedure :: set_recur_levels => symba_step_set_recur_levels_system !! Sets recursion levels of bodies and encounter lists to the current nbody_system level
procedure :: recursive_step => symba_step_recur_system !! Step interacting planets and active test particles ahead in democratic heliocentric coordinates at the current recursion level, if applicable, and descend to the next deeper level if necessary
procedure :: reset => symba_step_reset_system !! Resets pl, tp,and encounter structures at the start of a new step
final :: symba_final_system !! Finalizes the SyMBA nbody system object - deallocates all allocatables
final :: symba_final_system !! Finalizes the SyMBA nbody system object - deallocates all allocatables
end type symba_nbody_system

interface
Expand Down

0 comments on commit 5a3efb8

Please sign in to comment.