open-space-toolkit-astrodynamics 2.3.0__py310-none-any.whl → 2.4.1__py310-none-any.whl

{open_space_toolkit_astrodynamics-2.3.0.dist-info → open_space_toolkit_astrodynamics-2.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: open-space-toolkit-astrodynamics
-Version: 2.3.0
+Version: 2.4.1
 Summary: Orbit, attitude, access.
 Author: Open Space Collective
 Author-email: contact@open-space-collective.org

{open_space_toolkit_astrodynamics-2.3.0.dist-info → open_space_toolkit_astrodynamics-2.4.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 ostk/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
-ostk/astrodynamics/OpenSpaceToolkitAstrodynamicsPy.cpython-310-x86_64-linux-gnu.so,sha256=y0rCCK_XdtLAISDIRWH8GbZggNqGtWfe9BJKm06YMZs,1410488
+ostk/astrodynamics/OpenSpaceToolkitAstrodynamicsPy.cpython-310-x86_64-linux-gnu.so,sha256=qCSYF-ewvt5XbiNtkPqrxnJSTwoIHkVnfMeGlVenMX8,1410488
 ostk/astrodynamics/__init__.py,sha256=BE7yyrOnPqFCTPT3GhYEI4IWR5nzs96VSjKphhQ09ew,97
 ostk/astrodynamics/converters.py,sha256=sBZ3_JMjowWbQ9gBPA2cSEkbBfAwXmt1IBbLks76-Vk,3502
 ostk/astrodynamics/display.py,sha256=y9FnoQbPFGM6LzkUdgXgeqtuVGhv57GuTKbeDdcFPgw,6306
-ostk/astrodynamics/libopen-space-toolkit-astrodynamics.so.2,sha256=qzmqePuEfU8J_QV5BKrf88tkEku00y9itRWhXlpiR0g,68236840
+ostk/astrodynamics/libopen-space-toolkit-astrodynamics.so.2,sha256=T_TuCtec8GdjMD4y6RUGDQwbF-YE-opFdCWDAajjo3o,69733560
 ostk/astrodynamics/utilities.py,sha256=NbeKN_CtcCRHIinhoNWTEosBMR7xc924S-ZFD97mduw,4478
 ostk/astrodynamics/viewer.py,sha256=_4uucNtZrIADtKtEYHbiu91RVVvKRG3vPULUAshPLJU,8912
 ostk/astrodynamics/test/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
@@ -38,7 +38,7 @@ ostk/astrodynamics/test/flight/system/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5n
 ostk/astrodynamics/test/flight/system/test_propulsion_system.py,sha256=ei-25MZczwzhiV5QVB9LXdmBY3VnBHr1DEVn_Zqtb1A,1027
 ostk/astrodynamics/test/flight/system/test_satellite_system.py,sha256=-5KOGVTWRIpY1jcRc0xGX6N9oRbUT_EexzB9jZFsZQg,2208
 ostk/astrodynamics/test/flight/system/dynamics/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
-ostk/astrodynamics/test/flight/system/dynamics/test_atmospheric_drag.py,sha256=Dnla3DkzQknZwul5hn0MqYGuKexUbG3AN5FByZaLgVc,4042
+ostk/astrodynamics/test/flight/system/dynamics/test_atmospheric_drag.py,sha256=bTFDvI1riLFlgKzs3TRt8dafFtb--L_AMEDuuRWEgGc,3793
 ostk/astrodynamics/test/flight/system/dynamics/test_central_body_gravity.py,sha256=r3JIIX7cD63BhrgvLtjFaK7ew1BqHdKP5_VxwGmuv1Q,1818
 ostk/astrodynamics/test/flight/system/dynamics/test_dynamics.py,sha256=arNkAOj2y4CDmc9CXxItbFtC4QYjaByuJefdi5S6alw,914
 ostk/astrodynamics/test/flight/system/dynamics/test_position_derivative.py,sha256=ZVVewpqZwqiBLDqoNQDHDgDodtj6_M0J6ZmgHe_1gz8,1646
@@ -51,8 +51,8 @@ ostk/astrodynamics/test/trajectory/test_local_orbital_frame_direction.py,sha256=
 ostk/astrodynamics/test/trajectory/test_local_orbital_frame_factory.py,sha256=FziYh9XxD2FEuj6WhnqOe5mF9twLTQtvcem8KzQZKXg,1864
 ostk/astrodynamics/test/trajectory/test_model.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
 ostk/astrodynamics/test/trajectory/test_orbit.py,sha256=SlCBZ_broPaJ6L8khMuvbdPem9-zmqG6IZwxr9cECB4,3155
-ostk/astrodynamics/test/trajectory/test_propagator.py,sha256=087AXQSsG2yCCOUi2jcfAZCDWc4g-jkPXxc-qG5coS0,9966
-ostk/astrodynamics/test/trajectory/test_state.py,sha256=Ohjc_cQ28XoOtEY4mP-EuyrCKirRf0-RxJNzFVFqiJ4,3699
+ostk/astrodynamics/test/trajectory/test_propagator.py,sha256=e_fmvvaoMhYs0ApqCgbzfBYrYPaGOIuzouo-6x2jbK4,12504
+ostk/astrodynamics/test/trajectory/test_state.py,sha256=Kr4IbGBc1TNGdEOsXFLGSQGC9SwCER-lJ6E-xumqgN4,3829
 ostk/astrodynamics/test/trajectory/test_trajectory_segment.py,sha256=eOCI9GLcAnMrwXkdaHbd0thnyNDCyBgAemhuMO6B7xY,3863
 ostk/astrodynamics/test/trajectory/orbit/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
 ostk/astrodynamics/test/trajectory/orbit/test_model.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
@@ -76,8 +76,8 @@ ostk/astrodynamics/test/trajectory/state/test_coordinates_subset.py,sha256=eMmif
 ostk/astrodynamics/test/trajectory/state/test_numerical_solver.py,sha256=ZTWRSVFOJnjzQP7JDsHZxvZ4ldyDHmXTptG2csC7_ic,7480
 ostk/astrodynamics/test/trajectory/state/coordinates_subset/test_cartesian_position.py,sha256=V5d7UnV6KIJjJvh5R0i3imRfyN04JCDvCUsKdvfKmhE,2708
 ostk/astrodynamics/test/trajectory/state/coordinates_subset/test_cartesian_velocity.py,sha256=5a7yeOVt7gY4oQdINSElb_U2jznJmuWPrT_YJrI6KaM,3070
-open_space_toolkit_astrodynamics-2.3.0.dist-info/METADATA,sha256=mvgYHZGl8ZJIQLDvtsD1FxCFTmArDnmYqdliiacyS6s,1779
-open_space_toolkit_astrodynamics-2.3.0.dist-info/WHEEL,sha256=oaSFssuzKzruaIhyzhbDphpBmFeR9wv-Pmjc-TsXgB4,94
-open_space_toolkit_astrodynamics-2.3.0.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
-open_space_toolkit_astrodynamics-2.3.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-open_space_toolkit_astrodynamics-2.3.0.dist-info/RECORD,,
+open_space_toolkit_astrodynamics-2.4.1.dist-info/METADATA,sha256=DAXVfJGTx8JV0XG2LD28nREtjAXnKGISMsDbD7P4HTY,1779
+open_space_toolkit_astrodynamics-2.4.1.dist-info/WHEEL,sha256=oaSFssuzKzruaIhyzhbDphpBmFeR9wv-Pmjc-TsXgB4,94
+open_space_toolkit_astrodynamics-2.4.1.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
+open_space_toolkit_astrodynamics-2.4.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+open_space_toolkit_astrodynamics-2.4.1.dist-info/RECORD,,

ostk/astrodynamics/test/flight/system/dynamics/test_atmospheric_drag.py

@@ -26,7 +26,11 @@ from ostk.astrodynamics.trajectory.state.coordinates_subset import CartesianVelo
 from ostk.astrodynamics.trajectory.state import CoordinatesBroker
 
 from ostk.astrodynamics.trajectory import State
-from ostk.astrodynamics.flight.system import SatelliteSystem
+from ostk.astrodynamics.trajectory.state import CoordinatesSubset, CoordinatesBroker
+from ostk.astrodynamics.trajectory.state.coordinates_subset import (
+    CartesianPosition,
+    CartesianVelocity,
+)
 from ostk.astrodynamics.flight.system import Dynamics
 from ostk.astrodynamics.flight.system.dynamics import AtmosphericDrag
 
@@ -46,27 +50,18 @@ def dry_mass() -> float:
 
 
 @pytest.fixture
-def satellite_system(dry_mass: float) -> SatelliteSystem:
-    mass = Mass(dry_mass, Mass.Unit.Kilogram)
-    satellite_geometry = Composite(
-        Cuboid(
-            Point(0.0, 0.0, 0.0),
-            [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]],
-            [1.0, 0.0, 0.0],
-        )
-    )
-    inertia_tensor = np.ndarray(shape=(3, 3))
-    surface_area = 500.0
-    drag_coefficient = 2.1
+def surface_area() -> float:
+    return 500.0
 
-    return SatelliteSystem(
-        mass, satellite_geometry, inertia_tensor, surface_area, drag_coefficient
-    )
+
+@pytest.fixture
+def drag_coefficient() -> float:
+    return 2.1
 
 
 @pytest.fixture
-def dynamics(earth: Earth, satellite_system: SatelliteSystem) -> AtmosphericDrag:
-    return AtmosphericDrag(earth, satellite_system)
+def dynamics(earth: Earth) -> AtmosphericDrag:
+    return AtmosphericDrag(earth)
 
 
 @pytest.fixture
@@ -76,6 +71,8 @@ def coordinates_broker() -> CoordinatesBroker:
             CartesianPosition.default(),
             CartesianVelocity.default(),
             CoordinatesSubset.mass(),
+            CoordinatesSubset.surface_area(),
+            CoordinatesSubset.drag_coefficient(),
         ]
     )
 
