kiam-astro 3.0.0__tar.gz → 3.0.2__tar.gz

{kiam_astro-3.0.0 → kiam_astro-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kiam_astro
-Version: 3.0.0
+Version: 3.0.2
 Summary: KIAM Astrodynamics Toolbox
 Home-page: https://github.com/shmaxg/KIAMToolbox
 Author: Maksim Shirobokov
@@ -20,7 +20,7 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Fortran
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: == 3.9
+Requires-Python: >=3.9.0, <=3.9.16
 License-File: LICENSE
 
 Astrodynamics toolbox made in Keldysh Institute of Applied Mathematics for preliminary space mission analysis.

{kiam_astro-3.0.0 → kiam_astro-3.0.2}/kiam_astro/engine.py

@@ -38,12 +38,12 @@ class SPT50(Engine):
         self.engine_type = 'electric'
 
         self.propellant = 'Xe'
-        self.discharge_voltage = 180  # V
+        self.discharge_voltage = 180.0  # V
         self.discharge_current = 1.25  # A
-        self.discharge_power = 225  # W
+        self.discharge_power = 225.0  # W
 
         self.force = 14.0e-03  # N
-        self.specific_impulse = 860  # s
+        self.specific_impulse = 860.0  # s
         self.power_to_thrust_ratio = 16.1e+03  # W/N
         self.min_lifetime_h = 1217/24  # days
         self.min_lifetime_cycles = 3011  # cycles
@@ -63,12 +63,12 @@ class SPT50M(Engine):
 
             self.propellant = 'Xe'
 
-            self.discharge_voltage = 180  # V
+            self.discharge_voltage = 180.0  # V
             self.discharge_current = 1.25  # A
-            self.discharge_power = 225  # W
+            self.discharge_power = 225.0  # W
 
             self.force = 14.8e-03  # N
-            self.specific_impulse = 930  # s
+            self.specific_impulse = 930.0  # s
             self.power_to_thrust_ratio = 15.2e+03  # W/N
             self.min_lifetime_h = 5000/24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -79,12 +79,12 @@ class SPT50M(Engine):
 
             self.propellant = 'Xe'
 
-            self.discharge_voltage = 300  # V
+            self.discharge_voltage = 300.0  # V
             self.discharge_current = 1.0  # A
-            self.discharge_power = 300  # W
+            self.discharge_power = 300.0  # W
 
             self.force = 18.0e-03  # N
-            self.specific_impulse = 1250  # s
+            self.specific_impulse = 1250.0  # s
             self.power_to_thrust_ratio = 16.7e+03  # W/N
             self.min_lifetime_h = 5000 / 24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -102,12 +102,12 @@ class SPT70(Engine):
 
         self.propellant = 'Xe'
 
-        self.discharge_voltage = 300  # V
+        self.discharge_voltage = 300.0  # V
         self.discharge_current = 2.23  # A
-        self.discharge_power = 670  # W
+        self.discharge_power = 670.0  # W
 
         self.force = 39.0e-03  # N
-        self.specific_impulse = 1470  # s
+        self.specific_impulse = 1470.0  # s
         self.power_to_thrust_ratio = 16.1e+03  # W/N
         self.min_lifetime_h = 3100 / 24  # days
         self.min_lifetime_cycles = 3000  # cycles
@@ -127,12 +127,12 @@ class SPT70M(Engine):
 
             self.propellant = 'Xe'
 
-            self.discharge_voltage = 300  # V
+            self.discharge_voltage = 300.0  # V
             self.discharge_current = 2.00  # A
-            self.discharge_power = 600  # W
+            self.discharge_power = 600.0  # W
 
             self.force = 36.0e-03  # N
-            self.specific_impulse = 1430  # s
+            self.specific_impulse = 1430.0  # s
             self.power_to_thrust_ratio = 15.2e+03  # W/N
             self.min_lifetime_h = 7000 / 24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -143,12 +143,12 @@ class SPT70M(Engine):
 
             self.propellant = 'Xe'
 
-            self.discharge_voltage = 300  # V
+            self.discharge_voltage = 300.0  # V
             self.discharge_current = 2.67  # A
-            self.discharge_power = 800  # W
+            self.discharge_power = 800.0  # W
 
             self.force = 48.0e-03  # N
-            self.specific_impulse = 1530  # s
+            self.specific_impulse = 1530.0  # s
             self.power_to_thrust_ratio = 16.7e+03  # W/N
             self.min_lifetime_h = 7000 / 24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -159,12 +159,12 @@ class SPT70M(Engine):
 
             self.propellant = 'Xe'
 
-            self.discharge_voltage = 300  # V
+            self.discharge_voltage = 300.0  # V
             self.discharge_current = 3.33  # A
-            self.discharge_power = 1000  # W
+            self.discharge_power = 1000.0  # W
 
             self.force = 59.0e-03  # N
-            self.specific_impulse = 1600  # s
+            self.specific_impulse = 1600.0  # s
             self.power_to_thrust_ratio = 16.9e+03  # W/N
             self.min_lifetime_h = 7000 / 24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -175,12 +175,12 @@ class SPT70M(Engine):
 
             self.propellant = 'Kr'
 
-            self.discharge_voltage = 300  # V
+            self.discharge_voltage = 300.0  # V
             self.discharge_current = 2.00  # A
-            self.discharge_power = 600  # W
+            self.discharge_power = 600.0  # W
 
             self.force = 28.0e-03  # N
-            self.specific_impulse = 1380  # s
+            self.specific_impulse = 1380.0  # s
             self.power_to_thrust_ratio = 21.4e+03  # W/N
             self.min_lifetime_h = 7000 / 24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -191,12 +191,12 @@ class SPT70M(Engine):
 
             self.propellant = 'Kr'
 
-            self.discharge_voltage = 300  # V
+            self.discharge_voltage = 300.0  # V
             self.discharge_current = 2.67  # A
-            self.discharge_power = 800  # W
+            self.discharge_power = 800.0  # W
 
             self.force = 37.0e-03  # N
-            self.specific_impulse = 1490  # s
+            self.specific_impulse = 1490.0  # s
             self.power_to_thrust_ratio = 21.6e+03  # W/N
             self.min_lifetime_h = 7000 / 24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -207,12 +207,12 @@ class SPT70M(Engine):
 
             self.propellant = 'Kr'
 
-            self.discharge_voltage = 300  # V
+            self.discharge_voltage = 300.0  # V
             self.discharge_current = 3.33  # A
-            self.discharge_power = 1000  # W
+            self.discharge_power = 1000.0  # W
 
             self.force = 47.0e-03  # N
-            self.specific_impulse = 1560  # s
+            self.specific_impulse = 1560.0  # s
             self.power_to_thrust_ratio = 21.3e+03  # W/N
             self.min_lifetime_h = 7000 / 24  # days
             self.min_lifetime_cycles = 11000  # cycles
@@ -234,12 +234,12 @@ class SPT100B(Engine):
 
         self.propellant = 'Xe'
 
-        self.discharge_voltage = 300  # V
+        self.discharge_voltage = 300.0  # V
         self.discharge_current = 4.5  # A
-        self.discharge_power = 1350  # W
+        self.discharge_power = 1350.0  # W
 
         self.force = 83.0e-03  # N
-        self.specific_impulse = 1540  # s
+        self.specific_impulse = 1540.0  # s
         self.efficiency = 0.45
         self.power_to_thrust_ratio = 16.3e+03  # W/N
         self.min_lifetime_h = 9000 / 24  # days
@@ -258,12 +258,12 @@ class SPT100BM(Engine):
 
         self.propellant = 'Xe'
 
-        self.discharge_voltage = 300  # V
+        self.discharge_voltage = 300.0  # V
         self.discharge_current = 4.5  # A
-        self.discharge_power = 1350  # W
+        self.discharge_power = 1350.0  # W
 
         self.force = 90.0e-03  # N
-        self.specific_impulse = 1600  # s
+        self.specific_impulse = 1600.0  # s
         self.efficiency = 0.52
         self.power_to_thrust_ratio = 15.0e+03  # W/N
         self.min_lifetime_h = 9000 / 24  # days
@@ -282,12 +282,12 @@ class SPT140D(Engine):
 
         self.propellant = 'Xe'
 
-        self.discharge_voltage = 300  # V
-        self.discharge_current = 15  # A
-        self.discharge_power = 4500  # W
+        self.discharge_voltage = 300.0  # V
+        self.discharge_current = 15.0  # A
+        self.discharge_power = 4500.0  # W
 
         self.force = 290.0e-03  # N
-        self.specific_impulse = 1750  # s
+        self.specific_impulse = 1750.0  # s
         self.efficiency = 0.53
         self.power_to_thrust_ratio = 15.5e+03  # W/N
         self.min_lifetime_h = 15000 / 24  # days

{kiam_astro-3.0.0 → kiam_astro-3.0.2}/kiam_astro/kiam.py

@@ -3042,7 +3042,7 @@ def lvlh2mer(xlvlh: numpy.ndarray, lat: float, lon: float) -> numpy.ndarray:
             return FKIAMToolbox.transformations.xmer_mat
 def b1crs2b2crs(body1: str, body2: str, xb1crs: numpy.ndarray, jd: Union[float, numpy.ndarray], dist_unit: float, vel_unit: float) -> numpy.ndarray:
     """
-    Translate phase vectors from one CRS c/s to other CRS c/s.
+    Translate phase vectors from one CRS c/s to another CRS c/s.
 
     Parameters:
     -----------
@@ -3050,10 +3050,14 @@ def b1crs2b2crs(body1: str, body2: str, xb1crs: numpy.ndarray, jd: Union[float,
 
     The name of the first body.
 
+    Options: 'sun', 'mercury', 'venus', 'earth', 'moon', 'mars', 'jupiter', 'saturn', 'uranus', 'neptune'.
+
     `body2` : str
 
     The name of the second (target) body.
 
+    Options: 'sun', 'mercury', 'venus', 'earth', 'moon', 'mars', 'jupiter', 'saturn', 'uranus', 'neptune'.
+
     `xb1crs` : numpy.ndarray, shape (6,), (6,n)
 
     6D vector or array of 6D column phase vectors in the CRS coordinate system of body1.
@@ -3620,6 +3624,26 @@ def nbp_rv_earth(t: float, s: numpy.ndarray, stm_req: bool, sources: dict, data:
 
     'RMoon'    (The radius of the Moon in the units of distance)
 
+    'SunGM'    (The nondimensional gravitational parameter of the Sun)
+
+    'MercuryGM'    (The nondimensional gravitational parameter of Mercury)
+
+    'VenusGM'    (The nondimensional gravitational parameter of Venus)
+
+    'EarthGM'    (The nondimensional gravitational parameter of the Earth)
+
+    'MoonGM'    (The nondimensional gravitational parameter of the Moon)
+
+    'MarsGM'    (The nondimensional gravitational parameter of Mars)
+
+    'JupiterGM'    (The nondimensional gravitational parameter of Jupiter)
+
+    'SaturnGM'    (The nondimensional gravitational parameter of Saturn)
+
+    'UranusGM'    (The nondimensional gravitational parameter of Uranus)
+
+    'NeptuneGM'    (The nondimensional gravitational parameter of Neptune)
+
     The units dictionary can be created by the kiam.prepare_units_dict() function.
 
     The gravitational parameter in the specified units should be 1.0.
@@ -3771,6 +3795,26 @@ def nbp_rv_moon(t: float, s: numpy.ndarray, stm_req: bool, sources: dict, data:
 
     'RMoon'    (The radius of the Moon in the units of distance)
 
+    'SunGM'    (The nondimensional gravitational parameter of the Sun)
+
+    'MercuryGM'    (The nondimensional gravitational parameter of Mercury)
+
+    'VenusGM'    (The nondimensional gravitational parameter of Venus)
+
+    'EarthGM'    (The nondimensional gravitational parameter of the Earth)
+
+    'MoonGM'    (The nondimensional gravitational parameter of the Moon)
+
+    'MarsGM'    (The nondimensional gravitational parameter of Mars)
+
+    'JupiterGM'    (The nondimensional gravitational parameter of Jupiter)
+
+    'SaturnGM'    (The nondimensional gravitational parameter of Saturn)
+
+    'UranusGM'    (The nondimensional gravitational parameter of Uranus)
+
+    'NeptuneGM'    (The nondimensional gravitational parameter of Neptune)
+
     The units dictionary can be created by the kiam.prepare_units_dict() function.
 
     The gravitational parameter in the specified units should be 1.0.
@@ -3949,6 +3993,26 @@ def nbp_ee_earth(t: float, s: numpy.ndarray, stm_req: bool, sources: dict, data:
 
     'RMoon'    (The radius of the Moon in the units of distance)
 
+    'SunGM'    (The nondimensional gravitational parameter of the Sun)
+
+    'MercuryGM'    (The nondimensional gravitational parameter of Mercury)
+
+    'VenusGM'    (The nondimensional gravitational parameter of Venus)
+
+    'EarthGM'    (The nondimensional gravitational parameter of the Earth)
+
+    'MoonGM'    (The nondimensional gravitational parameter of the Moon)
+
+    'MarsGM'    (The nondimensional gravitational parameter of Mars)
+
+    'JupiterGM'    (The nondimensional gravitational parameter of Jupiter)
+
+    'SaturnGM'    (The nondimensional gravitational parameter of Saturn)
+
+    'UranusGM'    (The nondimensional gravitational parameter of Uranus)
+
+    'NeptuneGM'    (The nondimensional gravitational parameter of Neptune)
+
     The units dictionary can be created by the kiam.prepare_units_dict() function.
 
     The gravitational parameter in the specified units should be 1.0.
@@ -4126,6 +4190,26 @@ def nbp_ee_moon(t: float, s: numpy.ndarray, stm_req: bool, sources: dict, data:
 
     'RMoon'    (The radius of the Moon in the units of distance)
 
+    'SunGM'    (The nondimensional gravitational parameter of the Sun)
+
+    'MercuryGM'    (The nondimensional gravitational parameter of Mercury)
+
+    'VenusGM'    (The nondimensional gravitational parameter of Venus)
+
+    'EarthGM'    (The nondimensional gravitational parameter of the Earth)
+
+    'MoonGM'    (The nondimensional gravitational parameter of the Moon)
+
+    'MarsGM'    (The nondimensional gravitational parameter of Mars)
+
+    'JupiterGM'    (The nondimensional gravitational parameter of Jupiter)
+
+    'SaturnGM'    (The nondimensional gravitational parameter of Saturn)
+
+    'UranusGM'    (The nondimensional gravitational parameter of Uranus)
+
+    'NeptuneGM'    (The nondimensional gravitational parameter of Neptune)
+
     The units dictionary can be created by the kiam.prepare_units_dict() function.
 
     The gravitational parameter in the specified units should be 1.0.
@@ -4177,7 +4261,7 @@ def nbp_ee_moon(t: float, s: numpy.ndarray, stm_req: bool, sources: dict, data:
         return FKIAMToolbox.equationsmodule.knbp_ee_moon(t, s)
 def nbp_rv_body(body: str, t: float, s: numpy.ndarray, stm_req: bool, sources: dict, data: dict, units_data: dict) -> numpy.ndarray:
     """
-    Right-hand side of the n-body problem equations of motion wrt the specified body (except Earth and Moon) in terms of
+    Right-hand side of the n-body problem equations of motion wrt the specified body in terms of
     the position and velocity variables.
 
     Parameters:
@@ -4277,6 +4361,26 @@ def nbp_rv_body(body: str, t: float, s: numpy.ndarray, stm_req: bool, sources: d
 
     'RMoon'    (The radius of the Moon in the units of distance)
 
+    'SunGM'    (The nondimensional gravitational parameter of the Sun)
+
+    'MercuryGM'    (The nondimensional gravitational parameter of Mercury)
+
+    'VenusGM'    (The nondimensional gravitational parameter of Venus)
+
+    'EarthGM'    (The nondimensional gravitational parameter of the Earth)
+
+    'MoonGM'    (The nondimensional gravitational parameter of the Moon)
+
+    'MarsGM'    (The nondimensional gravitational parameter of Mars)
+
+    'JupiterGM'    (The nondimensional gravitational parameter of Jupiter)
+
+    'SaturnGM'    (The nondimensional gravitational parameter of Saturn)
+
+    'UranusGM'    (The nondimensional gravitational parameter of Uranus)
+
+    'NeptuneGM'    (The nondimensional gravitational parameter of Neptune)
+
     The units dictionary can be created by the kiam.prepare_units_dict() function.
 
     The gravitational parameter in the specified units should be 1.0.
@@ -4324,6 +4428,7 @@ def nbp_rv_body(body: str, t: float, s: numpy.ndarray, stm_req: bool, sources: d
     """
     _set_nbp_parameters(stm_req, sources, data, units_data)
     with _package_folder_contex():
+        FKIAMToolbox.equationsmodule.central_body = body.capitalize()
         return FKIAMToolbox.equationsmodule.knbp_rv_body(t, s)
 def prepare_sources_dict() -> dict:
     """
@@ -4505,7 +4610,6 @@ def propagate_nbp(central_body: str, tspan: numpy.ndarray, x0: numpy.ndarray, so
     -----------
     `central_body`: str
 
-
     Name of the central body
 
     `tspan`: numpy.ndarray, shape (n,)

{kiam_astro-3.0.0 → kiam_astro-3.0.2}/kiam_astro/trajectory.py

@@ -670,6 +670,8 @@ class Trajectory:
 
             'r' plots the distance to the origin of the coordinate system.
 
+            'm' plots the mass of the spacecraft (if self.vars == 'rvm').
+
         2. 'a', 'e', 'inc', 'Om', 'w', 'th' if self.vars in ['oe', 'oem', 'oe_stm']
 
             'a' plots the semi-major axis wrt time
@@ -684,6 +686,8 @@ class Trajectory:
 
             'th' plots the true anomaly wrt time
 
+            'm' plots the mass of the spacecraft (if self.vars == 'oem').
+
         3. 'h', 'ex', 'ey', 'ix', 'iy', 'L' if self.vars in ['ee', 'eem', 'ee_stm']
 
             'h' plots h = sqrt(p/mu) wrt time
@@ -698,6 +702,8 @@ class Trajectory:
 
             'L' plots L = theta + omega + Omega wrt time
 
+            'm' plots the mass of the spacecraft (if self.vars == 'eem').
+
         `draw` : bool
 
         If True (by default), the fig plotly object will be returned and figure will be showed.
@@ -757,6 +763,8 @@ class Trajectory:
                 else:
                     rlabel = 'r, nondimensional'
                 fig = kiam.plot(self.times, norm(self.states[0:3, :], axis=0), xlabel=tlabel, ylabel=rlabel)
+            elif self.vars == 'rvm' and variables == 'm':
+                fig = kiam.plot(self.times, self.states[6, :], xlabel=tlabel, ylabel='Mass, kg')
             else:
                 raise 'Unknown variables to show.'
         elif self.vars in ['oe', 'oem', 'oe_stm']:
@@ -785,6 +793,8 @@ class Trajectory:
             elif variables == 'th':
                 ylabel = 'True anomaly, degrees'
                 fig = kiam.plot(self.times, self.states[5, :] / math.pi * 180, xlabel=tlabel, ylabel=ylabel)
+            elif self.vars == 'rvm' and variables == 'm':
+                fig = kiam.plot(self.times, self.states[6, :], xlabel=tlabel, ylabel='Mass, kg')
             else:
                 raise 'Unknown classical orbital element. Elements: a, e, inc, Om, w, th.'
         elif self.vars in ['ee', 'eem', 'ee_stm']:
@@ -811,6 +821,8 @@ class Trajectory:
             elif variables == 'L':
                 ylabel = 'True longitude, degrees'
                 fig = kiam.plot(self.times, self.states[5, :] / math.pi * 180, xlabel=tlabel, ylabel=ylabel)
+            elif self.vars == 'rvm' and variables == 'm':
+                fig = kiam.plot(self.times, self.states[6, :], xlabel=tlabel, ylabel='Mass, kg')
             else:
                 raise 'Unknown equinoctial orbital element. Elements: h, ex, ey, ix, iy, L.'
         else:

{kiam_astro-3.0.0 → kiam_astro-3.0.2}/kiam_astro.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kiam-astro
-Version: 3.0.0
+Version: 3.0.2
 Summary: KIAM Astrodynamics Toolbox
 Home-page: https://github.com/shmaxg/KIAMToolbox
 Author: Maksim Shirobokov
@@ -20,7 +20,7 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Fortran
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: == 3.9
+Requires-Python: >=3.9.0, <=3.9.16
 License-File: LICENSE
 
 Astrodynamics toolbox made in Keldysh Institute of Applied Mathematics for preliminary space mission analysis.

{kiam_astro-3.0.0 → kiam_astro-3.0.2}/setup.py

@@ -2,14 +2,14 @@ from setuptools import setup, find_packages
 
 setup(
     name="kiam_astro",
-    version="3.0.0",
+    version="3.0.2",
     url="https://github.com/shmaxg/KIAMToolbox",
     author="Maksim Shirobokov",
     author_email="shmaxg@gmail.com",
     description='KIAM Astrodynamics Toolbox',
     long_description='Astrodynamics toolbox made in Keldysh Institute of Applied Mathematics for preliminary space mission analysis.',
     keywords=['astrodynamics', 'spacecraft', 'mission analysis', 'kiam'],
-    python_requires='== 3.9',
+    python_requires='>=3.9.0, <=3.9.16',
     packages=find_packages(),
     package_data={'kiam_astro': ['D:\\YandexDisk\\Python\\KIAMToolbox\\kiam_astro\\*']},
     include_package_data=True,