rocketpy 1.6.0__tar.gz → 1.6.2__tar.gz

{rocketpy-1.6.0/rocketpy.egg-info → rocketpy-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rocketpy
-Version: 1.6.0
+Version: 1.6.2
 Summary: Advanced 6-DOF trajectory simulation for High-Power Rocketry.
 Author-email: Giovani Hidalgo Ceotto <ghceotto@gmail.com>
 Project-URL: homepage, https://rocketpy.org/
@@ -52,18 +52,18 @@ Requires-Dist: rocketpy[monte-carlo]; extra == "all"
 <br>
 
 [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/RocketPy-Team/rocketpy/blob/master/docs/notebooks/getting_started_colab.ipynb)
-[![PyPI](https://img.shields.io/pypi/v/rocketpy?color=g)](https://pypi.org/project/rocketpy/)
 [![Documentation Status](https://readthedocs.org/projects/rocketpyalpha/badge/?version=latest)](https://docs.rocketpy.org/en/latest/?badge=latest)
+[![PyPI](https://img.shields.io/pypi/v/rocketpy?color=g)](https://pypi.org/project/rocketpy/)
+![Conda Version](https://img.shields.io/conda/v/conda-forge/rocketpy?color=g)
 [![codecov](https://codecov.io/gh/RocketPy-Team/RocketPy/graph/badge.svg?token=Ecc3bsHFeP)](https://codecov.io/gh/RocketPy-Team/RocketPy)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Contributors](https://img.shields.io/github/contributors/RocketPy-Team/rocketpy)](https://github.com/RocketPy-Team/RocketPy/graphs/contributors)
-[![Chat on Discord](https://img.shields.io/discord/765037887016140840?logo=discord)](https://discord.gg/b6xYnNh)
 [![Sponsor RocketPy](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/RocketPy-Team)
+[![Chat on Discord](https://img.shields.io/discord/765037887016140840?logo=discord)](https://discord.gg/b6xYnNh)
 [![Instagram](https://img.shields.io/badge/Instagram-E4405F?style=flat&logo=instagram&logoColor=white)](https://www.instagram.com/rocketpyteam)
 [![LinkedIn](https://img.shields.io/badge/LinkedIn-0077B5?style=flat&logo=linkedin&logoColor=white)](https://www.linkedin.com/company/rocketpy)
 [![DOI](https://img.shields.io/badge/DOI-10.1061%2F%28ASCE%29AS.1943--5525.0001331-blue.svg)](http://dx.doi.org/10.1061/%28ASCE%29AS.1943-5525.0001331)
 
-<br>
-
 # RocketPy
 
 RocketPy is the next-generation trajectory simulation solution for High-Power Rocketry. The code is written as a [Python](http://www.python.org) library and allows for a complete 6 degrees of freedom simulation of a rocket's flight trajectory, including high-fidelity variable mass effects as well as descent under parachutes. Weather conditions, such as wind profiles, can be imported from sophisticated datasets, allowing for realistic scenarios. Furthermore, the implementation facilitates complex simulations, such as multi-stage rockets, design and trajectory optimization and dispersion analysis.
@@ -78,7 +78,7 @@ RocketPy is the next-generation trajectory simulation solution for High-Power Ro
 
 2. **Accurate Weather Modeling**
    - Supports International Standard Atmosphere (1976)
-   - Custom atmospheric profiles and Soundings (Wyoming, NOAARuc)
+   - Custom atmospheric profiles and Soundings (Wyoming)
    - Weather forecasts, reanalysis, and ensembles for realistic scenarios
 
 3. **Aerodynamic Models**
@@ -125,6 +125,9 @@ Flight data and rocket parameters used in this comparison were kindly provided b
 |   NDRT launch vehicle   | Apogee time (s)        |    16.77  |    17.10  |   **-1.90 %**   |
 |   NDRT launch vehicle   | Maximum velocity (m/s) |   172.86  |   168.95  |   **2.31 %**    |
 
+Over years of development and testing, RocketPy has been validated across an expanding range of flight scenarios.
+For more information on these validated flights, visit our [Flight Examples](https://docs.rocketpy.org/en/latest/examples/index.html) page in the documentation.
+
 # Documentation
 
 Check out documentation details using the links below:
@@ -206,7 +209,7 @@ env = Environment(
     latitude=32.990254,
     longitude=-106.974998,
     elevation=1400,
-) 
+)
 
 tomorrow = datetime.date.today() + datetime.timedelta(days=1)
 
@@ -397,7 +400,7 @@ You can also become a [sponsor](https://github.com/sponsors/RocketPy-Team) and h
 
 If you are actively using RocketPy in one of your projects, reaching out to our core team via [Discord](https://discord.gg/b6xYnNh) and providing feedback can help improve RocketPy a lot!
 
-And if you are interested in going one step further, please read [CONTRIBUTING.md](https://github.com/RocketPy-Team/RocketPy/blob/master/CONTRIBUTING.md) for details on our code of conduct and learn more about how you can contribute to the development of this next-gen trajectory simulation solution for rocketry.
+And if you are interested in going one step further, please read the [development documentation](https://docs.rocketpy.org/en/latest/development/index.html) to learn more about how you can contribute to the development of this next-gen trajectory simulation solution for rocketry.
 
 ## License
 

{rocketpy-1.6.0 → rocketpy-1.6.2}/README.md

@@ -7,18 +7,18 @@
 <br>
 
 [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/RocketPy-Team/rocketpy/blob/master/docs/notebooks/getting_started_colab.ipynb)
-[![PyPI](https://img.shields.io/pypi/v/rocketpy?color=g)](https://pypi.org/project/rocketpy/)
 [![Documentation Status](https://readthedocs.org/projects/rocketpyalpha/badge/?version=latest)](https://docs.rocketpy.org/en/latest/?badge=latest)
+[![PyPI](https://img.shields.io/pypi/v/rocketpy?color=g)](https://pypi.org/project/rocketpy/)
+![Conda Version](https://img.shields.io/conda/v/conda-forge/rocketpy?color=g)
 [![codecov](https://codecov.io/gh/RocketPy-Team/RocketPy/graph/badge.svg?token=Ecc3bsHFeP)](https://codecov.io/gh/RocketPy-Team/RocketPy)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Contributors](https://img.shields.io/github/contributors/RocketPy-Team/rocketpy)](https://github.com/RocketPy-Team/RocketPy/graphs/contributors)
-[![Chat on Discord](https://img.shields.io/discord/765037887016140840?logo=discord)](https://discord.gg/b6xYnNh)
 [![Sponsor RocketPy](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/RocketPy-Team)
+[![Chat on Discord](https://img.shields.io/discord/765037887016140840?logo=discord)](https://discord.gg/b6xYnNh)
 [![Instagram](https://img.shields.io/badge/Instagram-E4405F?style=flat&logo=instagram&logoColor=white)](https://www.instagram.com/rocketpyteam)
 [![LinkedIn](https://img.shields.io/badge/LinkedIn-0077B5?style=flat&logo=linkedin&logoColor=white)](https://www.linkedin.com/company/rocketpy)
 [![DOI](https://img.shields.io/badge/DOI-10.1061%2F%28ASCE%29AS.1943--5525.0001331-blue.svg)](http://dx.doi.org/10.1061/%28ASCE%29AS.1943-5525.0001331)
 
-<br>
-
 # RocketPy
 
 RocketPy is the next-generation trajectory simulation solution for High-Power Rocketry. The code is written as a [Python](http://www.python.org) library and allows for a complete 6 degrees of freedom simulation of a rocket's flight trajectory, including high-fidelity variable mass effects as well as descent under parachutes. Weather conditions, such as wind profiles, can be imported from sophisticated datasets, allowing for realistic scenarios. Furthermore, the implementation facilitates complex simulations, such as multi-stage rockets, design and trajectory optimization and dispersion analysis.
@@ -33,7 +33,7 @@ RocketPy is the next-generation trajectory simulation solution for High-Power Ro
 
 2. **Accurate Weather Modeling**
    - Supports International Standard Atmosphere (1976)
-   - Custom atmospheric profiles and Soundings (Wyoming, NOAARuc)
+   - Custom atmospheric profiles and Soundings (Wyoming)
    - Weather forecasts, reanalysis, and ensembles for realistic scenarios
 
 3. **Aerodynamic Models**
@@ -80,6 +80,9 @@ Flight data and rocket parameters used in this comparison were kindly provided b
 |   NDRT launch vehicle   | Apogee time (s)        |    16.77  |    17.10  |   **-1.90 %**   |
 |   NDRT launch vehicle   | Maximum velocity (m/s) |   172.86  |   168.95  |   **2.31 %**    |
 
+Over years of development and testing, RocketPy has been validated across an expanding range of flight scenarios.
+For more information on these validated flights, visit our [Flight Examples](https://docs.rocketpy.org/en/latest/examples/index.html) page in the documentation.
+
 # Documentation
 
 Check out documentation details using the links below:
@@ -161,7 +164,7 @@ env = Environment(
     latitude=32.990254,
     longitude=-106.974998,
     elevation=1400,
-) 
+)
 
 tomorrow = datetime.date.today() + datetime.timedelta(days=1)
 
@@ -352,7 +355,7 @@ You can also become a [sponsor](https://github.com/sponsors/RocketPy-Team) and h
 
 If you are actively using RocketPy in one of your projects, reaching out to our core team via [Discord](https://discord.gg/b6xYnNh) and providing feedback can help improve RocketPy a lot!
 
-And if you are interested in going one step further, please read [CONTRIBUTING.md](https://github.com/RocketPy-Team/RocketPy/blob/master/CONTRIBUTING.md) for details on our code of conduct and learn more about how you can contribute to the development of this next-gen trajectory simulation solution for rocketry.
+And if you are interested in going one step further, please read the [development documentation](https://docs.rocketpy.org/en/latest/development/index.html) to learn more about how you can contribute to the development of this next-gen trajectory simulation solution for rocketry.
 
 ## License
 

{rocketpy-1.6.0 → rocketpy-1.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rocketpy"
-version = "1.6.0"
+version = "1.6.2"
 description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
 dynamic = ["dependencies"]
 readme = "README.md"
@@ -30,8 +30,8 @@ packages = { find = { where = ["."], include = ["rocketpy*"] } }
 dependencies = { file = ["requirements.txt"] }
 
 [project.optional-dependencies]
-tests = [ 
-    "pytest", 
+tests = [
+    "pytest",
     "pytest-coverage",
     "black[jupyter]",
     "flake8-black",
@@ -42,12 +42,12 @@ tests = [
     "isort"
 ]
 
-env-analysis = [ 
-    "windrose>=1.6.8", 
-    "timezonefinder", 
-    "jsonpickle", 
-    "ipython", 
-    "ipywidgets>=7.6.3" 
+env-analysis = [
+    "windrose>=1.6.8",
+    "timezonefinder",
+    "jsonpickle",
+    "ipython",
+    "ipywidgets>=7.6.3"
 ]
 
 monte-carlo = [
@@ -59,7 +59,7 @@ monte-carlo = [
 all = ["rocketpy[env-analysis]", "rocketpy[monte-carlo]"]
 
 [tool.black]
-line-length = 88 
+line-length = 88
 include = '\.py$|\.ipynb$'
 skip-string-normalization = true
 

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/control/controller.py

@@ -84,8 +84,10 @@ class _Controller:
         None
         """
         self.interactive_objects = interactive_objects
+        self.base_controller_function = controller_function
         self.controller_function = self.__init_controller_function(controller_function)
         self.sampling_rate = sampling_rate
+        self.initial_observed_variables = initial_observed_variables
         self.name = name
         self.prints = _ControllerPrints(self)
 

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/environment/environment.py

@@ -16,7 +16,6 @@ from rocketpy.environment.fetchers import (
     fetch_gfs_file_return_dataset,
     fetch_hiresw_file_return_dataset,
     fetch_nam_file_return_dataset,
-    fetch_noaaruc_sounding,
     fetch_open_elevation,
     fetch_rap_file_return_dataset,
     fetch_wyoming_sounding,
@@ -142,11 +141,11 @@ class Environment:
     Environment.atmospheric_model_type : string
         Describes the atmospheric model which is being used. Can only assume the
         following values: ``standard_atmosphere``, ``custom_atmosphere``,
-        ``wyoming_sounding``, ``NOAARucSounding``, ``Forecast``, ``Reanalysis``,
+        ``wyoming_sounding``, ``Forecast``, ``Reanalysis``,
         ``Ensemble``.
     Environment.atmospheric_model_file : string
         Address of the file used for the atmospheric model being used. Only
-        defined for ``wyoming_sounding``, ``NOAARucSounding``, ``Forecast``,
+        defined for ``wyoming_sounding``, ``Forecast``,
         ``Reanalysis``, ``Ensemble``
     Environment.atmospheric_model_dict : dictionary
         Dictionary used to properly interpret ``netCDF`` and ``OPeNDAP`` files.
@@ -1053,24 +1052,6 @@ class Environment:
 
               .. _weather.uwyo: http://weather.uwyo.edu/upperair/sounding.html
 
-            - ``NOAARucSounding``: sets pressure, temperature, wind-u
-              and wind-v profiles and surface elevation obtained from
-              an upper air sounding given by the file parameter through
-              an URL. This URL should point to a data webpage obtained
-              through NOAA's Ruc Sounding servers, which can be accessed
-              in `rucsoundings`_. Selecting ROABs as the
-              initial data source, specifying the station through it's
-              WMO-ID and opting for the ASCII (GSD format) button, the
-              following example URL opens up:
-
-              https://rucsoundings.noaa.gov/get_raobs.cgi?data_source=RAOB&latest=latest&start_year=2019&start_month_name=Feb&start_mday=5&start_hour=12&start_min=0&n_hrs=1.0&fcst_len=shortest&airport=83779&text=Ascii%20text%20%28GSD%20format%29&hydrometeors=false&start=latest
-
-              Any ASCII GSD format page from this server can be read,
-              so information from virtual soundings such as GFS and NAM
-              can also be imported.
-
-              .. _rucsoundings: https://rucsoundings.noaa.gov/
-
             - ``windy_atmosphere``: sets pressure, temperature, wind-u and
               wind-v profiles and surface elevation obtained from the Windy API.
               See file argument to specify the model as either ``ECMWF``,
@@ -1279,8 +1260,6 @@ class Environment:
             self.process_standard_atmosphere()
         elif type == "wyoming_sounding":
             self.process_wyoming_sounding(file)
-        elif type == "noaarucsounding":
-            self.process_noaaruc_sounding(file)
         elif type == "custom_atmosphere":
             self.process_custom_atmosphere(pressure, temperature, wind_u, wind_v)
         elif type == "windy":
@@ -1334,7 +1313,7 @@ class Environment:
         self.__set_wind_speed_function(0)
 
         # 80k meters is the limit of the standard atmosphere
-        self.max_expected_height = 80000
+        self._max_expected_height = 80000
 
     def process_custom_atmosphere(
         self, pressure=None, temperature=None, wind_u=0, wind_v=0
@@ -1411,7 +1390,7 @@ class Environment:
         None
         """
         # Initialize an estimate of the maximum expected atmospheric model height
-        max_expected_height = 1000
+        max_expected_height = self.max_expected_height or 1000
 
         # Save pressure profile
         if pressure is None:
@@ -1455,7 +1434,7 @@ class Environment:
         self.__reset_wind_direction_function()
         self.__reset_wind_speed_function()
 
-        self.max_expected_height = max_expected_height
+        self._max_expected_height = max_expected_height
 
     def process_windy_atmosphere(
         self, model="ECMWF"
@@ -1530,7 +1509,7 @@ class Environment:
         self.__set_wind_speed_function(data_array[:, (1, 7)])
 
         # Save maximum expected height
-        self.max_expected_height = max(altitude_array[0], altitude_array[-1])
+        self._max_expected_height = max(altitude_array[0], altitude_array[-1])
 
         # Get elevation data from file
         self.elevation = float(response["header"]["elevation"])
@@ -1668,7 +1647,7 @@ class Environment:
         )
 
         # Save maximum expected height
-        self.max_expected_height = data_array[-1, 1]
+        self._max_expected_height = data_array[-1, 1]
 
     def process_noaaruc_sounding(self, file):  # pylint: disable=too-many-statements
         """Import and process the upper air sounding data from `NOAA
@@ -1689,107 +1668,18 @@ class Environment:
 
         See also
         --------
-        More details can be found at: https://rucsoundings.noaa.gov/.
+        This method is deprecated and will be fully deleted in version 1.8.0.
 
         Returns
         -------
         None
         """
-        # Request NOAA Ruc Sounding from file url
-        response = fetch_noaaruc_sounding(file)
-
-        # Split response into lines
-        lines = response.text.split("\n")
-
-        # Process GSD format (https://rucsoundings.noaa.gov/raob_format.html)
-
-        # Extract elevation data
-        for line in lines:
-            # Split line into columns
-            columns = re.split(" +", line)[1:]
-            if len(columns) > 0:
-                if columns[0] == "1" and columns[5] != "99999":
-                    # Save elevation
-                    self.elevation = float(columns[5])
-                else:
-                    # No elevation data available
-                    pass
-
-        pressure_array = []
-        barometric_height_array = []
-        temperature_array = []
-        wind_speed_array = []
-        wind_direction_array = []
-
-        for line in lines:
-            # Split line into columns
-            columns = re.split(" +", line)[1:]
-            if len(columns) < 6:
-                # skip lines with less than 6 columns
-                continue
-            if columns[0] in ["4", "5", "6", "7", "8", "9"]:
-                # Convert columns to floats
-                columns = np.array(columns, dtype=float)
-                # Select relevant columns
-                altitude, pressure, temperature, wind_direction, wind_speed = columns[
-                    [2, 1, 3, 5, 6]
-                ]
-                # Check for missing values
-                if altitude == 99999:
-                    continue
-                # Save values only if they are not missing
-                if pressure != 99999:
-                    pressure_array.append([altitude, pressure])
-                    barometric_height_array.append([pressure, altitude])
-                if temperature != 99999:
-                    temperature_array.append([altitude, temperature])
-                if wind_direction != 99999:
-                    wind_direction_array.append([altitude, wind_direction])
-                if wind_speed != 99999:
-                    wind_speed_array.append([altitude, wind_speed])
-
-        # Convert lists to arrays
-        pressure_array = np.array(pressure_array)
-        barometric_height_array = np.array(barometric_height_array)
-        temperature_array = np.array(temperature_array)
-        wind_speed_array = np.array(wind_speed_array)
-        wind_direction_array = np.array(wind_direction_array)
-
-        # Converts 10*hPa to Pa and save values
-        pressure_array[:, 1] = 10 * pressure_array[:, 1]
-        self.__set_pressure_function(pressure_array)
-        # Converts 10*hPa to Pa and save values
-        barometric_height_array[:, 0] = 10 * barometric_height_array[:, 0]
-        self.__set_barometric_height_function(barometric_height_array)
-
-        # Convert C to K and save values
-        temperature_array[:, 1] = temperature_array[:, 1] / 10 + 273.15
-        self.__set_temperature_function(temperature_array)
-
-        # Process wind-u and wind-v
-        # Converts Knots to m/s
-        wind_speed_array[:, 1] = wind_speed_array[:, 1] * 1.852 / 3.6
-        wind_heading_array = wind_direction_array[:, :] * 1
-        # Convert wind direction to wind heading
-        wind_heading_array[:, 1] = (wind_direction_array[:, 1] + 180) % 360
-        wind_u = wind_speed_array[:, :] * 1
-        wind_v = wind_speed_array[:, :] * 1
-        wind_u[:, 1] = wind_speed_array[:, 1] * np.sin(
-            np.deg2rad(wind_heading_array[:, 1])
-        )
-        wind_v[:, 1] = wind_speed_array[:, 1] * np.cos(
-            np.deg2rad(wind_heading_array[:, 1])
+        warnings.warn(
+            "NOAA RUC models are no longer available. "
+            "This method is deprecated and will be fully deleted in version 1.8.0.",
+            DeprecationWarning,
         )
-
-        # Save wind data
-        self.__set_wind_direction_function(wind_direction_array)
-        self.__set_wind_heading_function(wind_heading_array)
-        self.__set_wind_speed_function(wind_speed_array)
-        self.__set_wind_velocity_x_function(wind_u)
-        self.__set_wind_velocity_y_function(wind_v)
-
-        # Save maximum expected height
-        self.max_expected_height = pressure_array[-1, 0]
+        return file
 
     def process_forecast_reanalysis(
         self, file, dictionary
@@ -2009,7 +1899,7 @@ class Environment:
         self.__set_wind_speed_function(data_array[:, (1, 7)])
 
         # Save maximum expected height
-        self.max_expected_height = max(height[0], height[-1])
+        self._max_expected_height = max(height[0], height[-1])
 
         # Get elevation data from file
         if dictionary["surface_geopotential_height"] is not None:
@@ -2354,7 +2244,7 @@ class Environment:
         self.__set_wind_speed_function(data_array[:, (1, 7)])
 
         # Save other attributes
-        self.max_expected_height = max(height[0], height[-1])
+        self._max_expected_height = max(height[0], height[-1])
         self.ensemble_member = member
 
         # Update air density, speed of sound and dynamic viscosity

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/environment/fetchers.py

@@ -5,6 +5,7 @@ functions may be changed without notice in future feature releases.
 
 import re
 import time
+import warnings
 from datetime import datetime, timedelta, timezone
 
 import netCDF4
@@ -347,10 +348,12 @@ def fetch_noaaruc_sounding(file):
     ImportError
         If unable to load the specified file or the file content is too short.
     """
-    response = requests.get(file)
-    if response.status_code != 200 or len(response.text) < 10:
-        raise ImportError("Unable to load " + file + ".")
-    return response
+    warnings.warn(
+        "The NOAA RUC soundings are deprecated since September 30th, 2024. "
+        "This method will be removed in version 1.8.0.",
+        DeprecationWarning,
+    )
+    return file
 
 
 @exponential_backoff(max_attempts=5, base_delay=2, max_delay=60)

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/mathutils/function.py

@@ -3171,7 +3171,7 @@ class Function:  # pylint: disable=too-many-public-methods
                 )
             # Generate the data points using the callable
             x = np.linspace(lower, upper, samples)
-            data_points = np.column_stack((x, self.source(x)))
+            data_points = np.column_stack((x, self(x)))
         else:
             # If the source is already an array, use it as is
             data_points = self.source
@@ -3247,12 +3247,12 @@ class Function:  # pylint: disable=too-many-public-methods
                 )
 
             source_len, source_dim = source.shape
-
-            if source_len < source_dim:
-                raise ValueError(
-                    "Too few data points to define a domain. The number of rows "
-                    "must be greater than or equal to the number of columns."
-                )
+            if not source_len == 1:  # do not check for one point Functions
+                if source_len < source_dim:
+                    raise ValueError(
+                        "Too few data points to define a domain. The number of rows "
+                        "must be greater than or equal to the number of columns."
+                    )
 
             return source
 

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/mathutils/vector_matrix.py

@@ -418,6 +418,10 @@ class Vector:
         """Returns the k vector, [0, 0, 1]."""
         return Vector([0, 0, 1])
 
+    def to_dict(self):
+        """Returns the vector as a JSON compatible element."""
+        return list(self.components)
+
 
 class Matrix:
     """Pure Python 3x3 Matrix class for simple matrix-matrix and matrix-vector
@@ -998,6 +1002,10 @@ class Matrix:
             + f"       [{self.zx}, {self.zy}, {self.zz}])"
         )
 
+    def to_dict(self):
+        """Returns the matrix as a JSON compatible element."""
+        return [list(row) for row in self.components]
+
     @staticmethod
     def identity():
         """Returns the 3x3 identity matrix."""

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/motors/hybrid_motor.py

@@ -72,6 +72,8 @@ class HybridMotor(Motor):
     HybridMotor.propellant_mass : Function
         Total propellant mass in kg as a function of time, this includes the
         mass of fluids in each tank and the mass of the solid grains.
+    HybridMotor.structural_mass_ratio: float
+        Initial ratio between the dry mass and the total mass.
     HybridMotor.total_mass_flow_rate : Function
         Time derivative of propellant total mass in kg/s as a function
         of time as obtained by the thrust source.

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/motors/liquid_motor.py

@@ -47,6 +47,8 @@ class LiquidMotor(Motor):
     LiquidMotor.propellant_mass : Function
         Total propellant mass in kg as a function of time, includes fuel
         and oxidizer.
+    LiquidMotor.structural_mass_ratio: float
+        Initial ratio between the dry mass and the total mass.
     LiquidMotor.total_mass_flow_rate : Function
         Time derivative of propellant total mass in kg/s as a function
         of time as obtained by the tanks mass flow.

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/motors/motor.py

@@ -49,6 +49,8 @@ class Motor(ABC):
     Motor.propellant_mass : Function
         Total propellant mass in kg as a function of time, including solid,
         liquid and gas phases.
+    Motor.structural_mass_ratio: float
+        Initial ratio between the dry mass and the total mass.
     Motor.total_mass_flow_rate : Function
         Time derivative of propellant total mass in kg/s as a function
         of time as obtained by the thrust source.
@@ -370,7 +372,7 @@ class Motor(ABC):
         dry_mass : float
             Motor dry mass in kg.
         """
-        if dry_mass:
+        if dry_mass is not None:
             if isinstance(dry_mass, (int, float)):
                 self._dry_mass = dry_mass
             else:
@@ -497,6 +499,24 @@ class Motor(ABC):
             Propellant initial mass in kg.
         """
 
+    @property
+    def structural_mass_ratio(self):
+        """Calculates the structural mass ratio. The ratio is defined as
+        the dry mass divided by the initial total mass.
+
+        Returns
+        -------
+        float
+            Initial structural mass ratio.
+        """
+        initial_total_mass = self.dry_mass + self.propellant_initial_mass
+        try:
+            return self.dry_mass / initial_total_mass
+        except ZeroDivisionError as e:
+            raise ValueError(
+                "Total motor mass (dry + propellant) cannot be zero"
+            ) from e
+
     @funcify_method("Time (s)", "Motor center of mass (m)")
     def center_of_mass(self):
         """Position of the center of mass as a function of time. The position
@@ -1502,6 +1522,7 @@ class EmptyMotor:
         self.nozzle_radius = 0
         self.thrust = Function(0, "Time (s)", "Thrust (N)")
         self.propellant_mass = Function(0, "Time (s)", "Propellant Mass (kg)")
+        self.propellant_initial_mass = 0
         self.total_mass = Function(0, "Time (s)", "Total Mass (kg)")
         self.total_mass_flow_rate = Function(
             0, "Time (s)", "Mass Depletion Rate (kg/s)"

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/motors/solid_motor.py

@@ -70,6 +70,8 @@ class SolidMotor(Motor):
         of propellant and dry mass.
     SolidMotor.propellant_mass : Function
         Total propellant mass in kg as a function of time.
+    SolidMotor.structural_mass_ratio: float
+        Initial ratio between the dry mass and the total mass.
     SolidMotor.total_mass_flow_rate : Function
         Time derivative of propellant total mass in kg/s as a function
         of time as obtained by the thrust source.

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/plots/monte_carlo_plots.py

@@ -1,4 +1,5 @@
 import matplotlib.pyplot as plt
+import numpy as np
 
 from ..tools import generate_monte_carlo_ellipses, import_optional_dependency
 
@@ -54,14 +55,30 @@ class _MonteCarloPlots:
                     "The image file was not found. Please check the path."
                 ) from e
 
-        (
-            impact_ellipses,
-            apogee_ellipses,
+        try:
+            apogee_x = np.array(self.monte_carlo.results["apogee_x"])
+            apogee_y = np.array(self.monte_carlo.results["apogee_y"])
+        except KeyError:
+            print("No apogee data found. Skipping apogee ellipses.")
+            apogee_x = np.array([])
+            apogee_y = np.array([])
+        try:
+            impact_x = np.array(self.monte_carlo.results["x_impact"])
+            impact_y = np.array(self.monte_carlo.results["y_impact"])
+        except KeyError:
+            print("No impact data found. Skipping impact ellipses.")
+            impact_x = np.array([])
+            impact_y = np.array([])
+
+        if len(apogee_x) == 0 and len(impact_x) == 0:
+            raise ValueError("No apogee or impact data found. Cannot plot ellipses.")
+
+        impact_ellipses, apogee_ellipses = generate_monte_carlo_ellipses(
             apogee_x,
             apogee_y,
             impact_x,
             impact_y,
-        ) = generate_monte_carlo_ellipses(self.monte_carlo.results)
+        )
 
         # Create plot figure
         plt.figure(figsize=(8, 6), dpi=150)
@@ -97,9 +114,7 @@ class _MonteCarloPlots:
             )
 
         plt.legend()
-        ax.set_title(
-            "1$\\sigma$, 2$\\sigma$ and 3$\\sigma$ Monte Carlo Ellipses: Apogee and Landing Points"
-        )
+        ax.set_title("1$\\sigma$, 2$\\sigma$ and 3$\\sigma$ Monte Carlo Ellipses")
         ax.set_ylabel("North (m)")
         ax.set_xlabel("East (m)")
 

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/prints/hybrid_motor_prints.py

@@ -77,6 +77,7 @@ class _HybridMotorPrints:
         print(
             f"Total Propellant Mass: {self.hybrid_motor.propellant_initial_mass:.3f} kg"
         )
+        print(f"Structural Mass Ratio: {self.hybrid_motor.structural_mass_ratio:.3f}")
         avg = self.hybrid_motor.exhaust_velocity.average(*self.hybrid_motor.burn_time)
         print(f"Average Propellant Exhaust Velocity: {avg:.3f} m/s")
         print(f"Average Thrust: {self.hybrid_motor.average_thrust:.3f} N")

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/prints/liquid_motor_prints.py

@@ -47,6 +47,7 @@ class _LiquidMotorPrints:
         print(
             f"Total Propellant Mass: {self.liquid_motor.propellant_initial_mass:.3f} kg"
         )
+        print(f"Structural Mass Ratio: {self.liquid_motor.structural_mass_ratio:.3f}")
         avg = self.liquid_motor.exhaust_velocity.average(*self.liquid_motor.burn_time)
         print(f"Average Propellant Exhaust Velocity: {avg:.3f} m/s")
         print(f"Average Thrust: {self.liquid_motor.average_thrust:.3f} N")

{rocketpy-1.6.0 → rocketpy-1.6.2}/rocketpy/prints/motor_prints.py

@@ -35,6 +35,7 @@ class _MotorPrints:
         print("Motor Details")
         print("Total Burning Time: " + str(self.motor.burn_out_time) + " s")
         print(f"Total Propellant Mass: {self.motor.propellant_initial_mass:.3f} kg")
+        print(f"Structural Mass Ratio: {self.motor.structural_mass_ratio:.3f}")
         print(
             "Average Propellant Exhaust Velocity: "
             f"{self.motor.exhaust_velocity.average(*self.motor.burn_time):.3f} m/s"