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

Commit

Permalink
renamed io_input_parameters to swiftest_parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@cwishard
cwishard committed Jun 28, 2021
1 parent e9f993c commit 6c162e3
Show file tree
Hide file tree
Showing 31 changed files with 59 additions and 59 deletions.
2 changes: 1 addition & 1 deletion src/io/io_conservation_report.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/io/io_dump_param.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_dump_pl.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_dump_pl_symba.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_read_param_in.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/io/io_read_particle.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_udio_reader.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(:)
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_udio_writer.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(:)
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_write_particle.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/swiftest_symba.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/modules/io.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -36,21 +36,21 @@ 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

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


Expand Down
34 changes: 17 additions & 17 deletions src/modules/module_interfaces.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/modules/module_symba.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 6c162e3

Please sign in to comment.