Skip to content

Commit

Permalink
docstrings, more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
wpbonelli committed Dec 8, 2023
1 parent 7cf4ee2 commit ca9dd99
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 137 deletions.
12 changes: 6 additions & 6 deletions src/Model/ModelUtilities/TrackData.f90
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ module TrackModule
!! or with an entire model.
!<
type :: TrackFileType
integer(I4B) :: iun = 0 ! file unit number
logical(LGP) :: csv = .false. ! whether the file is binary or CSV
integer(I4B) :: iprp = -1 ! -1 is model-level file, 0 is exchange PRP
integer(I4B) :: iun = 0 !< file unit number
logical(LGP) :: csv = .false. !< whether the file is binary or CSV
integer(I4B) :: iprp = -1 !< -1 is model-level file, 0 is exchange PRP
end type TrackFileType

!> @brief Manages particle track (i.e. pathline) files.
Expand All @@ -38,9 +38,9 @@ module TrackModule
!<
type :: TrackControlType
private
type(TrackFileType), public, allocatable :: trackfiles(:) ! output files
integer(I4B), public :: ntrackfiles ! number of output files
integer(I4B), public :: itrackevent ! track event selection
type(TrackFileType), public, allocatable :: trackfiles(:) !< output files
integer(I4B), public :: ntrackfiles !< number of output files
integer(I4B), public :: itrackevent !< track event selection
contains
procedure :: expand
procedure, public :: init_track_file
Expand Down
19 changes: 8 additions & 11 deletions src/Model/ParticleTracking/prt1prp1.f90
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ module PrtPrpModule
logical(LGP), pointer :: rls_all => null() !< flag for release on all time steps in period
logical(LGP), pointer :: rls_any => null() !< flag that indicates whether any release in period
logical(LGP), pointer :: noperiodblocks => null() !< flag indicating if there are no period blocks in sim
integer(I4B), pointer :: itrkout => null()
integer(I4B), pointer :: itrkhdr => null()
integer(I4B), pointer :: itrkcsv => null()
integer(I4B), pointer :: itrkout => null() !< binary track file
integer(I4B), pointer :: itrkhdr => null() !< track header file
integer(I4B), pointer :: itrkcsv => null() !< CSV track file
contains
procedure :: prp_allocate_arrays
procedure :: prp_allocate_scalars
Expand All @@ -84,7 +84,7 @@ module PrtPrpModule

contains

!> @brief Create a new particle release package
!> @brief Create a new particle release point package
subroutine prp_create(packobj, id, ibcnum, inunit, iout, namemodel, &
pakname, mempath, fmi)
! -- dummy
Expand Down Expand Up @@ -173,7 +173,7 @@ subroutine prp_da(this)
call mem_deallocate(this%tstop)
call mem_deallocate(this%rptname, 'RPTNAME', this%memoryPath)
!
! -- deallocate particle list
! -- deallocate particle store
call this%particles%deallocate_arrays(this%memoryPath)
deallocate (this%particles)
call mem_deallocate(this%massrls)
Expand Down Expand Up @@ -207,9 +207,6 @@ subroutine prp_allocate_arrays(this, nodelist, auxvar)
! -- local
integer(I4B) :: nps
!
! ! -- call standard BndType allocate scalars
! call this%BndType%allocate_arrays()
! !
! -- Allocate
call mem_allocate(this%noder, this%nreleasepts, 'NODER', this%memoryPath)
call mem_allocate(this%x, this%nreleasepts, 'X', this%memoryPath)
Expand All @@ -219,7 +216,7 @@ subroutine prp_allocate_arrays(this, nodelist, auxvar)
call mem_allocate(this%rptname, LENBOUNDNAME, this%nreleasepts, &
'RPTNAME', this%memoryPath)

! -- Allocate particle list
! -- Allocate particle store
allocate (this%particles)
call this%particles%allocate_arrays(this%npartmax, &
levelMin, levelMax, &
Expand All @@ -233,11 +230,11 @@ subroutine prp_allocate_arrays(this, nodelist, auxvar)
this%massrls(nps) = DZERO
end do
!
! -- The following array is allocatable (not a pointer) so it can be resized using
! -- The following array is allocatable (not a pointer) so resize
if (allocated(this%kstp_list_rls)) deallocate (this%kstp_list_rls)
allocate (this%kstp_list_rls(0))
!
! -- The following array is allocatable (not a pointer) so it can be resized using
! -- The following array is allocatable (not a pointer) so resize
if (allocated(this%frac_list_rls)) deallocate (this%frac_list_rls)
allocate (this%frac_list_rls(1))

Expand Down
Loading

0 comments on commit ca9dd99

Please sign in to comment.