@@ -101,10 +98,15 @@ def state(
     position_coordinates: list,
     velocity_coordinates: list,
     dry_mass: float,
+    surface_area: float,
+    drag_coefficient: float,
     coordinates_broker: CoordinatesBroker,
 ) -> State:
-    wet_mass = dry_mass + 10.0
-    coordinates = position_coordinates + velocity_coordinates + [wet_mass]
+    coordinates = (
+        position_coordinates
+        + velocity_coordinates
+        + [dry_mass, surface_area, drag_coefficient]
+    )
     return State(instant, coordinates, Frame.GCRF(), coordinates_broker)
 
 
@@ -124,6 +126,3 @@ class TestAtmosphericDrag:
         )
 
         assert len(contribution) == 3
-        assert contribution == pytest.approx(
-            [0.0, -2.53370345e-05, 3.57473816e-12], abs=5e-11
-        )

ostk/astrodynamics/test/trajectory/test_propagator.py

@@ -17,7 +17,10 @@ from ostk.physics.time import Duration
 from ostk.physics.coordinate import Position
 from ostk.physics.coordinate import Velocity
 from ostk.physics.coordinate import Frame
-from ostk.physics.environment.objects.celestial_bodies import Earth
+from ostk.physics.environment.objects.celestial_bodies import Earth, Sun
+from ostk.physics.environment.gravitational import Earth as EarthGravitationalModel
+from ostk.physics.environment.magnetic import Earth as EarthMagneticModel
+from ostk.physics.environment.atmospheric import Earth as EarthAtmosphericModel
 
 from ostk.astrodynamics.trajectory import LocalOrbitalFrameFactory
 from ostk.astrodynamics.trajectory import LocalOrbitalFrameDirection
