Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: don't colorize pixels that are not completely within the data domain in pixelize_cylinder routine #3818

Merged
merged 2 commits into from
Apr 14, 2022
Merged

BUG: don't colorize pixels that are not completely within the data domain in pixelize_cylinder routine #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f72e68d
BUG: don't colorize pixels that are not completely within the data do…
neutrinoceros Feb 19, 2022
ba99c1e
bump answers
neutrinoceros Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ answer_tests:
- yt/frontends/ytdata/tests/test_old_outputs.py:test_old_profile_data
- yt/frontends/ytdata/tests/test_old_outputs.py:test_old_nonspatial_data

local_axialpix_008: # PR 3628
local_axialpix_009: # PR 3818
- yt/geometry/coordinates/tests/test_axial_pixelization.py:test_axial_pixelization

local_cylindrical_background_013: # PR 3859
local_cylindrical_background_014: # PR 3818
- yt/geometry/coordinates/tests/test_cylindrical_coordinates.py:test_noise_plots

local_spherical_background_007: # PR 3859
local_spherical_background_008: # PR 3818
- yt/geometry/coordinates/tests/test_spherical_coordinates.py:test_noise_plots

#local_particle_trajectory_001:
Expand Down
48 changes: 44 additions & 4 deletions yt/utilities/lib/pixelization_routines.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,19 +528,29 @@ def pixelize_cylinder(np.float64_t[:,:] buff,
extents):

cdef np.float64_t x, y, dx, dy, r0, theta0
cdef np.float64_t rmax, x0, y0, x1, y1
cdef np.float64_t rmin, rmax, tmin, tmax, x0, y0, x1, y1, xp, yp
cdef np.float64_t r_i, theta_i, dr_i, dtheta_i
cdef np.float64_t r_inc, theta_inc
cdef np.float64_t costheta, sintheta
cdef int i, pi, pj
cdef int i, i1, pi, pj

cdef int imax = np.asarray(radius).argmax()
cdef int imin, imax
imin = np.asarray(radius).argmin()
imax = np.asarray(radius).argmax()
rmin = radius[imin] - dradius[imin]
rmax = radius[imax] + dradius[imax]

imin = np.asarray(theta).argmin()
imax = np.asarray(theta).argmax()
tmin = theta[imin] - dtheta[imin]
tmax = theta[imax] + dtheta[imax]

x0, x1, y0, y1 = extents
dx = (x1 - x0) / buff.shape[0]
dy = (y1 - y0) / buff.shape[1]
cdef np.float64_t rbounds[2]
cdef np.float64_t prbounds[2]
cdef np.float64_t ptbounds[2]
cdef np.float64_t corners[8]
# Find our min and max r
corners[0] = x0*x0+y0*y0
Expand Down Expand Up @@ -590,7 +600,37 @@ def pixelize_cylinder(np.float64_t[:,:] buff,
pj = <int>((y - y0)/dy)
if pi >= 0 and pi < buff.shape[0] and \
pj >= 0 and pj < buff.shape[1]:
buff[pi, pj] = field[i]
# we got a pixel that intersects the grid cell
# now check that this pixel doesn't go beyond the data domain
xp = x0 + pi*dx
yp = y0 + pj*dy
corners[0] = xp*xp + yp*yp
corners[1] = xp*xp + (yp+dy)**2
corners[2] = (xp+dx)**2 + yp*yp
corners[3] = (xp+dx)**2 + (yp+dy)**2
prbounds[0] = prbounds[1] = corners[3]
for i1 in range(3):
prbounds[0] = fmin(prbounds[0], corners[i1])
prbounds[1] = fmax(prbounds[1], corners[i1])
prbounds[0] = math.sqrt(prbounds[0])
prbounds[1] = math.sqrt(prbounds[1])

corners[0] = math.atan2(xp, yp)
corners[1] = math.atan2(xp, yp+dy)
corners[2] = math.atan2(xp+dx, yp)
corners[3] = math.atan2(xp+dx, yp+dy)
ptbounds[0] = ptbounds[1] = corners[3]
for i1 in range(3):
ptbounds[0] = fmin(ptbounds[0], corners[i1])
ptbounds[1] = fmax(ptbounds[1], corners[i1])

# shift to a [0, PI] interval
ptbounds[0] = ptbounds[0] % (2*np.pi)
ptbounds[1] = ptbounds[1] % (2*np.pi)

if prbounds[0] >= rmin and prbounds[1] <= rmax and \
ptbounds[0] >= tmin and ptbounds[1] <= tmax:
buff[pi, pj] = field[i]
r_i += r_inc
theta_i += theta_inc

Expand Down