cleanup

Author: wpbonelli

src/Model/ParticleTracking/prt-prp.f90

@@ -429,6 +429,7 @@ subroutine release(this, ip, trelease)
 
     ! Accumulate mass for release point
     this%rptm(ip) = this%rptm(ip) + DONE
+
   end subroutine release
 
   subroutine initialize_particle(this, particle, ip, trelease)

src/Model/ParticleTracking/prt.f90

@@ -959,10 +959,8 @@ subroutine prt_solve(this)
           ! Get and apply the tracking method
           call this%method%apply(particle, tmax)
 
-          ! Reset previous cell, subcell, and zone numbers
+          ! Reset previous cell and zone numbers
           particle%icp = 0
-          particle%iscp = 0
-          particle%iscefp = 0
           particle%izp = 0
 
           ! Update particle storage

src/Solution/ParticleTracker/Method.f90

@@ -114,11 +114,7 @@ recursive subroutine track(this, particle, level, tmax)
     nextlevel = level + 1
     do while (advancing)
       call this%load(particle, nextlevel, submethod)
-      if (particle%istatus > 1) then
-        advancing = .false.
-      else
-        call submethod%apply(particle, tmax)
-      end if
+      call submethod%apply(particle, tmax)
       call this%try_pass(particle, nextlevel, advancing)
     end do
   end subroutine track
@@ -188,7 +184,6 @@ subroutine save(this, particle, reason)
     end if
 
     call this%trackctl%save(particle, kper=per, kstp=stp, reason=reason)
-
   end subroutine save
 
   !> @brief Check reporting/terminating conditions before tracking.

src/Solution/ParticleTracker/MethodCellTernary.f90

@@ -359,7 +359,7 @@ subroutine vertvelo(this)
     real(DP), allocatable, dimension(:) :: vm0y
     real(DP), allocatable, dimension(:) :: vm1x
     real(DP), allocatable, dimension(:) :: vm1y
-    real(DP), allocatable, dimension(:, :) :: poly
+    ! real(DP), allocatable, dimension(:, :) :: poly
     integer(I4B) :: nvert
 
     select type (cell => this%cell)

src/Solution/ParticleTracker/MethodSubcellTernary.f90

@@ -63,8 +63,6 @@ end subroutine apply_mst
 
   !> @brief Track a particle across a triangular subcell.
   subroutine track_subcell(this, subcell, particle, tmax)
-    ! modules
-    use TdisModule, only: kper, kstp
     ! dummy
     class(MethodSubcellTernaryType), intent(inout) :: this
     class(SubcellTriType), intent(in) :: subcell
@@ -289,10 +287,6 @@ subroutine track_subcell(this, subcell, particle, tmax)
     particle%ttrack = t
     particle%iboundary(3) = exitFace
 
-    ! save previous subcell id and exit face
-    particle%iscp = particle%idomain(3)
-    particle%iscefp = particle%iboundary(3)
-
     call this%save(particle, reason=reason)
   end subroutine track_subcell
 
@@ -358,7 +352,7 @@ subroutine calculate_dt(v1, v2, dx, xL, v, dvdx, &
     vv = v1a
     if (v2a .gt. vv) vv = v2a
     vvv = dva / vv
-    if (vvv .lt. 1.0d-3) then
+    if (vvv .lt. 1.0d-4) then
       zro = tol
       zrom = -zro
       v = v1

src/Solution/ParticleTracker/Particle.f90

@@ -45,8 +45,6 @@ module ParticleModule
     integer(I4B), allocatable, public :: idomain(:) !< tracking domain hierarchy ! TODO: rename to itdomain? idomain
     integer(I4B), allocatable, public :: iboundary(:) !< tracking domain boundaries
     integer(I4B), public :: icp !< previous cell number (reduced)
-    integer(I4B), public :: iscp !< previous subcell number
-    integer(I4B), public :: iscefp !< previous subcell exit face
     integer(I4B), public :: icu !< user cell number
     integer(I4B), public :: ilay !< grid layer
     integer(I4B), public :: izone !< current zone number
@@ -243,8 +241,6 @@ subroutine load_particle(this, store, imdl, iprp, ip)
     this%istopzone = store%istopzone(ip)
     this%idrymeth = store%idrymeth(ip)
     this%icp = 0
-    this%iscp = 0
-    this%iscefp = 0
     this%icu = store%icu(ip)
     this%ilay = store%ilay(ip)
     this%izone = store%izone(ip)

src/Solution/ParticleTracker/TernarySolveTrack.f90

@@ -297,7 +297,6 @@ subroutine solve_coefs(alpi, beti)
 
   !> @brief Step (evaluate) analytically depending on case
   subroutine step_analytical(t, alp, bet)
-    use TdisModule, only: kper
     ! -- dummy
     real(DP), intent(in) :: t
     real(DP) :: alp

src/Timing/tdis.f90

@@ -131,7 +131,6 @@ subroutine tdis_set_counters()
       write (line, fmtvspts) kper, kstp
     case (MNORMAL)
       write (line, fmtspts) cpref, kper, kstp, trim(cend)
-      ! write (line, "(a)") ""
     end select
     if (isim_level >= VALL) &
       call write_message(line)