Skip to content

Remove unnecessary data copying in scan_for_crit #46

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
kpentland merged 1 commit into from
Oct 6, 2025
Merged

Remove unnecessary data copying in scan_for_crit #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions freegs4e/critical.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def find_critical(


# # this is 10x faster if the numba import works; otherwise, @njit is the identity and fastcrit is 3x faster anyways
@njit(fastmath=True, cache=True)
@njit(cache=True, fastmath=True)
def scan_for_crit(R, Z, psi):
"""
Finds the critical points in the total poloidal flux map ψ.
Expand All @@ -355,9 +355,8 @@ def scan_for_crit(R, Z, psi):

dR = R[1, 0] - R[0, 0]
dZ = Z[0, 1] - Z[0, 0]
Bp2 = np.zeros_like(psi)
psiR = Bp2.copy()
psiZ = Bp2.copy()
psiR = np.zeros_like(psi)
psiZ = np.zeros_like(psi)
psiR[1:-1, 1:-1] = 0.5 * (psi[2:, 1:-1] - psi[:-2, 1:-1]) / dR
psiZ[1:-1, 1:-1] = 0.5 * (psi[1:-1, 2:] - psi[1:-1, :-2]) / dZ
#
Expand All @@ -366,7 +365,7 @@ def scan_for_crit(R, Z, psi):
# psiR[1:-1,0]=(psi[1:,0]-psi[:-1,0])/dR
# psiR[1:-1,-1]=(psi[1:,-1]-psi[:-1,-0])/dR
#
Bp2[:, :] = psiR**2 + psiZ**2 # /R[:,:]**2
Bp2 = psiR**2 + psiZ**2 # /R[:,:]**2
#
xpoint = [(-999.0, -999.0, -999.0)]
opoint = [(-999.0, -999.0, -999.0)]
Expand Down