Skip to content

Commit

Permalink
name fix
Browse files Browse the repository at this point in the history
  • Loading branch information
s-m-e committed Feb 2, 2024
1 parent 8929622 commit 81957b9
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/hapsira/core/math/ivp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = [
Expand 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",
]
10 changes: 5 additions & 5 deletions src/hapsira/core/math/ivp/_rkdenseinterp.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@


__all__ = [
"dense_interp_brentq_hb",
"dense_interp_hf",
"dop853_dense_interp_brentq_hb",
"dop853_dense_interp_hf",
"DENSE_SIG",
]

Expand All @@ -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.
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/hapsira/core/math/ivp/_rkdenseoutput.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ...jit import hjit, DSIG

__all__ = [
"dense_output_hf",
"dop853_dense_output_hf",
]


Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/hapsira/core/math/ivp/_solve.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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],
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/hapsira/twobody/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit 81957b9

Please sign in to comment.