@@ -34,7 +37,13 @@ from ostk.astrodynamics.flight.system import Dynamics
 from ostk.astrodynamics.flight.system.dynamics import CentralBodyGravity
 from ostk.astrodynamics.flight.system.dynamics.thruster import ConstantThrust
 from ostk.astrodynamics.flight.system.dynamics import PositionDerivative
+from ostk.astrodynamics.flight.system.dynamics import AtmosphericDrag
 from ostk.astrodynamics.trajectory import State
+from ostk.astrodynamics.trajectory.state import CoordinatesSubset, CoordinatesBroker
+from ostk.astrodynamics.trajectory.state.coordinates_subset import (
+    CartesianPosition,
+    CartesianVelocity,
+)
 from ostk.astrodynamics.trajectory import Propagator
 
 from ostk.astrodynamics.event_condition import InstantCondition
@@ -73,17 +82,30 @@ def satellite_system(propulsion_system: PropulsionSystem) -> SatelliteSystem:
 
 
 @pytest.fixture
-def environment() -> Environment:
-    return Environment.default()
+def earth() -> Earth:
+    return Earth.from_models(
+        EarthGravitationalModel(EarthGravitationalModel.Type.EGM96),
+        EarthMagneticModel(EarthMagneticModel.Type.Undefined),
+        EarthAtmosphericModel(EarthAtmosphericModel.Type.Exponential),
+    )
+
+
+@pytest.fixture
+def environment(earth) -> Environment:
+    sun = Sun.default()
+
+    return Environment(Instant.J2000(), [earth, sun])
 
 
 @pytest.fixture
