diff --git a/autotest/__snapshots__/test_prt_dry/test_mf6model[0-prtdry].npy b/autotest/__snapshots__/test_prt_dry/test_mf6model[0-prtdry].npy index 052d8c9e320..5e8e184fe31 100644 Binary files a/autotest/__snapshots__/test_prt_dry/test_mf6model[0-prtdry].npy and b/autotest/__snapshots__/test_prt_dry/test_mf6model[0-prtdry].npy differ 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 index bae56af52fc..96e72cc2257 100644 Binary files a/autotest/__snapshots__/test_prt_dry/test_mf6model[1-prtdry_drape].npy and b/autotest/__snapshots__/test_prt_dry/test_mf6model[1-prtdry_drape].npy differ 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 index 34e1279aa13..d3fbb3a186b 100644 Binary files a/autotest/__snapshots__/test_prt_dry/test_mf6model[2-prtdry_drop].npy and b/autotest/__snapshots__/test_prt_dry/test_mf6model[2-prtdry_drop].npy differ 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 index 4068651815b..ff9b2023675 100644 Binary files a/autotest/__snapshots__/test_prt_dry/test_mf6model[3-prtdry_stop].npy and b/autotest/__snapshots__/test_prt_dry/test_mf6model[3-prtdry_stop].npy differ 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 index 71917592aa6..f29364335ea 100644 Binary files a/autotest/__snapshots__/test_prt_dry/test_mf6model[4-prtdry_stay].npy and b/autotest/__snapshots__/test_prt_dry/test_mf6model[4-prtdry_stay].npy differ diff --git a/autotest/test_prt_dry.py b/autotest/test_prt_dry.py index bfcac8787f2..e4fe767b0a4 100644 --- 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 index 23528e68c75..4c01f63e434 100644 --- 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,7 +243,7 @@ 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) @@ -252,7 +251,7 @@ subroutine prepare(this, particle, cell_defn) 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