Skip to content

Avoiding more numpy 2.0 deprecation warnings #3049

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

Merged
merged 3 commits into from
Jun 20, 2024
Merged

Avoiding more numpy 2.0 deprecation warnings #3049

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
987f905
make points 3D for cross product calculation
eepeterson Jun 20, 2024
5d63b56
added suggested function for 2D cross product instead
eepeterson Jun 20, 2024
59ecd26
go back to 3D cross products and just pick z component
eepeterson Jun 20, 2024
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
16 changes: 8 additions & 8 deletions openmc/model/surface_composite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,19 +972,19 @@ def _validate_points(self, points):
# Check if polygon is self-intersecting by comparing edges pairwise
n = len(points)
for i in range(n):
p0 = points[i, :]
p1 = points[(i + 1) % n, :]
p0 = np.append(points[i, :], 0)
p1 = np.append(points[(i + 1) % n, :], 0)
for j in range(i + 1, n):
p2 = points[j, :]
p3 = points[(j + 1) % n, :]
p2 = np.append(points[j, :], 0)
p3 = np.append(points[(j + 1) % n, :], 0)
# Compute orientation of p0 wrt p2->p3 line segment
cp0 = np.cross(p3-p0, p2-p0)
cp0 = np.cross(p3-p0, p2-p0)[-1]
# Compute orientation of p1 wrt p2->p3 line segment
cp1 = np.cross(p3-p1, p2-p1)
cp1 = np.cross(p3-p1, p2-p1)[-1]
# Compute orientation of p2 wrt p0->p1 line segment
cp2 = np.cross(p1-p2, p0-p2)
cp2 = np.cross(p1-p2, p0-p2)[-1]
# Compute orientation of p3 wrt p0->p1 line segment
cp3 = np.cross(p1-p3, p0-p3)
cp3 = np.cross(p1-p3, p0-p3)[-1]

# Group cross products in an array and find out how many are 0
cross_products = np.array([[cp0, cp1], [cp2, cp3]])
Expand Down