Skip to content

Commit 4d4ea3d

Browse files
committed
lint
1 parent bd3101a commit 4d4ea3d

2 files changed

Lines changed: 12 additions & 30 deletions

File tree

src/anaflow/flow/_laplace_accel.pyx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ The Python wrapper takes care of all argument validation and prepares the
1111
NumPy arrays that are passed into these routines.
1212
"""
1313

14-
from libc.math cimport fabs, isnan, isinf, sqrt
14+
from libc.math cimport fabs, isinf, isnan, sqrt
1515

1616
import numpy as np
17-
cimport numpy as np
1817

18+
cimport numpy as np
1919
from pentapy.solver cimport c_penta_solver2
20-
from scipy.special.cython_special cimport iv as cy_iv, kv as cy_kv
20+
from scipy.special.cython_special cimport iv as cy_iv
21+
from scipy.special.cython_special cimport kv as cy_kv
2122

2223
ctypedef np.float64_t DTYPE_t
2324
ctypedef np.intp_t ITYPE_t

src/anaflow/flow/laplace.py

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
from anaflow.tools.special import sph_surf
1919

2020
try:
21-
from ._laplace_accel import (
22-
solve_homogeneous as _solve_homogeneous,
23-
solve_multilayer as _solve_multilayer,
24-
)
21+
from ._laplace_accel import solve_homogeneous as _solve_homogeneous
22+
from ._laplace_accel import solve_multilayer as _solve_multilayer
2523
except ImportError as exc: # pragma: no cover - extension is mandatory
2624
raise ImportError(
2725
"anaflow.flow._laplace_accel extension missing. "
@@ -143,15 +141,9 @@ def grf_laplace(
143141
# ensure that input is treated as contiguous arrays
144142
s = np.ascontiguousarray(np.atleast_1d(np.asarray(s, dtype=np.float64)))
145143
rad = np.ascontiguousarray(np.atleast_1d(np.asarray(rad, dtype=np.float64)))
146-
S_part = np.ascontiguousarray(
147-
np.atleast_1d(np.asarray(S_part, dtype=np.float64))
148-
)
149-
K_part = np.ascontiguousarray(
150-
np.atleast_1d(np.asarray(K_part, dtype=np.float64))
151-
)
152-
R_part = np.ascontiguousarray(
153-
np.atleast_1d(np.asarray(R_part, dtype=np.float64))
154-
)
144+
S_part = np.ascontiguousarray(np.atleast_1d(np.asarray(S_part, dtype=np.float64)))
145+
K_part = np.ascontiguousarray(np.atleast_1d(np.asarray(K_part, dtype=np.float64)))
146+
R_part = np.ascontiguousarray(np.atleast_1d(np.asarray(R_part, dtype=np.float64)))
155147

156148
# the dimension is used by nu in the literature (See Barker 88)
157149
dim = float(dim)
@@ -192,24 +184,13 @@ def grf_laplace(
192184
diff_sr0 = float(np.sqrt(S_part[0] / K_part[0]))
193185
cond_vals = np.asarray(pump_cond(s, **cond_kw), dtype=np.float64)
194186
if cond_vals.shape != s.shape:
195-
cond_vals = np.broadcast_to(cond_vals, s.shape).astype(
196-
np.float64, copy=True
197-
)
187+
cond_vals = np.broadcast_to(cond_vals, s.shape).astype(np.float64, copy=True)
198188
cond_vals = np.ascontiguousarray(cond_vals, dtype=np.float64)
199189

200190
if R_part[0] > 0.0:
201-
qs = (
202-
-np.power(s, -0.5)
203-
/ diff_sr0
204-
* R_part[0] ** nu1
205-
* cond_vals
206-
)
191+
qs = -np.power(s, -0.5) / diff_sr0 * R_part[0] ** nu1 * cond_vals
207192
else:
208-
qs = (
209-
-np.power(2.0 / diff_sr0, nu)
210-
* np.power(s, -nu / 2.0)
211-
* cond_vals
212-
)
193+
qs = -np.power(2.0 / diff_sr0, nu) * np.power(s, -nu / 2.0) * cond_vals
213194
qs = np.ascontiguousarray(qs, dtype=np.float64)
214195

215196
difsr = np.ascontiguousarray(np.sqrt(S_part / K_part), dtype=np.float64)

0 commit comments

Comments
 (0)