-def coordinates_broker() -> CoordinatesBroker:
+def coordinates_broker():
     return CoordinatesBroker(
         [
             CartesianPosition.default(),
             CartesianVelocity.default(),
             CoordinatesSubset.mass(),
+            CoordinatesSubset.surface_area(),
+            CoordinatesSubset.drag_coefficient(),
         ]
     )
 
@@ -93,7 +115,9 @@ def state(
     satellite_system: SatelliteSystem, coordinates_broker: CoordinatesBroker
 ) -> State:
     instant: Instant = Instant.date_time(DateTime(2018, 1, 1, 0, 0, 0), Scale.UTC)
+
     propellant_mass: float = 10.0
+
     coordinates: list = [
         7500000.0,
         0.0,
@@ -107,11 +131,41 @@ def state(
     return State(instant, coordinates, Frame.GCRF(), coordinates_broker)
 
 
+@pytest.fixture
+def state_low_altitude(
+    satellite_system: SatelliteSystem, coordinates_broker: CoordinatesBroker
+) -> State:
+    instant: Instant = Instant.date_time(DateTime(2018, 1, 1, 0, 0, 0), Scale.UTC)
+
+    propellant_mass: float = 10.0
+    area: float = satellite_system.get_cross_sectional_surface_area()
+    cd: float = satellite_system.get_drag_coefficient()
+
+    coordinates: list = [
+        7000000.0,
+        0.0,
+        0.0,
+        0.0,
+        5335.865450622126,
+        5335.865450622126,
+        satellite_system.get_mass().in_kilograms() + propellant_mass,
+        area,
+        cd,
+    ]
+
+    return State(instant, coordinates, Frame.GCRF(), coordinates_broker)
+
+
 @pytest.fixture
 def central_body_gravity() -> CentralBodyGravity:
     return CentralBodyGravity(Earth.WGS84(20, 0))
 
 
+@pytest.fixture
+def atmospheric_drag(environment, satellite_system) -> AtmosphericDrag:
+    return AtmosphericDrag(environment.access_celestial_object_with_name("Earth"))
+
+
 @pytest.fixture
 def position_derivative() -> PositionDerivative:
     return PositionDerivative()
@@ -135,7 +189,8 @@ def constant_thrust(
 
 @pytest.fixture
 def dynamics(
-    position_derivative: PositionDerivative, central_body_gravity: CentralBodyGravity
+    position_derivative: PositionDerivative,
+    central_body_gravity: CentralBodyGravity,
 ) -> list:
     return [position_derivative, central_body_gravity]
 
@@ -273,6 +328,26 @@ class TestPropagator:
             instant_array.reverse()
             propagator.calculate_states_at(state, instant_array)
 
+    def test_calculate_states_at_with_drag(
+        self,
+        numerical_solver: NumericalSolver,
+        dynamics: list[Dynamics],
+        atmospheric_drag: AtmosphericDrag,
+        state_low_altitude: State,
+    ):
+        propagator: Propagator = Propagator(
+            numerical_solver, dynamics + [atmospheric_drag]
+        )
+
+        instant_array = [
+            Instant.date_time(DateTime(2018, 1, 1, 0, 10, 0), Scale.UTC),
+            Instant.date_time(DateTime(2018, 1, 1, 0, 20, 0), Scale.UTC),
+            Instant.date_time(DateTime(2018, 1, 1, 0, 30, 0), Scale.UTC),
+            Instant.date_time(DateTime(2018, 1, 1, 0, 40, 0), Scale.UTC),
+        ]
+
+        _ = propagator.calculate_states_at(state_low_altitude, instant_array)
+
     def test_calculate_states_at_with_thrust(
         self,
         numerical_solver: NumericalSolver,

ostk/astrodynamics/test/trajectory/test_state.py

@@ -102,6 +102,7 @@ class TestState:
         position: Position,
         velocity: Velocity,
         frame: Frame,
+        coordinates_broker: CoordinatesBroker,
     ):
         assert state.get_instant() == instant
         assert state.get_position() == position
@@ -111,6 +112,7 @@ class TestState:
             state.get_coordinates()
             == np.append(position.get_coordinates(), velocity.get_coordinates())
         ).all()
+        assert state.get_coordinates_subsets() == coordinates_broker.get_subsets()
 
     def test_in_frame(
         self,