cleanup wip

autotest/test_prt_disv1.py

@@ -360,7 +360,7 @@ def check_output(idx, test):
     # load mf6 pathline results
     mf6_pls = pd.read_csv(prt_ws / prt_track_csv_file, na_filter=False)
     if "trts" in name or "trtf" in name:
-        assert len(mf6_pls) == 100  # todo: or 9179?? debug
+        assert len(mf6_pls) == 100
 
     # make sure pathline df has "name" (boundname) column and default values
     assert "name" in mf6_pls

src/Model/ParticleTracking/prt1.f90

@@ -948,7 +948,7 @@ subroutine prt_solve(this)
         ! -- Update PRP index
         iprp = iprp + 1
 
-        ! -- Initialize PRP-specific track files, if enabled (todo: do we really want PRP-specific track files?)
+        ! -- Initialize PRP-specific track files, if enabled
         if (packobj%itrkout > 0) then
           call this%trackfilectl%init_track_file( &
             packobj%itrkout, &
@@ -974,8 +974,8 @@ subroutine prt_solve(this)
           ! -- If particle is inactive or not yet to be released, cycle
           if (particle%istatus > 1) cycle
 
-          ! -- If particle is to be released this time step, record its initial state
-          particle%istatus = 1 ! todo: necessary?
+          ! -- If particle released this time step, record its initial state
+          particle%istatus = 1
           if (particle%trelease >= totimc) &
             call this%trackfilectl%save(particle, kper=kper, &
                                         kstp=kstp, reason=0) ! reason=0: release

src/Model/ParticleTracking/prt1prp1.f90

@@ -547,7 +547,12 @@ subroutine prp_rp(this)
         case ('FIRST')
           this%rlsfirst = .true.
         case ('FREQUENCY')
-          ival = this%parser%GetInteger() ! todo: check for nonnegative?
+          ival = this%parser%GetInteger()
+          if (ival < 0) then
+            errmsg = "FREQUENCY must be non-negative"
+            call store_error(errmsg)
+            call this%parser%StoreErrorUnit(terminate=.true.)
+          end if
           do i = 1, nstp(this%ionper)
             if (mod(i, ival) == 0) then
               n = size(this%rlskstp)

src/Solution/ParticleTracker/CellRectQuad.f90

@@ -29,7 +29,6 @@ module CellRectQuadModule
     procedure :: destroy => destroy_cell_rect_quad ! destructor for the cell
     procedure :: init_from ! initializes the cell from an existing cell
 
-    ! todo: can these be removed?
     procedure :: load_irectvert ! loads list of indices of the rectangle vertices
     procedure :: get_irectvertSW ! gets index of southwest rectangle vertex
     procedure :: get_rectDimensionsRotation ! gets rectangular dimensions and rotation

src/Solution/ParticleTracker/MethodCellPool.f90

@@ -1,5 +1,4 @@
 !> @brief Cell-level tracking methods.
-!! todo: refactor into derived type?
 module MethodCellPoolModule
 
   use MethodCellPollockModule

src/Solution/ParticleTracker/MethodDis.f90

@@ -25,11 +25,10 @@ module MethodDisModule
     procedure, public :: load => load_dis ! load the method
     procedure, public :: load_cell_defn !< load cell definition from the grid,
     procedure, public :: pass => pass_dis !< pass the particle to the next domain
-    procedure, private :: get_top ! get cell top elevation (todo: needed?)
-    procedure, private :: load_nbrs_to_defn ! load face neighbors to a cell definition
-    procedure, private :: load_flows_to_defn ! loads face flows to a cell definition
-    procedure, private :: load_boundary_flows_to_defn ! loads BoundaryFlows to a cell definition
-    ! todo: maybe separate LoadCellDefn module?
+    procedure, private :: get_top ! get cell top elevation
+    procedure, private :: load_nbrs_to_defn ! load face neighbors
+    procedure, private :: load_flows_to_defn ! loads face flows
+    procedure, private :: load_boundary_flows_to_defn ! loads BoundaryFlows
   end type MethodDisType
 
 contains

src/Solution/ParticleTracker/MethodDisv.f90

@@ -35,7 +35,6 @@ module MethodDisvModule
     procedure, private :: load_boundary_flows_to_defn_rect ! adds BoundaryFlows from the grid to the faceflow array of a rectangular cell
     procedure, private :: load_boundary_flows_to_defn_rect_quad ! adds BoundaryFlows from the grid to the faceflow array of a rectangular-quad cell
     procedure, private :: load_boundary_flows_to_defn_poly ! adds BoundaryFlows from the grid to the faceflow array of a polygonal cell
-    ! todo: maybe separate LoadCellDefn module?
   end type MethodDisvType
 
 contains

src/Solution/ParticleTracker/MethodPool.f90

@@ -1,5 +1,4 @@
 !> @brief Model-level tracking methods.
-!! todo: refactor into derived type?
 module MethodPoolModule
   use MethodModule, only: MethodType
   use MethodDisModule, only: MethodDisType, create_method_dis

src/Solution/ParticleTracker/MethodSubcellPool.f90

@@ -1,5 +1,4 @@
 !> @brief Subcell-level tracking methods.
-!! todo: refactor into derived type?
 module MethodSubcellPoolModule
 
   use MethodSubcellPollockModule