From 6c162e3aa3c69b4f66d862eea05a41750db44fdc Mon Sep 17 00:00:00 2001 From: Carlisle Wishard Date: Mon, 28 Jun 2021 16:10:56 -0400 Subject: [PATCH] renamed io_input_parameters to swiftest_parameters --- src/io/io_conservation_report.f90 | 2 +- src/io/io_dump_param.f90 | 4 +-- src/io/io_dump_pl.f90 | 2 +- src/io/io_dump_pl_symba.f90 | 2 +- src/io/io_read_param_in.f90 | 2 +- src/io/io_read_particle.f90 | 2 +- src/io/io_udio_reader.f90 | 2 +- src/io/io_udio_writer.f90 | 2 +- src/io/io_write_particle.f90 | 2 +- src/main/swiftest_symba.f90 | 2 +- src/modules/io.f90 | 10 +++---- src/modules/module_interfaces.f90 | 34 +++++++++++------------ src/modules/module_symba.f90 | 2 +- src/modules/swiftest_data_structures.f90 | 16 +++++------ src/swiftest/swiftest_read_pl_in.f90 | 2 +- src/symba/symba_casedisruption.f90 | 2 +- src/symba/symba_casehitandrun.f90 | 2 +- src/symba/symba_casemerge.f90 | 2 +- src/symba/symba_casesupercatastrophic.f90 | 2 +- src/symba/symba_collision.f90 | 2 +- src/symba/symba_discard_conserve_mtm.f90 | 2 +- src/symba/symba_frag_pos.f90 | 2 +- src/symba/symba_merge_pl.f90 | 2 +- src/symba/symba_read_pl_in.f90 | 2 +- src/symba/symba_rearray.f90 | 2 +- src/symba/symba_step.f90 | 2 +- src/symba/symba_step_eucl.f90 | 2 +- src/symba/symba_step_interp.f90 | 2 +- src/symba/symba_step_interp_eucl.f90 | 2 +- src/symba/symba_step_recur.f90 | 2 +- src/tool/tool_encounter_read.f90 | 2 +- 31 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/io/io_conservation_report.f90 b/src/io/io_conservation_report.f90 index fcd241463..9b3a867cf 100644 --- a/src/io/io_conservation_report.f90 +++ b/src/io/io_conservation_report.f90 @@ -12,7 +12,7 @@ module subroutine io_conservation_report(t, symba_plA, npl, j2rp2, j4rp4, param, type(symba_pl), intent(inout) :: symba_plA !! Swiftest planet data structure integer(I4B), intent(in) :: npl !! Number of massive bodies real(DP), intent(in) :: j2rp2, j4rp4 !! Central body oblateness terms - type(io_input_parameters), intent(inout) :: param !! Input colleciton of user-defined parameters + type(swiftest_parameters), intent(inout) :: param !! Input colleciton of user-defined parameters logical, intent(in) :: lterminal !! Indicates whether to output information to the terminal screen ! Internals real(DP), dimension(NDIM) :: Ltot_now, Lorbit_now, Lspin_now diff --git a/src/io/io_dump_param.f90 b/src/io/io_dump_param.f90 index 3c280d1d4..8bd770801 100644 --- a/src/io/io_dump_param.f90 +++ b/src/io/io_dump_param.f90 @@ -11,12 +11,12 @@ module subroutine io_dump_param(param, t, swiftest_plA) implicit none ! Arguments - class(io_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + class(swiftest_parameters),intent(in) :: param !! Output collection of user-defined parameters real(DP),intent(in) :: t !! Current simulation tim type(swiftest_pl), intent(inout) :: swiftest_plA ! Internals - type(io_input_parameters) :: param_dump !! Data type of dumped parameter file + type(swiftest_parameters) :: param_dump !! Data type of dumped parameter file integer(I4B), parameter :: LUN = 7 !! Unit number of output file integer(I4B) :: ierr !! Error code integer(I4B), save :: idx = 1 !! Index of current dump file. Output flips between 2 files for extra security diff --git a/src/io/io_dump_pl.f90 b/src/io/io_dump_pl.f90 index dd057b288..218b22d9e 100644 --- a/src/io/io_dump_pl.f90 +++ b/src/io/io_dump_pl.f90 @@ -43,7 +43,7 @@ SUBROUTINE io_dump_pl(npl, swiftest_plA, param) ! Arguments INTEGER(I4B), INTENT(IN) :: npl TYPE(swiftest_pl), INTENT(INOUT) :: swiftest_plA - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param ! Internals INTEGER(I4B) :: ierr diff --git a/src/io/io_dump_pl_symba.f90 b/src/io/io_dump_pl_symba.f90 index 46ee5515d..75507b19f 100644 --- a/src/io/io_dump_pl_symba.f90 +++ b/src/io/io_dump_pl_symba.f90 @@ -12,7 +12,7 @@ subroutine io_dump_pl_symba(npl, symba_plA, param) ! arguments integer(I4B), intent(in) :: npl type(symba_pl), intent(inout) :: symba_plA - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param ! internals integer(I4B) :: ierr diff --git a/src/io/io_read_param_in.f90 b/src/io/io_read_param_in.f90 index fcdd04eec..912a5be05 100644 --- a/src/io/io_read_param_in.f90 +++ b/src/io/io_read_param_in.f90 @@ -12,7 +12,7 @@ module subroutine io_read_param_in(param, inparfile, swiftest_plA) implicit none ! Arguments - class(io_input_parameters),intent(out) :: param !! Input collection of user-defined parameters + class(swiftest_parameters),intent(out) :: param !! Input collection of user-defined parameters character(*), intent(in) :: inparfile !! Parameter input file name (i.e. param.in) type(swiftest_pl), intent(inout) :: swiftest_plA diff --git a/src/io/io_read_particle.f90 b/src/io/io_read_particle.f90 index 4dc9d2eb3..8e0407d87 100644 --- a/src/io/io_read_particle.f90 +++ b/src/io/io_read_particle.f90 @@ -10,7 +10,7 @@ module subroutine io_read_particle_pl(swiftest_plA, param) implicit none ! Arguments class(swiftest_pl), intent(inout) :: swiftest_plA !! Swiftest massive body structure - type(io_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(swiftest_parameters), intent(in) :: param !! Input colleciton of user-defined parameters ! Internals integer(I4B), parameter :: lun = 22 integer(I4B) :: i, ierr, id, idx diff --git a/src/io/io_udio_reader.f90 b/src/io/io_udio_reader.f90 index 5d32bbe48..102ada369 100644 --- a/src/io/io_udio_reader.f90 +++ b/src/io/io_udio_reader.f90 @@ -16,7 +16,7 @@ module subroutine io_udio_reader(param, unit, iotype, v_list, iostat, iomsg, swi implicit none ! Arguments - class(io_input_parameters),intent(inout) :: param !! Input collection of user-defined parameters + class(swiftest_parameters),intent(inout) :: param !! Input collection of user-defined parameters integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) diff --git a/src/io/io_udio_writer.f90 b/src/io/io_udio_writer.f90 index 1e0546a8e..63891ae29 100644 --- a/src/io/io_udio_writer.f90 +++ b/src/io/io_udio_writer.f90 @@ -11,7 +11,7 @@ module subroutine io_udio_writer(param, unit, iotype, v_list, iostat, iomsg, swi implicit none ! Arguments - class(io_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + class(swiftest_parameters),intent(in) :: param !! Output collection of user-defined parameters integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) diff --git a/src/io/io_write_particle.f90 b/src/io/io_write_particle.f90 index 5840d9799..26e4f1c98 100644 --- a/src/io/io_write_particle.f90 +++ b/src/io/io_write_particle.f90 @@ -11,7 +11,7 @@ module subroutine io_write_particle_pl(swiftest_plA, idx, param) ! Arguments class(swiftest_pl), intent(in) :: swiftest_plA !! Swiftest massive body structure integer(I4B), dimension(:), intent(in) :: idx !! Array of particle indices to append to the particle file - type(io_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(swiftest_parameters), intent(in) :: param !! Input colleciton of user-defined parameters ! Internals logical, save :: lfirst = .true. integer(I4B), parameter :: lun = 22 diff --git a/src/main/swiftest_symba.f90 b/src/main/swiftest_symba.f90 index 15fa0b2f8..a5ac6bede 100644 --- a/src/main/swiftest_symba.f90 +++ b/src/main/swiftest_symba.f90 @@ -15,7 +15,7 @@ program swiftest_symba implicit none ! Arguments - type(io_input_parameters) :: param ! derived type containing user-defined parameters + type(swiftest_parameters) :: param ! derived type containing user-defined parameters ! Internals logical :: lfrag_add, ldiscard_pl, ldiscard_tp diff --git a/src/modules/io.f90 b/src/modules/io.f90 index d909c2f57..b61cac4b6 100644 --- a/src/modules/io.f90 +++ b/src/modules/io.f90 @@ -9,7 +9,7 @@ module io interface module subroutine io_getn(param,swiftest_plA,swiftest_tpA) - type(io_input_parameters),intent(inout) :: param !! Input collection of user-defined parameters + type(swiftest_parameters),intent(inout) :: param !! Input collection of user-defined parameters type(swiftest_pl), intent(inout) :: swiftest_plA !! Swiftest data structure to store number of massive bodies type(swiftest_tp), intent(inout) :: swiftest_tpA !! Swiftest data structure to store number of test particles end subroutine io_getn @@ -18,7 +18,7 @@ module subroutine io_write_frame(t, swiftest_plA, swiftest_tpA, param) real(DP), intent(in) :: t !! Current time of simulation type(swiftest_pl), intent(inout) :: swiftest_plA !! Swiftest massive body structure type(swiftest_tp), intent(inout) :: swiftest_tpA !! Swiftest test particle structure - type(io_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(swiftest_parameters), intent(in) :: param !! Input colleciton of user-defined parameters end subroutine io_write_frame module subroutine io_write_hdr(iu, t, npl, ntp, iout_form, out_type) @@ -36,7 +36,7 @@ module subroutine io_conservation_report(t, symba_plA, npl, j2rp2, j4rp4, param, type(symba_pl), intent(inout) :: symba_plA !! Swiftest planet data structure integer(I4B), intent(in) :: npl !! Number of massive bodies real(DP), intent(in) :: j2rp2, j4rp4 !! Central body oblateness terms - type(io_input_parameters), intent(inout) :: param !! Input colleciton of user-defined parameters + type(swiftest_parameters), intent(inout) :: param !! Input colleciton of user-defined parameters logical, intent(in) :: lterminal !! Indicates whether to output information to the terminal screen end subroutine io_conservation_report @@ -44,13 +44,13 @@ module subroutine io_write_particle_pl(swiftest_plA, idx, param) implicit none class(swiftest_pl), intent(in) :: swiftest_plA !! Swiftest massive body structure integer(I4B), dimension(:), intent(in) :: idx !! Array of particle indices to append to the particle file - type(io_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(swiftest_parameters), intent(in) :: param !! Input colleciton of user-defined parameters end subroutine io_write_particle_pl module subroutine io_read_particle_pl(swiftest_plA, param) implicit none class(swiftest_pl), intent(inout) :: swiftest_plA !! Swiftest massive body structure - type(io_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(swiftest_parameters), intent(in) :: param !! Input colleciton of user-defined parameters end subroutine io_read_particle_pl diff --git a/src/modules/module_interfaces.f90 b/src/modules/module_interfaces.f90 index 309b59490..423d6b053 100644 --- a/src/modules/module_interfaces.f90 +++ b/src/modules/module_interfaces.f90 @@ -493,7 +493,7 @@ SUBROUTINE io_dump_pl(npl, swiftest_plA, param) IMPLICIT NONE INTEGER(I4B), INTENT(IN) :: npl TYPE(swiftest_pl), INTENT(INOUT):: swiftest_plA - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param END SUBROUTINE io_dump_pl @@ -504,7 +504,7 @@ subroutine io_dump_pl_symba(npl, symba_plA, param) implicit none integer(I4B), intent(in) :: npl type(symba_pl), intent(inout):: symba_plA - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param end subroutine io_dump_pl_symba END INTERFACE @@ -734,7 +734,7 @@ function symba_casedisruption (symba_plA, family, nmergeadd, mergeadd_list, x, v type(symba_merger), intent(inout) :: mergeadd_list real(DP), dimension(:,:), intent(inout) :: x, v, L_spin, Ip real(DP), dimension(:), intent(inout) :: mass, radius, mass_res - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param real(DP), intent(inout) :: Qloss integer(I4B) :: status end function symba_casedisruption @@ -752,7 +752,7 @@ function symba_casehitandrun (symba_plA, family, nmergeadd, mergeadd_list, name, integer(I4B), dimension(:), intent(in) :: name real(DP), dimension(:,:), intent(inout) :: x, v, Lspin, Ip real(DP), dimension(:), intent(inout) :: mass, radius, mass_res - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param real(DP), intent(inout) :: Qloss integer(I4B) :: status end function symba_casehitandrun @@ -768,7 +768,7 @@ function symba_casemerge (symba_plA, family, nmergeadd, mergeadd_list, x, v, mas type(symba_merger), intent(inout) :: mergeadd_list real(DP), dimension(:,:), intent(in) :: x, v, lspin, Ip real(DP), dimension(:), intent(in) :: mass, radius - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param integer(I4B) :: status end function symba_casemerge @@ -784,7 +784,7 @@ function symba_casesupercatastrophic (symba_plA, family, nmergeadd, mergeadd_lis type(symba_merger), intent(inout) :: mergeadd_list real(DP), dimension(:,:), intent(inout) :: x, v, lspin, Ip real(DP), dimension(:), intent(inout) :: mass, radius, mass_res - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param real(DP), intent(inout) :: Qloss integer(I4B) :: status end function symba_casesupercatastrophic @@ -817,7 +817,7 @@ SUBROUTINE symba_collision(t, symba_plA, nplplenc, plplenc_list, ldiscard, merge type(symba_plplenc), intent(inout) :: plplenc_list type(symba_merger), intent(inout) :: mergeadd_list logical, intent(inout) :: ldiscard - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param END SUBROUTINE symba_collision END INTERFACE @@ -835,7 +835,7 @@ SUBROUTINE symba_merge_pl(t, dt, index_enc, nmergesub, mergesub_list, npl, symba TYPE(symba_plplenc), INTENT(INOUT) :: plplenc_list TYPE(symba_merger), INTENT(INOUT) :: mergesub_list TYPE(symba_pl), INTENT(INOUT) :: symba_plA - TYPE(io_input_parameters),intent(inout) :: param + TYPE(swiftest_parameters),intent(inout) :: param END SUBROUTINE symba_merge_pl END INTERFACE @@ -890,7 +890,7 @@ subroutine symba_discard_conserve_mtm(param, swiftest_plA, ipl, lescape_body) use swiftest_globals use swiftest_data_structures implicit none - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param type(swiftest_pl), intent(inout) :: swiftest_plA integer(I4B), intent(in) :: ipl logical, intent(in) :: lescape_body @@ -937,7 +937,7 @@ subroutine symba_frag_pos(param, symba_plA, family, x, v, L_spin, Ip, mass, radi USE swiftest_data_structures USE module_symba implicit none - type(io_input_parameters), intent(in) :: param + type(swiftest_parameters), intent(in) :: param type(symba_pl), intent(inout) :: symba_plA integer(I4B), dimension(:), intent(in) :: family real(DP), dimension(:,:), intent(inout) :: x, v, L_spin, Ip @@ -1103,7 +1103,7 @@ subroutine symba_rearray(t, npl, nplm, ntp, nsppl, nsptp, symba_plA, symba_tpA, type(symba_merger), intent(inout) :: mergeadd_list logical(LGT), intent(in) :: ldiscard_pl, ldiscard_tp real(DP), intent(in) :: mtiny - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param logical, dimension(:), allocatable, intent(inout) :: discard_l_pl integer(I4B), dimension(:), allocatable, intent(inout) :: discard_stat_list end subroutine symba_rearray @@ -1148,7 +1148,7 @@ SUBROUTINE symba_step(t, dt, param,npl, ntp,symba_plA, symba_tpA, & USE module_helio USE module_symba IMPLICIT NONE - TYPE(io_input_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters + TYPE(swiftest_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters INTEGER(I4B), INTENT(IN) :: npl, ntp INTEGER(I4B), INTENT(INOUT) :: nplplenc, npltpenc, nmergeadd, nmergesub REAL(DP), INTENT(IN) :: t, dt @@ -1212,7 +1212,7 @@ SUBROUTINE symba_step_interp(t, npl, nplm, ntp, symba_plA, symba_tpA, & TYPE(symba_plplenc), INTENT(INOUT) :: plplenc_list TYPE(symba_pltpenc), INTENT(INOUT) :: pltpenc_list TYPE(symba_merger), INTENT(INOUT) :: mergeadd_list, mergesub_list - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param END SUBROUTINE symba_step_interp END INTERFACE @@ -1232,7 +1232,7 @@ RECURSIVE SUBROUTINE symba_step_recur(t, ireci, npl, nplm, ntp, symba_plA, symba TYPE(symba_plplenc), INTENT(INOUT) :: plplenc_list TYPE(symba_pltpenc), INTENT(INOUT) :: pltpenc_list TYPE(symba_merger), INTENT(INOUT) :: mergeadd_list, mergesub_list - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param END SUBROUTINE symba_step_recur END INTERFACE @@ -1342,7 +1342,7 @@ SUBROUTINE symba_step_eucl(t,dt,param,npl, ntp,symba_plA, symba_tpA, & USE module_helio USE module_symba IMPLICIT NONE - TYPE(io_input_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters + TYPE(swiftest_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters INTEGER(I4B), INTENT(IN) :: npl, ntp INTEGER(I4B), INTENT(INOUT) :: nplplenc, npltpenc, nmergeadd, nmergesub REAL(DP), INTENT(IN) :: t, dt @@ -1371,7 +1371,7 @@ SUBROUTINE symba_step_interp_eucl(t, npl, nplm, ntp, symba_plA, symba_tpA,& TYPE(symba_plplenc), INTENT(INOUT) :: plplenc_list TYPE(symba_pltpenc), INTENT(INOUT) :: pltpenc_list TYPE(symba_merger), INTENT(INOUT) :: mergeadd_list, mergesub_list - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param END SUBROUTINE symba_step_interp_eucl END INTERFACE @@ -1401,7 +1401,7 @@ function symba_mergeadd_eoffset(npl, symba_plA, mergeadd_list, mergesub_list, ad type(symba_pl), intent(in) :: symba_plA type(symba_merger), intent(in) :: mergeadd_list, mergesub_list integer(I4B), intent(in) :: addi, addf, subi, subf - type(io_input_parameters), intent(in) :: param + type(swiftest_parameters), intent(in) :: param real(DP) :: eoffset end function symba_mergeadd_eoffset end interface diff --git a/src/modules/module_symba.f90 b/src/modules/module_symba.f90 index a63254478..00b50c893 100644 --- a/src/modules/module_symba.f90 +++ b/src/modules/module_symba.f90 @@ -106,7 +106,7 @@ MODULE module_symba interface module subroutine symba_read_pl_in(symba_plA, param) type(symba_pl), intent(inout) :: symba_plA !! Swiftest data structure to store massive body initial conditions - type(io_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(swiftest_parameters), intent(inout) :: param !! Input collection of user-defined parameters end subroutine symba_read_pl_in end interface diff --git a/src/modules/swiftest_data_structures.f90 b/src/modules/swiftest_data_structures.f90 index 60e889443..509f35d93 100644 --- a/src/modules/swiftest_data_structures.f90 +++ b/src/modules/swiftest_data_structures.f90 @@ -60,7 +60,7 @@ module swiftest_data_structures procedure :: read_from_file => swiftest_read_pl_in end type swiftest_pl - type, public :: io_input_parameters + type, public :: swiftest_parameters real(DP) :: t0 = 0.0_DP !! Integration start time real(DP) :: tstop = 0.0_DP !! Integration stop time real(DP) :: dt = 0.0_DP !! Time step @@ -124,18 +124,18 @@ module swiftest_data_structures !TODO: Figure out if user-defined derived-type io can be made to work properly !generic :: read(formatted) => udio_reader !generic :: write(formatted) => udio_writer - end type io_input_parameters + end type swiftest_parameters interface module subroutine swiftest_read_pl_in(self, param) class(swiftest_pl), intent(inout) :: self !! Swiftest data structure to store massive body initial conditions - type(io_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(swiftest_parameters), intent(inout) :: param !! Input collection of user-defined parameters end subroutine swiftest_read_pl_in module subroutine swiftest_read_tp_in(self, param) class(swiftest_tp), intent(inout) :: self !! Swiftest data structure to store massive body initial conditions - type(io_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(swiftest_parameters), intent(inout) :: param !! Input collection of user-defined parameters end subroutine swiftest_read_tp_in module function io_get_token(buffer, ifirst, ilast, ierr) result(token) @@ -148,21 +148,21 @@ end function io_get_token !> Interface for type-bound procedure to read in the input parameters from a file module subroutine io_read_param_in(param, inparfile, swiftest_plA) - class(io_input_parameters),intent(out) :: param !! Input collection of user-defined parameters + class(swiftest_parameters),intent(out) :: param !! Input collection of user-defined parameters character(*), intent(in) :: inparfile !! Parameter input file name (i.e. param.in) type(swiftest_pl), intent(inout) :: swiftest_plA end subroutine io_read_param_in !> Interface for type-bound procedure to write out the user parameters into a dump file in case the run needs to be restarted module subroutine io_dump_param(param, t, swiftest_plA) - class(io_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + class(swiftest_parameters),intent(in) :: param !! Output collection of user-defined parameters real(DP),intent(in) :: t !! Current simulation time type(swiftest_pl), intent(inout) :: swiftest_plA end subroutine io_dump_param !> Interface for type-bound procedure for user-defined derived-type IO for reading module subroutine io_udio_reader(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) - class(io_input_parameters),intent(inout) :: param !! Input collection of user-defined parameters + class(swiftest_parameters),intent(inout) :: param !! Input collection of user-defined parameters integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) @@ -173,7 +173,7 @@ end subroutine io_udio_reader !> Interface for type-bound procedure for user-defined derived-type IO for writing module subroutine io_udio_writer(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) - class(io_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + class(swiftest_parameters),intent(in) :: param !! Output collection of user-defined parameters integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) diff --git a/src/swiftest/swiftest_read_pl_in.f90 b/src/swiftest/swiftest_read_pl_in.f90 index 553ee2de2..6e0c5ed56 100644 --- a/src/swiftest/swiftest_read_pl_in.f90 +++ b/src/swiftest/swiftest_read_pl_in.f90 @@ -12,7 +12,7 @@ implicit none ! Arguments !class(swiftest_pl), intent(inout) :: self !! Swiftest data structure to store massive body initial condition - !type(io_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + !type(swiftest_parameters), intent(inout) :: param !! Input collection of user-defined parameters ! Internals integer(I4B), parameter :: LUN = 7 !! Unit number of input file integer(I4B) :: i, ierr, npl diff --git a/src/symba/symba_casedisruption.f90 b/src/symba/symba_casedisruption.f90 index 32edd1416..8482774c7 100644 --- a/src/symba/symba_casedisruption.f90 +++ b/src/symba/symba_casedisruption.f90 @@ -18,7 +18,7 @@ function symba_casedisruption (symba_plA, family, nmergeadd, mergeadd_list, x, v type(symba_merger), intent(inout) :: mergeadd_list real(DP), dimension(:), intent(inout) :: mass, radius, mass_res real(DP), dimension(:,:), intent(inout) :: x, v, L_spin, Ip - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param real(DP), intent(inout) :: Qloss ! Result integer(I4B) :: status diff --git a/src/symba/symba_casehitandrun.f90 b/src/symba/symba_casehitandrun.f90 index 9f9b28492..c73c74c75 100644 --- a/src/symba/symba_casehitandrun.f90 +++ b/src/symba/symba_casehitandrun.f90 @@ -18,7 +18,7 @@ function symba_casehitandrun(symba_plA, family, nmergeadd, mergeadd_list, id, x, integer(I4B), dimension(:), intent(in) :: id real(DP), dimension(:,:), intent(inout) :: x, v, L_spin, Ip real(DP), dimension(:), intent(inout) :: mass, radius, mass_res - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param real(DP), intent(inout) :: Qloss ! Result integer(I4B) :: status diff --git a/src/symba/symba_casemerge.f90 b/src/symba/symba_casemerge.f90 index eaa194be9..4bf4c8764 100644 --- a/src/symba/symba_casemerge.f90 +++ b/src/symba/symba_casemerge.f90 @@ -19,7 +19,7 @@ function symba_casemerge (symba_plA, family, nmergeadd, mergeadd_list, x, v, mas type(symba_merger), intent(inout) :: mergeadd_list real(DP), dimension(:,:), intent(in) :: x, v, L_spin, Ip real(DP), dimension(:), intent(in) :: mass, radius - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param ! Result integer(I4B) :: status ! Internals diff --git a/src/symba/symba_casesupercatastrophic.f90 b/src/symba/symba_casesupercatastrophic.f90 index c1581a8ce..2216686c3 100644 --- a/src/symba/symba_casesupercatastrophic.f90 +++ b/src/symba/symba_casesupercatastrophic.f90 @@ -17,7 +17,7 @@ function symba_casesupercatastrophic (symba_plA, family, nmergeadd, mergeadd_lis type(symba_merger), intent(inout) :: mergeadd_list real(DP), dimension(:,:), intent(inout) :: x, v, L_spin, Ip real(DP), dimension(:), intent(inout) :: mass, radius, mass_res - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param real(DP), intent(inout) :: Qloss ! Result integer(I4B) :: status diff --git a/src/symba/symba_collision.f90 b/src/symba/symba_collision.f90 index 66ff3a8b4..745731c6a 100644 --- a/src/symba/symba_collision.f90 +++ b/src/symba/symba_collision.f90 @@ -19,7 +19,7 @@ subroutine symba_collision (t, symba_plA, nplplenc, plplenc_list, ldiscard, merg type(symba_plplenc), intent(inout) :: plplenc_list type(symba_merger), intent(inout) :: mergeadd_list logical, intent(inout) :: ldiscard - type(io_input_parameters),intent(inout) :: param + type(swiftest_parameters),intent(inout) :: param integer(I4B), parameter :: NRES = 3 !! Number of collisional product results integer(I4B) :: i, j, k, index_enc, index_coll, jtarg, jproj diff --git a/src/symba/symba_discard_conserve_mtm.f90 b/src/symba/symba_discard_conserve_mtm.f90 index c2f118414..cfaa5c86a 100644 --- a/src/symba/symba_discard_conserve_mtm.f90 +++ b/src/symba/symba_discard_conserve_mtm.f90 @@ -8,7 +8,7 @@ subroutine symba_discard_conserve_mtm(param, swiftest_plA, ipl, lescape_body) implicit none ! Arguments type(swiftest_pl), intent(inout) :: swiftest_plA - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param integer(I4B), intent(in) :: ipl logical, intent(in) :: lescape_body ! Internals diff --git a/src/symba/symba_frag_pos.f90 b/src/symba/symba_frag_pos.f90 index d8789e1c5..8345fb7a5 100644 --- a/src/symba/symba_frag_pos.f90 +++ b/src/symba/symba_frag_pos.f90 @@ -14,7 +14,7 @@ subroutine symba_frag_pos(param, symba_plA, family, x, v, L_spin, Ip, mass, radi use module_interfaces, except_this_one => symba_frag_pos implicit none ! Arguments - type(io_input_parameters), intent(in) :: param + type(swiftest_parameters), intent(in) :: param type(symba_pl), intent(inout) :: symba_plA integer(I4B), dimension(:), intent(in) :: family real(DP), dimension(:,:), intent(inout) :: x, v, L_spin, Ip diff --git a/src/symba/symba_merge_pl.f90 b/src/symba/symba_merge_pl.f90 index efaff04a4..b856821b4 100644 --- a/src/symba/symba_merge_pl.f90 +++ b/src/symba/symba_merge_pl.f90 @@ -21,7 +21,7 @@ subroutine symba_merge_pl(t, dt, index_enc, nmergesub, mergesub_list, npl, symba type(symba_plplenc), intent(inout) :: plplenc_list type(symba_merger), intent(inout) :: mergesub_list type(symba_pl), intent(inout) :: symba_plA - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param integer(I4B) :: i, j, k, index_parent, index_child, p1, p2 integer(I4B) :: nchild_inherit, nchild_orig, nchild_new diff --git a/src/symba/symba_read_pl_in.f90 b/src/symba/symba_read_pl_in.f90 index 26aaa5277..20087b4d5 100644 --- a/src/symba/symba_read_pl_in.f90 +++ b/src/symba/symba_read_pl_in.f90 @@ -12,7 +12,7 @@ module subroutine symba_read_pl_in(symba_plA, param) implicit none ! Arguments type(symba_pl), intent(inout) :: symba_plA !! Swiftest data structure to store massive body initial conditions - type(io_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(swiftest_parameters), intent(inout) :: param !! Input collection of user-defined parameters ! Internals integer(I4B), parameter :: LUN = 7 !! Unit number of input file integer(I4B) :: i, ierr, npl diff --git a/src/symba/symba_rearray.f90 b/src/symba/symba_rearray.f90 index 582206908..699889466 100644 --- a/src/symba/symba_rearray.f90 +++ b/src/symba/symba_rearray.f90 @@ -22,7 +22,7 @@ subroutine symba_rearray(t, npl, nplm, ntp, nsppl, nsptp, symba_plA, symba_tpA, type(symba_merger), intent(inout) :: mergeadd_list logical, intent(in) :: ldiscard_pl, ldiscard_tp real(DP), intent(in) :: mtiny - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param logical, dimension(:), allocatable, intent(inout) :: discard_l_pl integer(I4B), dimension(:), allocatable, intent(inout) :: discard_stat_list diff --git a/src/symba/symba_step.f90 b/src/symba/symba_step.f90 index 01e63f64c..16e9c97f1 100644 --- a/src/symba/symba_step.f90 +++ b/src/symba/symba_step.f90 @@ -71,7 +71,7 @@ subroutine symba_step(t, dt, param, npl, ntp,symba_plA, symba_tpA, & implicit none ! Arguments - type(io_input_parameters), intent(inout) :: param ! derived type containing user defined parameters + type(swiftest_parameters), intent(inout) :: param ! derived type containing user defined parameters integer(I4B), intent(in) :: npl, ntp integer(I4B), intent(inout) :: nplplenc, npltpenc, nmergeadd, nmergesub real(DP), intent(in) :: t, dt diff --git a/src/symba/symba_step_eucl.f90 b/src/symba/symba_step_eucl.f90 index 3386b1cf3..725f1ec25 100644 --- a/src/symba/symba_step_eucl.f90 +++ b/src/symba/symba_step_eucl.f90 @@ -72,7 +72,7 @@ SUBROUTINE symba_step_eucl(t,dt,param,npl, ntp,symba_plA, symba_tpA, & IMPLICIT NONE ! Arguments - TYPE(io_input_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters + TYPE(swiftest_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters INTEGER(I4B), INTENT(IN) :: npl, ntp INTEGER(I4B), INTENT(INOUT) :: nplplenc, npltpenc, nmergeadd, nmergesub REAL(DP), INTENT(IN) :: t, dt diff --git a/src/symba/symba_step_interp.f90 b/src/symba/symba_step_interp.f90 index 3297ec322..542de24c3 100644 --- a/src/symba/symba_step_interp.f90 +++ b/src/symba/symba_step_interp.f90 @@ -74,7 +74,7 @@ SUBROUTINE symba_step_interp(t, npl, nplm, ntp, symba_plA, symba_tpA, dt, & TYPE(symba_plplenc), INTENT(INOUT) :: plplenc_list TYPE(symba_pltpenc), INTENT(INOUT) :: pltpenc_list TYPE(symba_merger), INTENT(INOUT) :: mergeadd_list, mergesub_list - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param ! Internals INTEGER(I4B) :: i, irec diff --git a/src/symba/symba_step_interp_eucl.f90 b/src/symba/symba_step_interp_eucl.f90 index 65b627505..d1c3f8eb9 100644 --- a/src/symba/symba_step_interp_eucl.f90 +++ b/src/symba/symba_step_interp_eucl.f90 @@ -72,7 +72,7 @@ SUBROUTINE symba_step_interp_eucl(t, npl, nplm, ntp, symba_plA, symba_tpA,& TYPE(symba_plplenc), INTENT(INOUT) :: plplenc_list TYPE(symba_pltpenc), INTENT(INOUT) :: pltpenc_list TYPE(symba_merger), INTENT(INOUT) :: mergeadd_list, mergesub_list - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param ! Internals INTEGER(I4B) :: i, irec diff --git a/src/symba/symba_step_recur.f90 b/src/symba/symba_step_recur.f90 index 10fc2b26e..b573b0906 100644 --- a/src/symba/symba_step_recur.f90 +++ b/src/symba/symba_step_recur.f90 @@ -67,7 +67,7 @@ RECURSIVE SUBROUTINE symba_step_recur(t, ireci, npl, nplm, ntp, symba_plA, symba TYPE(symba_plplenc), INTENT(INOUT) :: plplenc_list TYPE(symba_pltpenc), INTENT(INOUT) :: pltpenc_list TYPE(symba_merger), INTENT(INOUT) :: mergeadd_list, mergesub_list - type(io_input_parameters), intent(inout) :: param + type(swiftest_parameters), intent(inout) :: param ! Internals LOGICAL(LGT) :: lencounter diff --git a/src/tool/tool_encounter_read.f90 b/src/tool/tool_encounter_read.f90 index adf08c796..2ec6c96b5 100644 --- a/src/tool/tool_encounter_read.f90 +++ b/src/tool/tool_encounter_read.f90 @@ -33,7 +33,7 @@ PROGRAM tool_encounter_read IMPLICIT NONE ! Arguments - type(io_input_parameters) :: param ! derived type containing user-defined parameters + type(swiftest_parameters) :: param ! derived type containing user-defined parameters type(swiftest_pl) :: swiftest_plA INTEGER(I4B) :: istep_out ! Time steps between binary outputs INTEGER(I4B) :: istep_dump ! Time steps between dumps