From 81957b9847fe1b9d6eee81f70e3fcc9d7703e97a Mon Sep 17 00:00:00 2001 From: "Sebastian M. Ernst" Date: Fri, 2 Feb 2024 12:52:58 +0100 Subject: [PATCH] name fix --- src/hapsira/core/math/ivp/__init__.py | 6 +++--- src/hapsira/core/math/ivp/_rkdenseinterp.py | 10 +++++----- src/hapsira/core/math/ivp/_rkdenseoutput.py | 4 ++-- src/hapsira/core/math/ivp/_solve.py | 8 ++++---- src/hapsira/twobody/events.py | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/hapsira/core/math/ivp/__init__.py b/src/hapsira/core/math/ivp/__init__.py index f918f2b4d..173e3926d 100644 --- a/src/hapsira/core/math/ivp/__init__.py +++ b/src/hapsira/core/math/ivp/__init__.py @@ -8,7 +8,7 @@ BRENTQ_MAXITER, brentq_hf, ) -from ._rkdenseinterp import dense_interp_brentq_hb, dense_interp_hf +from ._rkdenseinterp import dop853_dense_interp_brentq_hb, dop853_dense_interp_hf from ._solve import solve_ivp __all__ = [ @@ -20,7 +20,7 @@ "BRENTQ_RTOL", "BRENTQ_MAXITER", "brentq_hf", - "dense_interp_brentq_hb", - "dense_interp_hf", + "dop853_dense_interp_brentq_hb", + "dop853_dense_interp_hf", "solve_ivp", ] diff --git a/src/hapsira/core/math/ivp/_rkdenseinterp.py b/src/hapsira/core/math/ivp/_rkdenseinterp.py index 9c6aa442b..2d1e7288a 100644 --- a/src/hapsira/core/math/ivp/_rkdenseinterp.py +++ b/src/hapsira/core/math/ivp/_rkdenseinterp.py @@ -4,8 +4,8 @@ __all__ = [ - "dense_interp_brentq_hb", - "dense_interp_hf", + "dop853_dense_interp_brentq_hb", + "dop853_dense_interp_hf", "DENSE_SIG", ] @@ -14,7 +14,7 @@ @hjit(f"Tuple([V,V])(f,{DENSE_SIG:s})") -def dense_interp_hf(t, t_old, h, rr_old, vv_old, F): +def dop853_dense_interp_hf(t, t_old, h, rr_old, vv_old, F): """ Local interpolant over step made by an ODE solver. Evaluate the interpolant. @@ -74,10 +74,10 @@ def dense_interp_hf(t, t_old, h, rr_old, vv_old, F): return rr_new, vv_new -def dense_interp_brentq_hb(func): +def dop853_dense_interp_brentq_hb(func): @hjit(f"f(f,{DENSE_SIG:s},f)", cache=False) def event_wrapper(t, t_old, h, rr_old, vv_old, F, argk): - rr, vv = dense_interp_hf(t, t_old, h, rr_old, vv_old, F) + rr, vv = dop853_dense_interp_hf(t, t_old, h, rr_old, vv_old, F) return func(t, rr, vv, argk) return event_wrapper diff --git a/src/hapsira/core/math/ivp/_rkdenseoutput.py b/src/hapsira/core/math/ivp/_rkdenseoutput.py index 984aadfa7..c5ee39ef7 100644 --- a/src/hapsira/core/math/ivp/_rkdenseoutput.py +++ b/src/hapsira/core/math/ivp/_rkdenseoutput.py @@ -9,7 +9,7 @@ from ...jit import hjit, DSIG __all__ = [ - "dense_output_hf", + "dop853_dense_output_hf", ] @@ -24,7 +24,7 @@ @hjit(f"Tuple([f,f,V,V,{FSIG:s}])(F({DSIG:s}),f,f,f,f,V,V,V,V,V,V,{KSIG:s})") -def dense_output_hf(fun, argk, t_old, t, h, rr, vv, rr_old, vv_old, fr, fv, K): +def dop853_dense_output_hf(fun, argk, t_old, t, h, rr, vv, rr_old, vv_old, fr, fv, K): """Compute a local interpolant over the last successful step. Returns diff --git a/src/hapsira/core/math/ivp/_solve.py b/src/hapsira/core/math/ivp/_solve.py index 4e6669819..247190ff9 100644 --- a/src/hapsira/core/math/ivp/_solve.py +++ b/src/hapsira/core/math/ivp/_solve.py @@ -22,8 +22,8 @@ DOP853_VV, DOP853_VV_OLD, ) -from ._rkdenseinterp import dense_interp_hf -from ._rkdenseoutput import dense_output_hf +from ._rkdenseinterp import dop853_dense_interp_hf +from ._rkdenseoutput import dop853_dense_output_hf from ..ieee754 import EPS from ...jit import hjit @@ -205,7 +205,7 @@ def solve_ivp( t_old = solver[DOP853_T_OLD] t = solver[DOP853_T] - interpolant = dense_output_hf( + interpolant = dop853_dense_output_hf( solver[DOP853_FUN], solver[DOP853_ARGK], solver[DOP853_T_OLD], @@ -270,6 +270,6 @@ def ode_solution( """ idx = np.searchsorted(ts, t, side="left") segment = min(max(idx - 1, 0), len(interpolants) - 1) - return dense_interp_hf(t, *interpolants[segment]) + return dop853_dense_interp_hf(t, *interpolants[segment]) return ode_solution, status >= 0 diff --git a/src/hapsira/twobody/events.py b/src/hapsira/twobody/events.py index 6b0783e3b..6b60ccdb0 100644 --- a/src/hapsira/twobody/events.py +++ b/src/hapsira/twobody/events.py @@ -6,7 +6,7 @@ from astropy.coordinates import get_body_barycentric_posvel from hapsira.core.jit import hjit -from hapsira.core.math.ivp import dense_interp_brentq_hb +from hapsira.core.math.ivp import dop853_dense_interp_brentq_hb from hapsira.core.math.linalg import mul_Vs_hf, norm_V_hf from hapsira.core.events import ( eclipse_function_hf, @@ -78,7 +78,7 @@ def impl_dense_hf(self) -> Callable: return self._impl_dense_hf def _wrap(self): - self._impl_dense_hf = dense_interp_brentq_hb(self._impl_hf) + self._impl_dense_hf = dop853_dense_interp_brentq_hb(self._impl_hf) class AltitudeCrossEvent(BaseEvent):