From e9f993c2e661c4870247832aeeba52e826dc1ae2 Mon Sep 17 00:00:00 2001 From: Carlisle Wishard Date: Mon, 28 Jun 2021 15:44:31 -0400 Subject: [PATCH] changed user_ files to io_ files & updated output formatting for scalars --- Makefile | 8 +--- src/io/io_conservation_report.f90 | 2 +- .../io_dump_param.f90} | 14 +++--- src/io/io_dump_pl.f90 | 2 +- src/io/io_dump_pl_symba.f90 | 2 +- .../io_get_token.f90} | 10 ++--- .../io_read_param_in.f90} | 12 ++--- src/io/io_read_particle.f90 | 2 +- .../io_udio_reader.f90} | 34 +++++++------- .../io_udio_writer.f90} | 27 ++++++------ 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 | 44 +++++++++---------- 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 +- 33 files changed, 118 insertions(+), 123 deletions(-) rename src/{user/user_dump_param.f90 => io/io_dump_param.f90} (81%) rename src/{user/user_get_token.f90 => io/io_get_token.f90} (86%) rename src/{user/user_read_param_in.f90 => io/io_read_param_in.f90} (94%) rename src/{user/user_udio_reader.f90 => io/io_udio_reader.f90} (92%) rename src/{user/user_udio_writer.f90 => io/io_udio_writer.f90} (86%) diff --git a/Makefile b/Makefile index 61017994f..7664f1e6b 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ SWIFTEST_MODULES = swiftest_globals.f90 \ include Makefile.Defines -MODULES = $(SWIFTEST_MODULES) $(USER_MODULES) +MODULES = $(SWIFTEST_MODULES) .PHONY : all mod lib libdir drivers tools bin clean force @@ -134,11 +134,6 @@ lib: ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ ln -s $(SWIFTEST_HOME)/Makefile .; \ make libdir - cd $(SWIFTEST_HOME)/src/user; \ - rm -f Makefile.Defines Makefile; \ - ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ - ln -s $(SWIFTEST_HOME)/Makefile .; \ - make libdir2 cd $(SWIFTEST_HOME)/src/util; \ rm -f Makefile.Defines Makefile; \ ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ @@ -185,7 +180,6 @@ clean: cd $(SWIFTEST_HOME)/src/rmvs; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/swiftest; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/symba; rm -f Makefile.Defines Makefile *.gc* - cd $(SWIFTEST_HOME)/src/user; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/util; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/main; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/tool; rm -f Makefile.Defines Makefile *.gc* diff --git a/src/io/io_conservation_report.f90 b/src/io/io_conservation_report.f90 index 61816acc9..fcd241463 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(user_input_parameters), intent(inout) :: param !! Input colleciton of user-defined parameters + type(io_input_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/user/user_dump_param.f90 b/src/io/io_dump_param.f90 similarity index 81% rename from src/user/user_dump_param.f90 rename to src/io/io_dump_param.f90 index 5a8187ff8..3c280d1d4 100644 --- a/src/user/user_dump_param.f90 +++ b/src/io/io_dump_param.f90 @@ -1,22 +1,22 @@ -submodule(swiftest_data_structures) s_user_dump_param +submodule(swiftest_data_structures) s_io_dump_param contains - module subroutine user_dump_param(param, t, swiftest_plA) + module subroutine io_dump_param(param, t, swiftest_plA) !! author: David A. Minton !! !! Dump integration parameters to file !! !! Adapted from David E. Kaufmann's Swifter routine io_dump_param.f90 !! Adapted from Martin Duncan's Swift routine io_dump_param.f - use swiftest, except_this_one => user_dump_param + use swiftest, except_this_one => io_dump_param implicit none ! Arguments - class(user_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + class(io_input_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(user_input_parameters) :: param_dump !! Data type of dumped parameter file + type(io_input_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 @@ -52,5 +52,5 @@ module subroutine user_dump_param(param, t, swiftest_plA) return - end subroutine user_dump_param -end submodule s_user_dump_param + end subroutine io_dump_param +end submodule s_io_dump_param diff --git a/src/io/io_dump_pl.f90 b/src/io/io_dump_pl.f90 index 9380e942d..dd057b288 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(user_input_parameters),intent(inout) :: param + type(io_input_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 7a16117ca..46ee5515d 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(user_input_parameters),intent(inout) :: param + type(io_input_parameters),intent(inout) :: param ! internals integer(I4B) :: ierr diff --git a/src/user/user_get_token.f90 b/src/io/io_get_token.f90 similarity index 86% rename from src/user/user_get_token.f90 rename to src/io/io_get_token.f90 index 2bd14c188..a5b62b5d5 100644 --- a/src/user/user_get_token.f90 +++ b/src/io/io_get_token.f90 @@ -1,13 +1,13 @@ -submodule(swiftest_data_structures) s_user_get_token +submodule(swiftest_data_structures) s_io_get_token contains - module function user_get_token(buffer, ifirst, ilast, ierr) result(token) + module function io_get_token(buffer, ifirst, ilast, ierr) result(token) !! author: David A. Minton !! !! Retrieves a character token from an input string. Here a token is defined as any set of contiguous non-blank characters not !! beginning with or containing "!". If "!" is present, any remaining part of the buffer including the "!" is ignored !! !! Adapted from David E. Kaufmann's Swifter routine user_get_token.f90 - use swiftest, except_this_one => user_get_token + use swiftest, except_this_one => io_get_token implicit none ! Arguments @@ -49,5 +49,5 @@ module function user_get_token(buffer, ifirst, ilast, ierr) result(token) return - end function user_get_token -end submodule s_user_get_token + end function io_get_token +end submodule s_io_get_token diff --git a/src/user/user_read_param_in.f90 b/src/io/io_read_param_in.f90 similarity index 94% rename from src/user/user_read_param_in.f90 rename to src/io/io_read_param_in.f90 index c5c8f334e..fcdd04eec 100644 --- a/src/user/user_read_param_in.f90 +++ b/src/io/io_read_param_in.f90 @@ -1,6 +1,6 @@ -submodule (swiftest_data_structures) s_user_read_param_in +submodule (swiftest_data_structures) s_io_read_param_in contains - module subroutine user_read_param_in(param, inparfile, swiftest_plA) + module subroutine io_read_param_in(param, inparfile, swiftest_plA) !! author: The Purdue Swiftest Team - David A. Minton, Carlisle A. Wishard, Jennifer L.L. Pouplin, and Jacob R. Elliott !! !! Read in parameters for the integration @@ -8,11 +8,11 @@ module subroutine user_read_param_in(param, inparfile, swiftest_plA) !! Adapted from David E. Kaufmann's Swifter routine io_init_param.f90 !! Adapted from Martin Duncan's Swift routine io_init_param.f !$ use omp_lib - use swiftest, except_this_one => user_read_param_in + use swiftest, except_this_one => io_read_param_in implicit none ! Arguments - class(user_input_parameters),intent(out) :: param !! Input collection of user-defined parameters + class(io_input_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 @@ -118,6 +118,6 @@ module subroutine user_read_param_in(param, inparfile, swiftest_plA) return - end subroutine user_read_param_in + end subroutine io_read_param_in -end submodule s_user_read_param_in +end submodule s_io_read_param_in diff --git a/src/io/io_read_particle.f90 b/src/io/io_read_particle.f90 index c0f0dbdf1..4dc9d2eb3 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(user_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(io_input_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/user/user_udio_reader.f90 b/src/io/io_udio_reader.f90 similarity index 92% rename from src/user/user_udio_reader.f90 rename to src/io/io_udio_reader.f90 index 41011e670..5d32bbe48 100644 --- a/src/user/user_udio_reader.f90 +++ b/src/io/io_udio_reader.f90 @@ -1,6 +1,6 @@ -submodule (swiftest_data_structures) s_user_udio_reader +submodule (swiftest_data_structures) s_io_udio_reader contains - module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) + module subroutine io_udio_reader(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) !! author: The Purdue Swiftest Team - David A. Minton, Carlisle A. Wishard, Jennifer L.L. Pouplin, and Jacob R. Elliott !! !! Read in parameters for the integration @@ -12,11 +12,11 @@ module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, s !! Adapted from Martin Duncan's Swift routine io_init_param.f !$ use omp_lib !use util, only: util_exit ! IMPLEMENTATION TBD - use swiftest, except_this_one => user_udio_reader + use swiftest, except_this_one => io_udio_reader implicit none ! Arguments - class(user_input_parameters),intent(inout) :: param !! Input collection of user-defined parameters + class(io_input_parameters),intent(inout) :: param !! Input collection of user-defined parameters integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) @@ -47,11 +47,11 @@ module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, s if ((ilength /= 0)) then ifirst = 1 ! Read the pair of tokens. The first one is the parameter name, the second is the value. - param_name = user_get_token(line_trim, ifirst, ilast, iostat) + param_name = io_get_token(line_trim, ifirst, ilast, iostat) if (param_name == '') cycle ! No parameter name (usually because this line is commented out) call util_toupper(param_name) ifirst = ilast + 1 - param_value = user_get_token(line_trim, ifirst, ilast, iostat) + param_value = io_get_token(line_trim, ifirst, ilast, iostat) select case (param_name) case ("T0") read(param_value, *) param%t0 @@ -107,7 +107,7 @@ module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, s case ("CHK_QMIN_RANGE") read(param_value, *) param%qmin_alo ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) param%qmin_ahi case ("ENC_OUT") param%encounter_file = param_value @@ -168,13 +168,13 @@ module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, s allocate(param%seed(nseeds)) do i = 1, nseeds ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) param%seed(i) end do else ! Seed array in file is too small do i = 1, nseeds_from_file ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) param%seed(i) end do param%seed(nseeds_from_file+1:nseeds) = [(param%seed(1) - param%seed(nseeds_from_file) + i, i=nseeds_from_file+1, nseeds)] @@ -194,7 +194,7 @@ module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, s read(param_value, *) param%Ltot_orig(1) do i = 2, NDIM ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) param%Ltot_orig(i) end do param%Lmag_orig = norm2(param%Ltot_orig(:)) @@ -202,35 +202,35 @@ module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, s read(param_value, *) param%Lorbit_orig(1) do i = 2, NDIM ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) param%Lorbit_orig(i) end do case("LSPIN_ORIG") read(param_value, *) param%Lspin_orig(1) do i = 2, NDIM ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) param%Lspin_orig(i) end do case("LCB_INITIAL") read(param_value, *) swiftest_plA%Lcb_initial(1) do i = 2, NDIM ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) swiftest_plA%Lcb_initial(i) end do case("DLCB") read(param_value, *) swiftest_plA%dLcb(1) do i = 2, NDIM ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) swiftest_plA%dLcb(i) end do case("LESCAPE") read(param_value, *) swiftest_plA%Lescape(1) do i = 2, NDIM ifirst = ilast + 1 - param_value = user_get_token(line, ifirst, ilast, iostat) + param_value = io_get_token(line, ifirst, ilast, iostat) read(param_value, *) swiftest_plA%Lescape(i) end do case("MCB_INITIAL") @@ -335,6 +335,6 @@ module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, s return - end subroutine user_udio_reader + end subroutine io_udio_reader -end submodule s_user_udio_reader +end submodule s_io_udio_reader diff --git a/src/user/user_udio_writer.f90 b/src/io/io_udio_writer.f90 similarity index 86% rename from src/user/user_udio_writer.f90 rename to src/io/io_udio_writer.f90 index 90595ae93..1e0546a8e 100644 --- a/src/user/user_udio_writer.f90 +++ b/src/io/io_udio_writer.f90 @@ -1,17 +1,17 @@ -submodule(swiftest_data_structures) s_user_udio_writer +submodule(swiftest_data_structures) s_io_udio_writer contains - module subroutine user_udio_writer(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) + module subroutine io_udio_writer(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) !! author: David A. Minton !! !! Dump integration parameters to file !! !! Adapted from David E. Kaufmann's Swifter routine io_dump_param.f90 !! Adapted from Martin Duncan's Swift routine io_dump_param.f - use swiftest, except_this_one => user_udio_writer + use swiftest, except_this_one => io_udio_writer implicit none ! Arguments - class(user_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + class(io_input_parameters),intent(in) :: param !! Output collection of user-defined parameters integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) @@ -118,13 +118,14 @@ module subroutine user_udio_writer(param, unit, iotype, v_list, iostat, iomsg, s write(unit, '("LCB_INITIAL ",3(1X,ES25.17))') swiftest_pLA%Lcb_initial(:) write(unit, '("DLCB ",3(1X,ES25.17))') swiftest_pLA%dLcb(:) write(unit, '("LESCAPE ",3(1X,ES25.17))') swiftest_pLA%Lescape(:) - write(unit, '("MCB_INITIAL ",(1X,ES25.17))') swiftest_pLA%Mcb_initial - write(unit, '("DMCB ",(1X,ES25.17))') swiftest_pLA%dMcb - write(unit, '("MESCAPE ",(1X,ES25.17))') swiftest_pLA%Mescape - write(unit, '("RCB_INITIAL ",(1X,ES25.17))') swiftest_pLA%Rcb_initial - write(unit, '("DRCB ",(1X,ES25.17))') swiftest_pLA%dRcb - write(unit, '("ECOLLISIONS ",(1X,ES25.17))') swiftest_pLA%Ecollisions - write(unit, '("EUNTRACKED ",(1X,ES25.17))') swiftest_pLA%Euntracked + + write(param_name, Afmt) "MCB_INITIAL"; write(param_value, Rfmt) swiftest_pLA%Mcb_initial; write(unit, Afmt) adjustl(param_name), adjustl(param_value) + write(param_name, Afmt) "DMCB"; write(param_value, Rfmt) swiftest_pLA%dMcb; write(unit, Afmt) adjustl(param_name), adjustl(param_value) + write(param_name, Afmt) "MESCAPE"; write(param_value, Rfmt) swiftest_pLA%Mescape; write(unit, Afmt) adjustl(param_name), adjustl(param_value) + write(param_name, Afmt) "RCB_INITIAL"; write(param_value, Rfmt) swiftest_pLA%Rcb_initial; write(unit, Afmt) adjustl(param_name), adjustl(param_value) + write(param_name, Afmt) "DRCB"; write(param_value, Rfmt) swiftest_pLA%dRcb; write(unit, Afmt) adjustl(param_name), adjustl(param_value) + write(param_name, Afmt) "ECOLLISIONS"; write(param_value, Rfmt) swiftest_pLA%Ecollisions; write(unit, Afmt) adjustl(param_name), adjustl(param_value) + write(param_name, Afmt) "EUNTRACKED"; write(param_value, Rfmt) swiftest_pLA%Euntracked; write(unit, Afmt) adjustl(param_name), adjustl(param_value) end if write(param_name, Afmt) "FIRSTKICK"; write(param_value, Lfmt) param%lfirstkick; write(unit, Afmt) adjustl(param_name), adjustl(param_value) @@ -132,5 +133,5 @@ module subroutine user_udio_writer(param, unit, iotype, v_list, iostat, iomsg, s return - end subroutine user_udio_writer -end submodule s_user_udio_writer + end subroutine io_udio_writer +end submodule s_io_udio_writer diff --git a/src/io/io_write_particle.f90 b/src/io/io_write_particle.f90 index b5f9bbadf..5840d9799 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(user_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(io_input_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 e271720de..15fa0b2f8 100644 --- a/src/main/swiftest_symba.f90 +++ b/src/main/swiftest_symba.f90 @@ -15,7 +15,7 @@ program swiftest_symba implicit none ! Arguments - type(user_input_parameters) :: param ! derived type containing user-defined parameters + type(io_input_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 b8a2d2249..d909c2f57 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(user_input_parameters),intent(inout) :: param !! Input collection of user-defined parameters + type(io_input_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(user_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(io_input_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(user_input_parameters), intent(inout) :: param !! Input colleciton of user-defined parameters + type(io_input_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(user_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(io_input_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(user_input_parameters), intent(in) :: param !! Input colleciton of user-defined parameters + type(io_input_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 785372cbd..309b59490 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(user_input_parameters),intent(inout) :: param + type(io_input_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(user_input_parameters),intent(inout) :: param + type(io_input_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(user_input_parameters),intent(inout) :: param + type(io_input_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(user_input_parameters),intent(inout) :: param + type(io_input_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(user_input_parameters),intent(inout) :: param + type(io_input_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(user_input_parameters),intent(inout) :: param + type(io_input_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(user_input_parameters),intent(inout) :: param + type(io_input_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(user_input_parameters),intent(inout) :: param + TYPE(io_input_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(user_input_parameters), intent(inout) :: param + type(io_input_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(user_input_parameters), intent(in) :: param + type(io_input_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(user_input_parameters), intent(inout) :: param + type(io_input_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(user_input_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters + TYPE(io_input_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(user_input_parameters), intent(inout) :: param + type(io_input_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(user_input_parameters), intent(inout) :: param + type(io_input_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(user_input_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters + TYPE(io_input_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(user_input_parameters), intent(inout) :: param + type(io_input_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(user_input_parameters), intent(in) :: param + type(io_input_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 e4e548a3c..a63254478 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(user_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(io_input_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 bb94f9bcf..60e889443 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 :: user_input_parameters + type, public :: io_input_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 @@ -117,70 +117,70 @@ module swiftest_data_structures logical :: lyarkovsky = .false. !! Turn on Yarkovsky effect logical :: lyorp = .false. !! Turn on YORP effect contains - procedure :: read_from_file => user_read_param_in - procedure :: dump_to_file => user_dump_param - procedure :: udio_reader => user_udio_reader - procedure :: udio_writer => user_udio_writer + procedure :: read_from_file => io_read_param_in + procedure :: dump_to_file => io_dump_param + procedure :: udio_reader => io_udio_reader + procedure :: udio_writer => io_udio_writer !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 user_input_parameters + end type io_input_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(user_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(io_input_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(user_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(io_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters end subroutine swiftest_read_tp_in - module function user_get_token(buffer, ifirst, ilast, ierr) result(token) + module function io_get_token(buffer, ifirst, ilast, ierr) result(token) character(len=*), intent(in) :: buffer !! Input string buffer integer(I4B), intent(inout) :: ifirst !! Index of the buffer at which to start the search for a token integer(I4B), intent(out) :: ilast !! Index of the buffer at the end of the returned token integer(I4B), intent(out) :: ierr !! Error code character(len=:),allocatable :: token !! Returned token string - end function user_get_token + end function io_get_token !> Interface for type-bound procedure to read in the input parameters from a file - module subroutine user_read_param_in(param, inparfile, swiftest_plA) - class(user_input_parameters),intent(out) :: param !! Input collection of user-defined parameters + module subroutine io_read_param_in(param, inparfile, swiftest_plA) + class(io_input_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 user_read_param_in + 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 user_dump_param(param, t, swiftest_plA) - class(user_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + module subroutine io_dump_param(param, t, swiftest_plA) + class(io_input_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 user_dump_param + end subroutine io_dump_param !> Interface for type-bound procedure for user-defined derived-type IO for reading - module subroutine user_udio_reader(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) - class(user_input_parameters),intent(inout) :: param !! Input collection of user-defined parameters + 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 integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) integer, intent(out) :: iostat character(len=*), intent(inout) :: iomsg type(swiftest_pl), intent(inout) :: swiftest_plA - end subroutine user_udio_reader + end subroutine io_udio_reader !> Interface for type-bound procedure for user-defined derived-type IO for writing - module subroutine user_udio_writer(param, unit, iotype, v_list, iostat, iomsg, swiftest_plA) - class(user_input_parameters),intent(in) :: param !! Output collection of user-defined parameters + 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 integer, intent(in) :: unit character(len=*), intent(in) :: iotype integer, intent(in) :: v_list(:) integer, intent(out) :: iostat character(len=*), intent(inout) :: iomsg type(swiftest_pl), intent(inout) :: swiftest_plA - end subroutine user_udio_writer + end subroutine io_udio_writer end interface diff --git a/src/swiftest/swiftest_read_pl_in.f90 b/src/swiftest/swiftest_read_pl_in.f90 index 1298858af..553ee2de2 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(user_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + !type(io_input_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 0a16b304d..32edd1416 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(user_input_parameters),intent(inout) :: param + type(io_input_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 dda8ae3bd..9f9b28492 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(user_input_parameters),intent(inout) :: param + type(io_input_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 4c19a9e5a..eaa194be9 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(user_input_parameters),intent(inout) :: param + type(io_input_parameters),intent(inout) :: param ! Result integer(I4B) :: status ! Internals diff --git a/src/symba/symba_casesupercatastrophic.f90 b/src/symba/symba_casesupercatastrophic.f90 index 98535e5b2..c1581a8ce 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(user_input_parameters),intent(inout) :: param + type(io_input_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 1f614d54a..66ff3a8b4 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(user_input_parameters),intent(inout) :: param + type(io_input_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 df1e2474e..c2f118414 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(user_input_parameters), intent(inout) :: param + type(io_input_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 9c7f6897b..d8789e1c5 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(user_input_parameters), intent(in) :: param + type(io_input_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 32ce05950..efaff04a4 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(user_input_parameters), intent(inout) :: param + type(io_input_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 e9b57bea0..26aaa5277 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(user_input_parameters), intent(inout) :: param !! Input collection of user-defined parameters + type(io_input_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 b550b82f6..582206908 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(user_input_parameters), intent(inout) :: param + type(io_input_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 cef1fa606..01e63f64c 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(user_input_parameters), intent(inout) :: param ! derived type containing user defined parameters + type(io_input_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 0634820d1..3386b1cf3 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(user_input_parameters), INTENT(INOUT) :: param ! Derived type containing user defined parameters + TYPE(io_input_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 a839559a2..3297ec322 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(user_input_parameters), intent(inout) :: param + type(io_input_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 abd0d4c28..65b627505 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(user_input_parameters), intent(inout) :: param + type(io_input_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 635c48370..10fc2b26e 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(user_input_parameters), intent(inout) :: param + type(io_input_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 29fc01148..adf08c796 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(user_input_parameters) :: param ! derived type containing user-defined parameters + type(io_input_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