Skip to content

Convert SPA native python loops to numpy operations #2537

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Convert SPA native python loops to numpy operations #2537

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f04d3a0
convert loops to numpy
dfulu Aug 18, 2025
16af92d
fix numba inference
dfulu Aug 18, 2025
f79e29d
linting
dfulu Aug 19, 2025
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
62 changes: 45 additions & 17 deletions pvlib/spa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,17 @@ def julian_ephemeris_millennium(julian_ephemeris_century):
@jcompile(nopython=True)
def sum_mult_cos_add_mult(arr, x):
# shared calculation used for heliocentric longitude, latitude, and radius
s = 0.
for row in range(arr.shape[0]):
s += arr[row, 0] * np.cos(arr[row, 1] + arr[row, 2] * x)
if USE_NUMBA:
s = 0.
for row in range(arr.shape[0]):
s += arr[row, 0] * np.cos(arr[row, 1] + arr[row, 2] * x)
else:
s = (arr[:, [0]] * np.cos(
arr[:, [1]] + arr[:, [2]] * np.expand_dims(x, axis=0)
)).sum(axis=0)
return s


@jcompile('float64(float64)', nopython=True)
def heliocentric_longitude(jme):
l0 = sum_mult_cos_add_mult(L0, jme)
Expand Down Expand Up @@ -559,22 +565,44 @@ def moon_ascending_longitude(julian_ephemeris_century):
nopython=True)
def longitude_obliquity_nutation(julian_ephemeris_century, x0, x1, x2, x3, x4,
out):
delta_psi_sum = 0.0
delta_eps_sum = 0.0
for row in range(NUTATION_YTERM_ARRAY.shape[0]):
a = NUTATION_ABCD_ARRAY[row, 0]
b = NUTATION_ABCD_ARRAY[row, 1]
c = NUTATION_ABCD_ARRAY[row, 2]
d = NUTATION_ABCD_ARRAY[row, 3]
if USE_NUMBA:
delta_psi_sum = 0.0
delta_eps_sum = 0.0
for row in range(NUTATION_YTERM_ARRAY.shape[0]):
a = NUTATION_ABCD_ARRAY[row, 0]
b = NUTATION_ABCD_ARRAY[row, 1]
c = NUTATION_ABCD_ARRAY[row, 2]
d = NUTATION_ABCD_ARRAY[row, 3]
arg = np.radians(
NUTATION_YTERM_ARRAY[row, 0]*x0 +
NUTATION_YTERM_ARRAY[row, 1]*x1 +
NUTATION_YTERM_ARRAY[row, 2]*x2 +
NUTATION_YTERM_ARRAY[row, 3]*x3 +
NUTATION_YTERM_ARRAY[row, 4]*x4
)
delta_psi_sum += (a + b * julian_ephemeris_century) * np.sin(arg)
delta_eps_sum += (c + d * julian_ephemeris_century) * np.cos(arg)

else:
a = NUTATION_ABCD_ARRAY[:, [0]]
b = NUTATION_ABCD_ARRAY[:, [1]]
c = NUTATION_ABCD_ARRAY[:, [2]]
d = NUTATION_ABCD_ARRAY[:, [3]]
arg = np.radians(
NUTATION_YTERM_ARRAY[row, 0]*x0 +
NUTATION_YTERM_ARRAY[row, 1]*x1 +
NUTATION_YTERM_ARRAY[row, 2]*x2 +
NUTATION_YTERM_ARRAY[row, 3]*x3 +
NUTATION_YTERM_ARRAY[row, 4]*x4
NUTATION_YTERM_ARRAY[:, [0]]*np.expand_dims(x0, axis=0) +
NUTATION_YTERM_ARRAY[:, [1]]*np.expand_dims(x1, axis=0) +
NUTATION_YTERM_ARRAY[:, [2]]*np.expand_dims(x2, axis=0) +
NUTATION_YTERM_ARRAY[:, [3]]*np.expand_dims(x3, axis=0) +
NUTATION_YTERM_ARRAY[:, [4]]*np.expand_dims(x4, axis=0)
)
delta_psi_sum += (a + b * julian_ephemeris_century) * np.sin(arg)
delta_eps_sum += (c + d * julian_ephemeris_century) * np.cos(arg)

delta_psi_sum = (
(a + b * julian_ephemeris_century) * np.sin(arg)
).sum(axis=0)
delta_eps_sum = (
(c + d * julian_ephemeris_century) * np.cos(arg)
).sum(axis=0)

delta_psi = delta_psi_sum*1.0/36000000
delta_eps = delta_eps_sum*1.0/36000000
# seems like we ought to be able to return a tuple here instead
Expand Down
Loading