Umstrukturierung

This commit is contained in:
2026-02-05 11:12:17 +01:00
parent 4e2491d967
commit 77c7a6f9ab
3 changed files with 173 additions and 229 deletions

View File

@@ -12,6 +12,33 @@ from numpy.typing import NDArray
from GHA_triaxial.utils import alpha_ell2para, pq_ell
def buildODE(ell: EllipsoidTriaxial) -> Callable:
"""
Aufbau des DGL-Systems
:param ell: Ellipsoid
:return: DGL-System
"""
def ODE(s: float, v: NDArray) -> NDArray:
"""
DGL-System
:param s: unabhängige Variable
:param v: abhängige Variablen
:return: Ableitungen der abhängigen Variablen
"""
x, dxds, y, dyds, z, dzds = v
H = ell.func_H(np.array([x, y, z]))
h = dxds ** 2 + 1 / (1 - ell.ee ** 2) * dyds ** 2 + 1 / (1 - ell.ex ** 2) * dzds ** 2
ddx = -(h / H) * x
ddy = -(h / H) * y / (1 - ell.ee ** 2)
ddz = -(h / H) * z / (1 - ell.ex ** 2)
return np.array([dxds, ddx, dyds, ddy, dzds, ddz])
return ODE
def gha1_num(ell: EllipsoidTriaxial, point: NDArray, alpha0: float, s: float, num: int, all_points: bool = False) -> Tuple[NDArray, float] | Tuple[NDArray, float, List]:
"""
Panou, Korakitits 2019
@@ -34,33 +61,6 @@ def gha1_num(ell: EllipsoidTriaxial, point: NDArray, alpha0: float, s: float, nu
v_init = np.array([x0, dxds0, y0, dyds0, z0, dzds0])
def buildODE(ell: EllipsoidTriaxial) -> Callable:
"""
Aufbau des DGL-Systems
:param ell: Ellipsoid
:return: DGL-System
"""
def ODE(s: float, v: NDArray) -> NDArray:
"""
DGL-System
:param s: unabhängige Variable
:param v: abhängige Variablen
:return: Ableitungen der abhängigen Variablen
"""
x, dxds, y, dyds, z, dzds = v
H = ell.func_H(np.array([x, y, z]))
h = dxds ** 2 + 1 / (1 - ell.ee ** 2) * dyds ** 2 + 1 / (1 - ell.ex ** 2) * dzds ** 2
ddx = -(h / H) * x
ddy = -(h / H) * y / (1 - ell.ee ** 2)
ddz = -(h / H) * z / (1 - ell.ex ** 2)
return np.array([dxds, ddx, dyds, ddy, dzds, ddz])
return ODE
ode = buildODE(ell)
_, werte = rk.rk4(ode, 0, v_init, s, num)