rocketpy 1.1.2__tar.gz → 1.1.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {rocketpy-1.1.2 → rocketpy-1.1.4}/PKG-INFO +1 -1
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/mathutils/function.py +1 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/hybrid_motor.py +4 -2
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/motor.py +3 -1
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/solid_motor.py +3 -1
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy.egg-info/PKG-INFO +1 -1
- {rocketpy-1.1.2 → rocketpy-1.1.4}/setup.py +1 -1
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_function.py +2 -2
- {rocketpy-1.1.2 → rocketpy-1.1.4}/LICENSE +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/README.md +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/environment/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/environment/environment.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/environment/environment_analysis.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/mathutils/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/mathutils/vector_matrix.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/fluid.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/liquid_motor.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/tank.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/motors/tank_geometry.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/aero_surface_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/compare/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/compare/compare.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/compare/compare_flights.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/environment_analysis_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/environment_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/flight_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/fluid_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/hybrid_motor_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/liquid_motor_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/motor_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/rocket_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/solid_motor_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/tank_geometry_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/plots/tank_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/aero_surface_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/compare_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/environment_analysis_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/environment_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/flight_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/fluid_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/hybrid_motor_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/liquid_motor_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/motor_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/parachute_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/rocket_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/solid_motor_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/tank_geometry_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/prints/tank_prints.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/rocket/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/rocket/aero_surface.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/rocket/components.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/rocket/parachute.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/rocket/rocket.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/simulation/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/simulation/flight.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/tools.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/units.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy/utilities.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy.egg-info/SOURCES.txt +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy.egg-info/dependency_links.txt +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy.egg-info/requires.txt +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/rocketpy.egg-info/top_level.txt +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/setup.cfg +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/__init__.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/conftest.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_environment.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_environment_analysis.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_flight.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_genericmotor.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_hybridmotor.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_liquidmotor.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_plots.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_rocket.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_solidmotor.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_tank.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_tools_matrix.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_tools_vector.py +0 -0
- {rocketpy-1.1.2 → rocketpy-1.1.4}/tests/test_utilities.py +0 -0
|
@@ -480,6 +480,7 @@ class Function:
|
|
|
480
480
|
|
|
481
481
|
elif self.__interpolation__ == "shepard":
|
|
482
482
|
x_data = self.source[:, 0:-1] # Support for N-Dimensions
|
|
483
|
+
y_data = self.source[:, -1]
|
|
483
484
|
len_y_data = len(y_data) # A little speed up
|
|
484
485
|
|
|
485
486
|
# change the function's name to avoid mypy's error
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
from ..mathutils.function import funcify_method, reset_funcified_methods
|
|
1
|
+
from ..mathutils.function import Function, funcify_method, reset_funcified_methods
|
|
2
2
|
from ..plots.hybrid_motor_plots import _HybridMotorPlots
|
|
3
3
|
from ..prints.hybrid_motor_prints import _HybridMotorPrints
|
|
4
4
|
from .liquid_motor import LiquidMotor
|
|
@@ -372,7 +372,9 @@ class HybridMotor(Motor):
|
|
|
372
372
|
self.exhaust_velocity : Function
|
|
373
373
|
Gas exhaust velocity of the motor.
|
|
374
374
|
"""
|
|
375
|
-
return
|
|
375
|
+
return Function(
|
|
376
|
+
self.total_impulse / self.propellant_initial_mass
|
|
377
|
+
).set_discrete_based_on_model(self.thrust)
|
|
376
378
|
|
|
377
379
|
@funcify_method("Time (s)", "Mass (kg)")
|
|
378
380
|
def propellant_mass(self):
|
|
@@ -1224,7 +1224,9 @@ class GenericMotor(Motor):
|
|
|
1224
1224
|
self.exhaust_velocity : Function
|
|
1225
1225
|
Gas exhaust velocity of the motor.
|
|
1226
1226
|
"""
|
|
1227
|
-
return
|
|
1227
|
+
return Function(
|
|
1228
|
+
self.total_impulse / self.propellant_initial_mass
|
|
1229
|
+
).set_discrete_based_on_model(self.thrust)
|
|
1228
1230
|
|
|
1229
1231
|
@funcify_method("Time (s)", "Mass Flow Rate (kg/s)")
|
|
1230
1232
|
def mass_flow_rate(self):
|
|
@@ -381,7 +381,9 @@ class SolidMotor(Motor):
|
|
|
381
381
|
self.exhaust_velocity : Function
|
|
382
382
|
Gas exhaust velocity of the motor.
|
|
383
383
|
"""
|
|
384
|
-
return
|
|
384
|
+
return Function(
|
|
385
|
+
self.total_impulse / self.propellant_initial_mass
|
|
386
|
+
).set_discrete_based_on_model(self.thrust)
|
|
385
387
|
|
|
386
388
|
@property
|
|
387
389
|
def propellant_initial_mass(self):
|
|
@@ -73,8 +73,8 @@ def test_getters(func_from_csv, func_2d_from_csv):
|
|
|
73
73
|
assert func_2d_from_csv.get_outputs() == ["Scalar"]
|
|
74
74
|
assert func_2d_from_csv.get_interpolation_method() == "shepard"
|
|
75
75
|
assert func_2d_from_csv.get_extrapolation_method() == "natural"
|
|
76
|
-
assert np.isclose(func_2d_from_csv.get_value(0, 0), 0.
|
|
77
|
-
assert np.isclose(func_2d_from_csv.get_value_opt(0, 0), 0.
|
|
76
|
+
assert np.isclose(func_2d_from_csv.get_value(0.1, 0.8), 0.058, atol=1e-6)
|
|
77
|
+
assert np.isclose(func_2d_from_csv.get_value_opt(0.1, 0.8), 0.058, atol=1e-6)
|
|
78
78
|
|
|
79
79
|
|
|
80
80
|
def test_setters(func_from_csv, func_2d_from_csv):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|