Skip to content

Commit 7046b88

Browse files
committed
revise release note, don't transform output coords
1 parent e40f102 commit 7046b88

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

doc/ReleaseNotes/develop.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
\item An array out of bounds error for Z-displacement output in inactive cells has been fixed in the CSUB package. Depending on the combination of platform and compiler used to build the program, this could result in crashes.
3333
\item Initialize a few uninitialized variables in the CSUB package. Depending on the combination of platform and compiler used to build the program, this could result in different program behaviour.
3434
\item Add a warning if saving convergence data for the CSUB package when delay beds are not included in a simulation. Also modified the convergence output data so that it is clear that DVMAX and DSTORAGEMAX data and locations are not calculated in this case (by writing `-\,-' to the output file).
35-
\item Previously the PRT model's PRP package required release points to be specified in the model coordinate system (except for the z coordinate via the LOCAL\_Z option). PRT also previously reported pathlines in the model coordinate system. The PRT model now supports coordinate transformations for release point input and pathline output via keyword options for the PRP package, while preserving the existing default model coordinate system. Release point x and y coordinates may now be specified for structured grids with reference to the local rectilinear cell (with coordinates scaled to the unit interval) via the LOCAL\_XY keyword option. The LOCAL\_XY\_OFFSET option, supported for structured or unstructured grids, can be used to locate release point x and y coordinates at an offset from the cell center (with no distance rescaling). A development option DEV\_GLOBAL\_XY is also provided, enabling transformation of release points from (and pathline points to) the global coordinate system for georeferenced grids.
35+
\item Previously the PRT model's PRP package required release points to be specified in the model coordinate system (except for the z coordinate via the LOCAL\_Z option). PRT also previously reported pathlines in the model coordinate system. The PRT model now supports coordinate transformations for release point input and pathline output via keyword options for the PRP package, while preserving the existing default model coordinate system. Release point x and y coordinates may now be specified for structured grids with reference to the local rectilinear cell (with coordinates scaled to the unit interval) via the LOCAL\_XY keyword option. The LOCAL\_XY\_OFFSET option, supported for structured or unstructured grids, can be used to locate release point x and y coordinates at an offset from the cell center (with no distance rescaling).
3636
% \item xxx
3737
\end{itemize}
3838

src/Model/ParticleTracking/prt-prp.f90

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ module PrtPrpModule
8484
procedure :: read_dimensions => prp_read_dimensions
8585
procedure :: prp_read_packagedata
8686
procedure :: release
87-
procedure :: get_release_time
8887
procedure, public :: bnd_obs_supported => prp_obs_supported
8988
procedure, public :: bnd_df_obs => prp_df_obs
9089
end type PrtPrpType
@@ -393,12 +392,12 @@ subroutine release(this, ip, trelease)
393392
integer(I4B) :: irow, icol, ilay, icpl
394393
integer(I4B) :: ic, icu
395394
integer(I4B) :: i, j, k
395+
integer(I4B) :: icoords
396396
integer(I4B) :: np
397397
real(DP) :: x, y, z, xout, yout, zout
398398
real(DP) :: top, bot, hds
399399
real(DP), allocatable :: polyverts(:, :)
400-
character(len=LINELENGTH) :: errmsg
401-
type(ParticleType), pointer :: particle !< particle
400+
type(ParticleType), pointer :: particle
402401

403402
! Increment particle release count
404403
np = this%nparticles + 1
@@ -409,12 +408,14 @@ subroutine release(this, ip, trelease)
409408
icu = this%dis%get_nodeuser(ic)
410409

411410
! Load x/y coordinates and transform if needed
411+
icoords = 0
412412
x = this%rptx(ip)
413413
y = this%rpty(ip)
414414
if (this%icoords == 1 .and. ( &
415415
this%dis%angrot /= DZERO .or. &
416416
this%dis%xorigin /= DZERO .or. &
417417
this%dis%yorigin /= DZERO)) then
418+
icoords = 1
418419
! Transform x and y from global to model coordinates
419420
call transform(x, y, z, &
420421
xout, yout, zout, &
@@ -535,7 +536,7 @@ subroutine release(this, ip, trelease)
535536
particle%ifrctrn = this%ifrctrn
536537
particle%iexmeth = this%iexmeth
537538
particle%iextend = this%iextend
538-
particle%icoords = this%icoords
539+
particle%icoords = icoords
539540
particle%extol = this%extol
540541

541542
! Save particle to the particle store

src/Solution/ParticleTracker/Particle.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ module ParticleModule
7979
integer(I4B), dimension(:), pointer, public, contiguous :: iprp !< index of release package the particle originated in
8080
integer(I4B), dimension(:), pointer, public, contiguous :: irpt !< index of release point in the particle release package the particle originated in
8181
! options
82-
integer(I4B), dimension(:), pointer, public, contiguous :: icoords !< coordinate system to use (0: global, 1: model)
82+
integer(I4B), dimension(:), pointer, public, contiguous :: icoords !< coordinate system to use (0: model, 1: global)
8383
integer(I4B), dimension(:), pointer, public, contiguous :: iexmeth !< method for iterative solution of particle exit location and time in generalized Pollock's method
8484
integer(I4B), dimension(:), pointer, public, contiguous :: iextend !< whether to extend tracking beyond the end of the simulation
8585
integer(I4B), dimension(:), pointer, public, contiguous :: ifrctrn !< force ternary method

0 commit comments

Comments
 (0)