fixes

MODFLOW-USGS · Nov 26, 2024 · c7a0c73 · c7a0c73
1 parent dbced05
commit c7a0c73
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/autotest/__snapshots__/test_prt_dry/test_mf6model[0-prtdry].npy b/autotest/__snapshots__/test_prt_dry/test_mf6model[0-prtdry].npy
diff --git a/autotest/__snapshots__/test_prt_dry/test_mf6model[1-prtdry_drape].npy b/autotest/__snapshots__/test_prt_dry/test_mf6model[1-prtdry_drape].npy
diff --git a/autotest/__snapshots__/test_prt_dry/test_mf6model[2-prtdry_drop].npy b/autotest/__snapshots__/test_prt_dry/test_mf6model[2-prtdry_drop].npy
diff --git a/autotest/__snapshots__/test_prt_dry/test_mf6model[3-prtdry_stop].npy b/autotest/__snapshots__/test_prt_dry/test_mf6model[3-prtdry_stop].npy
diff --git a/autotest/__snapshots__/test_prt_dry/test_mf6model[4-prtdry_stay].npy b/autotest/__snapshots__/test_prt_dry/test_mf6model[4-prtdry_stay].npy
diff --git a/autotest/test_prt_dry.py b/autotest/test_prt_dry.py
@@ -372,7 +372,7 @@ def check_output(idx, test, snapshot):
     mf6pathlines = pd.read_csv(trackcsv_path)
     startpts = mf6pathlines[mf6pathlines.ireason == 0]
 
-    assert snapshot == mf6pathlines.drop("name", axis=1).round(3).to_records(
+    assert snapshot == mf6pathlines.drop(["name", "icell"], axis=1).round(3).to_records(
         index=False
     )
 

diff --git a/src/Solution/ParticleTracker/Method.f90 b/src/Solution/ParticleTracker/Method.f90
@@ -202,13 +202,12 @@ subroutine prepare(this, particle, cell_defn)
     integer(I4B) :: ic
 
     ! stop zone
-    if (cell_defn%izone .ne. 0) then
-      if (particle%istopzone .eq. cell_defn%izone) then
-        particle%advancing = .false.
-        particle%istatus = 6
-        call this%save(particle, reason=3)
-        return
-      end if
+    particle%izone = cell_defn%izone
+    if (cell_defn%izone > 0 .and. particle%istopzone == cell_defn%izone) then
+      particle%advancing = .false.
+      particle%istatus = 6
+      call this%save(particle, reason=3)
+      return
     end if
 
     ! dry
@@ -228,7 +227,7 @@ subroutine prepare(this, particle, cell_defn)
             return
           end if
         else if (locn_dry) then
-          particle%z = this%cell%defn%top
+          particle%z = cell_defn%top
           call this%save(particle, reason=1)
         end if
       else if (particle%idry == 1) then
@@ -244,15 +243,15 @@ subroutine prepare(this, particle, cell_defn)
 
       ! cell with no exit face (mutually exclusive with
       ! dry because a dry cell will have no exit face)
-    else if (cell_defn%inoexitface .ne. 0) then
+    else if (cell_defn%inoexitface > 0) then
       particle%advancing = .false.
       particle%istatus = 5
       call this%save(particle, reason=3)
       return
     end if
 
     ! weak sink
-    if (cell_defn%iweaksink .ne. 0) then
+    if (cell_defn%iweaksink > 0) then
       if (particle%istopweaksink == 0) then
         call this%save(particle, reason=4)
       else