From 97654be1008042326f4078029ef33d00c5e2d136 Mon Sep 17 00:00:00 2001
From: Julio Machado <julioromac@outlook.com>
Date: Sat, 29 Mar 2025 19:07:15 -0300
Subject: [PATCH 1/5] ENH: Support for the RSE file format has been added to
 the library. The import_rse method in the Abstract Motor class and the
 load_from_rse_file method in the GenericMotor class are now available. With
 this update, the library natively supports Rock Sim software data,
 eliminating the need for users to manually convert motor files. The
 implementation was based on the import_eng and load_from_eng_file methods,
 utilizing Python's standard XML library.

---
 rocketpy/motors/motor.py | 222 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 220 insertions(+), 2 deletions(-)

diff --git a/rocketpy/motors/motor.py b/rocketpy/motors/motor.py
index 5f4b0dc0b..4665014b3 100644
--- a/rocketpy/motors/motor.py
+++ b/rocketpy/motors/motor.py
@@ -1,4 +1,5 @@
 import re
+import xml.etree.ElementTree as ET
 import warnings
 from abc import ABC, abstractmethod
 from functools import cached_property
@@ -268,8 +269,9 @@ class Function. Thrust units are Newtons.
         self.dry_I_13 = inertia[4]
         self.dry_I_23 = inertia[5]
 
-        # Handle .eng file inputs
+        # Handle .eng or .rse file inputs
         self.description_eng_file = None
+        self.rse_motor_data = None
         if isinstance(thrust_source, str):
             if (
                 path.exists(thrust_source)
@@ -277,7 +279,12 @@ class Function. Thrust units are Newtons.
             ):
                 _, self.description_eng_file, points = Motor.import_eng(thrust_source)
                 thrust_source = points
-
+            elif (
+                path.exists(thrust_source)
+                and path.splitext(path.basename(thrust_source))[1] == ".rse"
+            ):
+                self.rse_motor_data, points = Motor.import_rse(thrust_source)
+                thrust_source = points
         # Evaluate raw thrust source
         self.thrust_source = thrust_source
         self.thrust = Function(
@@ -381,6 +388,10 @@ def dry_mass(self, dry_mass):
             self._dry_mass = float(self.description_eng_file[-2]) - float(
                 self.description_eng_file[-3]
             )
+        elif self.rse_motor_data:
+            self._dry_mass = float(
+                self.rse_motor_data["description"]["total_mass"]
+            ) - float(self.rse_motor_data["description"]["propellant_mass"])
         else:
             raise ValueError("Dry mass must be specified.")
 
@@ -990,6 +1001,83 @@ def clip_thrust(thrust, new_burn_time):
             "zero",
         )
 
+    @staticmethod
+    def import_rse(file_name):
+        """
+        Reads motor data from a file and extracts comments, model, description, and data points.
+
+        Parameters
+        ----------
+        file_path : str
+            Path to the motor data file.
+
+        Returns
+        -------
+        dict
+            A dictionary containing the extracted data:
+            - comments: List of comments in the file.
+            - model: Dictionary with manufacturer, code, and type of the motor.
+            - description: Dictionary with performance data (dimensions, weights, thrust, etc.).
+            - data_points: List of temporal data points (time, thrust, mass, cg).
+        tuple
+            A tuple representing the thrust curve (time, thrust).
+        """
+
+        # Parse the XML file
+        tree = ET.parse(file_name)
+        root = tree.getroot()
+
+        # Extract comments
+        comments = []
+        for comment in root.iter():
+            if comment.tag.startswith("<!--"):
+                comments.append(comment.text.strip())
+
+        # Extract model data
+        engine = root.find(".//engine")
+        model = {
+            "manufacturer": engine.attrib.get("mfg"),
+            "code": engine.attrib.get("code"),
+            "type": engine.attrib.get("Type"),
+        }
+
+        # Extract description data
+        description = {
+            "diameter": float(engine.attrib.get("dia", 0)) / 1000,
+            "length": float(engine.attrib.get("len", 0)) / 1000,
+            "throat_diameter": float(engine.attrib.get("throatDia", 0)) / 1000,
+            "exit_diameter": float(engine.attrib.get("len", 0)) / 1000,
+            "total_mass": float(engine.attrib.get("initWt", 0)) / 1000,
+            "propellant_mass": float(engine.attrib.get("propWt", 0)) / 1000,
+            "average_thrust": float(engine.attrib.get("avgThrust", 0)),
+            "peak_thrust": float(engine.attrib.get("peakThrust", 0)),
+            "total_impulse": float(engine.attrib.get("Itot", 0)),
+            "burn_time": float(engine.attrib.get("burn-time", 0)),
+            "isp": float(engine.attrib.get("Isp", 0)),
+            "mass_fraction": float(engine.attrib.get("massFrac", 0)) / 100,
+        }
+
+        # Extract data points
+        data_points = []
+        thrust_source = []
+        for eng_data in engine.find("data").findall("eng-data"):
+            time = float(eng_data.attrib.get("t", 0))
+            thrust = float(eng_data.attrib.get("f", 0))
+            mass = float(eng_data.attrib.get("m", 0))
+            cg = float(eng_data.attrib.get("cg", 0))
+            data_points.append({"time": time, "thrust": thrust, "mass": mass, "cg": cg})
+            thrust_source.append([time, thrust])
+
+        # Create the dictionary to return
+        rse_file_data = {
+            "comments": comments,
+            "model": model,
+            "description": description,
+            "data_points": data_points,
+        }
+
+        return rse_file_data, thrust_source
+
     @staticmethod
     def import_eng(file_name):
         """Read content from .eng file and process it, in order to return the
@@ -1566,6 +1654,136 @@ def load_from_eng_file(
             coordinate_system_orientation=coordinate_system_orientation,
         )
 
+    @staticmethod
+    def load_from_rse_file(
+        file_name,
+        nozzle_radius=None,
+        chamber_radius=None,
+        chamber_height=None,
+        chamber_position=0,
+        propellant_initial_mass=None,
+        dry_mass=None,
+        burn_time=None,
+        center_of_dry_mass_position=None,
+        dry_inertia=(0, 0, 0),
+        nozzle_position=0,
+        reshape_thrust_curve=False,
+        interpolation_method="linear",
+        coordinate_system_orientation="nozzle_to_combustion_chamber",
+    ):
+        """Loads motor data from a .rse file and processes it.
+
+        Parameters
+        ----------
+        file_name : string
+            Name of the .eng file. E.g. 'test.eng'.
+        nozzle_radius : int, float
+            Motor's nozzle outlet radius in meters.
+        chamber_radius : int, float, optional
+            The radius of a overall cylindrical chamber of propellant in meters.
+        chamber_height : int, float, optional
+            The height of a overall cylindrical chamber of propellant in meters.
+        chamber_position : int, float, optional
+            The position, in meters, of the centroid (half height) of the motor's
+            overall cylindrical chamber of propellant with respect to the motor's
+            coordinate system.
+        propellant_initial_mass : int, float, optional
+            The initial mass of the propellant in the motor.
+        dry_mass : int, float, optional
+            Same as in Motor class. See the :class:`Motor <rocketpy.Motor>` docs
+        burn_time: float, tuple of float, optional
+            Motor's burn time.
+            If a float is given, the burn time is assumed to be between 0 and
+            the given float, in seconds.
+            If a tuple of float is given, the burn time is assumed to be between
+            the first and second elements of the tuple, in seconds.
+            If not specified, automatically sourced as the range between the
+            first and last-time step of the motor's thrust curve. This can only
+            be used if the motor's thrust is defined by a list of points, such
+            as a .csv file, a .eng file or a Function instance whose source is a
+            list.
+        center_of_dry_mass_position : int, float, optional
+            The position, in meters, of the motor's center of mass with respect
+            to the motor's coordinate system when it is devoid of propellant.
+            If not specified, automatically sourced as the chamber position.
+        dry_inertia : tuple, list
+            Tuple or list containing the motor's dry mass inertia tensor
+        nozzle_position : int, float, optional
+            Motor's nozzle outlet position in meters, in the motor's coordinate
+            system. Default is 0, in which case the origin of the
+            coordinate system is placed at the motor's nozzle outlet.
+        reshape_thrust_curve : boolean, tuple, optional
+            If False, the original thrust curve supplied is not altered. If a
+            tuple is given, whose first parameter is a new burn out time and
+            whose second parameter is a new total impulse in Ns, the thrust
+            curve is reshaped to match the new specifications. May be useful
+            for motors whose thrust curve shape is expected to remain similar
+            in case the impulse and burn time varies slightly. Default is
+            False. Note that the Motor burn_time parameter must include the new
+            reshaped burn time.
+        interpolation_method : string, optional
+            Method of interpolation to be used in case thrust curve is given
+        coordinate_system_orientation : string, optional
+            Orientation of the motor's coordinate system. The coordinate system
+            is defined by the motor's axis of symmetry. The origin of the
+            coordinate system may be placed anywhere along such axis, such as
+            at the nozzle area, and must be kept the same for all other
+            positions specified. Options are "nozzle_to_combustion_chamber" and
+            "combustion_chamber_to_nozzle". Default is
+            "nozzle_to_combustion_chamber".
+
+        Returns
+        -------
+        Generic Motor object
+        """
+        if isinstance(file_name, str):
+            if path.splitext(path.basename(file_name))[1] == ".rse":
+                description, thrust_source = Motor.import_rse(file_name)
+            else:
+                raise ValueError("File must be a .rse file.")
+        else:
+            raise ValueError("File name must be a string.")
+
+        thrust = Function(thrust_source, "Time (s)", "Thrust (N)", "linear", "zero")
+
+        # handle eng parameters
+        if not chamber_radius:
+            chamber_radius = description["description"][
+                "throat_diameter"
+            ]  # get motor diameter in meters
+
+        if not chamber_height:
+            chamber_height = description["description"][
+                "length"
+            ]  # get motor length in meters
+
+        if not propellant_initial_mass:
+            propellant_initial_mass = description["description"]["propellant_mass"]
+
+        if not dry_mass:
+            total_mass = description["description"]["total_mass"]
+            dry_mass = total_mass - propellant_initial_mass
+
+        if not nozzle_radius:
+            nozzle_radius = description["description"]["exit_diameter"]
+
+        return GenericMotor(
+            thrust_source=thrust,
+            burn_time=burn_time,
+            chamber_radius=chamber_radius,
+            chamber_height=chamber_height,
+            chamber_position=chamber_position,
+            propellant_initial_mass=propellant_initial_mass,
+            nozzle_radius=nozzle_radius,
+            dry_mass=dry_mass,
+            center_of_dry_mass_position=center_of_dry_mass_position,
+            dry_inertia=dry_inertia,
+            nozzle_position=nozzle_position,
+            reshape_thrust_curve=reshape_thrust_curve,
+            interpolation_method=interpolation_method,
+            coordinate_system_orientation=coordinate_system_orientation,
+        )
+
     def all_info(self):
         """Prints out all data and graphs available about the Motor."""
         # Print motor details

From 2a18cea77d48c41a2f616810a3cf1e394e63644a Mon Sep 17 00:00:00 2001
From: Julio Machado <julioromac@outlook.com>
Date: Sat, 29 Mar 2025 21:40:43 -0300
Subject: [PATCH 2/5] ENH: Adding tests to the methods of .rse file treatment.

---
 .../rse_example/rse_motor_example_file.rse    | 19 +++++++++
 tests/integration/test_environment.py         | 40 ++++++++++++++-----
 tests/integration/test_flight.py              | 28 +++++++++----
 .../integration/test_flight_data_importer.py  | 12 +++---
 tests/integration/test_rocket.py              |  4 +-
 tests/integration/test_sensor.py              |  4 +-
 tests/unit/test_genericmotor.py               | 33 +++++++++++++++
 7 files changed, 115 insertions(+), 25 deletions(-)
 create mode 100644 data/motors/rse_example/rse_motor_example_file.rse

diff --git a/data/motors/rse_example/rse_motor_example_file.rse b/data/motors/rse_example/rse_motor_example_file.rse
new file mode 100644
index 000000000..f934b9f2e
--- /dev/null
+++ b/data/motors/rse_example/rse_motor_example_file.rse
@@ -0,0 +1,19 @@
+<engine-database>
+  <engine-list>
+    <engine FDiv="10" FFix="1" FStep="-1." Isp="195.96" Itot="39.78" Type="reloadable" auto-calc-cg="1" auto-calc-mass="1"
+    avgThrust="18.082" burn-time="2.2" cgDiv="10" cgFix="1" cgStep="-1." code="E18" delays="4,8" dia="24." exitDia="0." initWt="57." 
+    len="70." mDiv="10" mFix="1" mStep="-1." massFrac="36.32" mfg="Aerotech" peakThrust="31." propWt="20.7" tDiv="10" tFix="1" 
+    tStep="-1." throatDia="0.">
+      <data>
+        <eng-data cg="35." f="0." m="20.7" t="0."/>
+        <eng-data cg="35." f="31." m="20.3774" t="0.04"/>
+        <eng-data cg="35." f="30." m="14.6638" t="0.4"/>
+        <eng-data cg="35." f="26.7" m="8.7629" t="0.8"/>
+        <eng-data cg="35." f="19.1" m="3.99638" t="1.2"/>
+        <eng-data cg="35." f="8." m="1.17602" t="1.6"/>
+        <eng-data cg="35." f="2.2" m="0.11448" t="2."/>
+        <eng-data cg="35." f="0." m="0." t="2.2"/>
+      </data>
+    </engine>
+  </engine-list>
+</engine-database>
diff --git a/tests/integration/test_environment.py b/tests/integration/test_environment.py
index e4c6b07f5..17d81a76e 100644
--- a/tests/integration/test_environment.py
+++ b/tests/integration/test_environment.py
@@ -28,7 +28,9 @@ def test_set_elevation_open_elevation(
 
 
 @patch("matplotlib.pyplot.show")
-def test_era5_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
+def test_era5_atmosphere(
+    mock_show, example_spaceport_env
+):  # pylint: disable=unused-argument
     """Tests the Reanalysis model with the ERA5 file. It uses an example file
     available in the data/weather folder of the RocketPy repository.
 
@@ -49,7 +51,9 @@ def test_era5_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=u
 
 
 @patch("matplotlib.pyplot.show")
-def test_custom_atmosphere(mock_show, example_plain_env):  # pylint: disable=unused-argument
+def test_custom_atmosphere(
+    mock_show, example_plain_env
+):  # pylint: disable=unused-argument
     """Tests the custom atmosphere model in the environment object.
 
     Parameters
@@ -74,7 +78,9 @@ def test_custom_atmosphere(mock_show, example_plain_env):  # pylint: disable=unu
 
 
 @patch("matplotlib.pyplot.show")
-def test_standard_atmosphere(mock_show, example_plain_env):  # pylint: disable=unused-argument
+def test_standard_atmosphere(
+    mock_show, example_plain_env
+):  # pylint: disable=unused-argument
     """Tests the standard atmosphere model in the environment object.
 
     Parameters
@@ -126,7 +132,9 @@ def test_windy_atmosphere(example_euroc_env, model_name):
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_gfs_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
+def test_gfs_atmosphere(
+    mock_show, example_spaceport_env
+):  # pylint: disable=unused-argument
     """Tests the Forecast model with the GFS file. It does not test the values,
     instead the test checks if the method runs without errors.
 
@@ -143,7 +151,9 @@ def test_gfs_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=un
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_nam_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
+def test_nam_atmosphere(
+    mock_show, example_spaceport_env
+):  # pylint: disable=unused-argument
     """Tests the Forecast model with the NAM file.
 
     Parameters
@@ -159,7 +169,9 @@ def test_nam_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=un
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_rap_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
+def test_rap_atmosphere(
+    mock_show, example_spaceport_env
+):  # pylint: disable=unused-argument
     today = date.today()
     now = datetime.now(timezone.utc)
     example_spaceport_env.set_date((today.year, today.month, today.day, now.hour))
@@ -169,7 +181,9 @@ def test_rap_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=un
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_gefs_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
+def test_gefs_atmosphere(
+    mock_show, example_spaceport_env
+):  # pylint: disable=unused-argument
     """Tests the Ensemble model with the GEFS file.
 
     Parameters
@@ -185,7 +199,9 @@ def test_gefs_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=u
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_wyoming_sounding_atmosphere(mock_show, example_plain_env):  # pylint: disable=unused-argument
+def test_wyoming_sounding_atmosphere(
+    mock_show, example_plain_env
+):  # pylint: disable=unused-argument
     """Asserts whether the Wyoming sounding model in the environment
     object behaves as expected with respect to some attributes such
     as pressure, barometric_height, wind_velocity and temperature.
@@ -220,7 +236,9 @@ def test_wyoming_sounding_atmosphere(mock_show, example_plain_env):  # pylint: d
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_hiresw_ensemble_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
+def test_hiresw_ensemble_atmosphere(
+    mock_show, example_spaceport_env
+):  # pylint: disable=unused-argument
     """Tests the Forecast model with the HIRESW file.
 
     Parameters
@@ -246,7 +264,9 @@ def test_hiresw_ensemble_atmosphere(mock_show, example_spaceport_env):  # pylint
 
 @pytest.mark.skip(reason="CMC model is currently not working")
 @patch("matplotlib.pyplot.show")
-def test_cmc_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
+def test_cmc_atmosphere(
+    mock_show, example_spaceport_env
+):  # pylint: disable=unused-argument
     """Tests the Ensemble model with the CMC file.
 
     Parameters
diff --git a/tests/integration/test_flight.py b/tests/integration/test_flight.py
index e1606ce75..3efc0c285 100644
--- a/tests/integration/test_flight.py
+++ b/tests/integration/test_flight.py
@@ -195,7 +195,9 @@ def test_export_pressures(flight_calisto_robust):
 
 
 @patch("matplotlib.pyplot.show")
-def test_hybrid_motor_flight(mock_show, flight_calisto_hybrid_modded):  # pylint: disable=unused-argument
+def test_hybrid_motor_flight(
+    mock_show, flight_calisto_hybrid_modded
+):  # pylint: disable=unused-argument
     """Test the flight of a rocket with a hybrid motor. This test only validates
     that a flight simulation can be performed with a hybrid motor; it does not
     validate the results.
@@ -211,7 +213,9 @@ def test_hybrid_motor_flight(mock_show, flight_calisto_hybrid_modded):  # pylint
 
 
 @patch("matplotlib.pyplot.show")
-def test_liquid_motor_flight(mock_show, flight_calisto_liquid_modded):  # pylint: disable=unused-argument
+def test_liquid_motor_flight(
+    mock_show, flight_calisto_liquid_modded
+):  # pylint: disable=unused-argument
     """Test the flight of a rocket with a liquid motor. This test only validates
     that a flight simulation can be performed with a liquid motor; it does not
     validate the results.
@@ -228,7 +232,9 @@ def test_liquid_motor_flight(mock_show, flight_calisto_liquid_modded):  # pylint
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_time_overshoot(mock_show, calisto_robust, example_spaceport_env):  # pylint: disable=unused-argument
+def test_time_overshoot(
+    mock_show, calisto_robust, example_spaceport_env
+):  # pylint: disable=unused-argument
     """Test the time_overshoot parameter of the Flight class. This basically
     calls the all_info() method for a simulation without time_overshoot and
     checks if it returns None. It is not testing if the values are correct,
@@ -257,7 +263,9 @@ def test_time_overshoot(mock_show, calisto_robust, example_spaceport_env):  # py
 
 
 @patch("matplotlib.pyplot.show")
-def test_simpler_parachute_triggers(mock_show, example_plain_env, calisto_robust):  # pylint: disable=unused-argument
+def test_simpler_parachute_triggers(
+    mock_show, example_plain_env, calisto_robust
+):  # pylint: disable=unused-argument
     """Tests different types of parachute triggers. This is important to ensure
     the code is working as intended, since the parachute triggers can have very
     different format definitions. It will add 3 parachutes using different
@@ -399,7 +407,9 @@ def test_eccentricity_on_flight(  # pylint: disable=unused-argument
 
 
 @patch("matplotlib.pyplot.show")
-def test_air_brakes_flight(mock_show, flight_calisto_air_brakes):  # pylint: disable=unused-argument
+def test_air_brakes_flight(
+    mock_show, flight_calisto_air_brakes
+):  # pylint: disable=unused-argument
     """Test the flight of a rocket with air brakes. This test only validates
     that a flight simulation can be performed with air brakes; it does not
     validate the results.
@@ -419,7 +429,9 @@ def test_air_brakes_flight(mock_show, flight_calisto_air_brakes):  # pylint: dis
 
 
 @patch("matplotlib.pyplot.show")
-def test_initial_solution(mock_show, example_plain_env, calisto_robust):  # pylint: disable=unused-argument
+def test_initial_solution(
+    mock_show, example_plain_env, calisto_robust
+):  # pylint: disable=unused-argument
     """Tests the initial_solution option of the Flight class. This test simply
     simulates the flight using the initial_solution option and checks if the
     all_info method returns None.
@@ -464,7 +476,9 @@ def test_initial_solution(mock_show, example_plain_env, calisto_robust):  # pyli
 
 
 @patch("matplotlib.pyplot.show")
-def test_empty_motor_flight(mock_show, example_plain_env, calisto_motorless):  # pylint: disable=unused-argument
+def test_empty_motor_flight(
+    mock_show, example_plain_env, calisto_motorless
+):  # pylint: disable=unused-argument
     flight = Flight(
         rocket=calisto_motorless,
         environment=example_plain_env,
diff --git a/tests/integration/test_flight_data_importer.py b/tests/integration/test_flight_data_importer.py
index 9cff30d57..0187e0397 100644
--- a/tests/integration/test_flight_data_importer.py
+++ b/tests/integration/test_flight_data_importer.py
@@ -26,9 +26,9 @@ def test_flight_importer_bella_lui():
     )
     assert fd.name == "Bella Lui, EPFL Rocket Team, 2020"
     assert "time" in fd._columns[path], "Can't find 'time' column in fd._columns"
-    assert "altitude" in fd._columns[path], (
-        "Can't find 'altitude' column in fd._columns"
-    )
+    assert (
+        "altitude" in fd._columns[path]
+    ), "Can't find 'altitude' column in fd._columns"
     assert "vz" in fd._columns[path], "Can't find 'vz' column in fd._columns"
     assert np.isclose(fd.altitude(0), 0.201, atol=1e-4)
     assert np.isclose(fd.vz(0), 5.028, atol=1e-4)
@@ -51,7 +51,7 @@ def test_flight_importer_ndrt():
     )
     assert fd.name == "NDRT Rocket team, 2020"
     assert "time" in fd._columns[path], "Can't find 'time' column in fd._columns"
-    assert "altitude" in fd._columns[path], (
-        "Can't find 'altitude' column in fd._columns"
-    )
+    assert (
+        "altitude" in fd._columns[path]
+    ), "Can't find 'altitude' column in fd._columns"
     assert np.isclose(fd.altitude(0), 0)
diff --git a/tests/integration/test_rocket.py b/tests/integration/test_rocket.py
index c47096617..9eeda0cdc 100644
--- a/tests/integration/test_rocket.py
+++ b/tests/integration/test_rocket.py
@@ -45,7 +45,9 @@ def test_airfoil(
 
 
 @patch("matplotlib.pyplot.show")
-def test_air_brakes_clamp_on(mock_show, calisto_air_brakes_clamp_on):  # pylint: disable=unused-argument
+def test_air_brakes_clamp_on(
+    mock_show, calisto_air_brakes_clamp_on
+):  # pylint: disable=unused-argument
     """Test the air brakes class with clamp on configuration. This test checks
     the basic attributes and the deployment_level setter. It also checks the
     all_info method.
diff --git a/tests/integration/test_sensor.py b/tests/integration/test_sensor.py
index 2d98326b3..744a4178b 100644
--- a/tests/integration/test_sensor.py
+++ b/tests/integration/test_sensor.py
@@ -89,7 +89,9 @@ def test_gnss_receiver(self):
 
 @pytest.mark.parametrize("plane", ["xz", "yz"])
 @patch("matplotlib.pyplot.show")
-def test_draw(mock_show, calisto_with_sensors, plane):  # pylint: disable=unused-argument
+def test_draw(
+    mock_show, calisto_with_sensors, plane
+):  # pylint: disable=unused-argument
     """Test the drawing of the sensors."""
     calisto_with_sensors.draw(plane=plane)
 
diff --git a/tests/unit/test_genericmotor.py b/tests/unit/test_genericmotor.py
index 40315d88d..278c9bbd6 100644
--- a/tests/unit/test_genericmotor.py
+++ b/tests/unit/test_genericmotor.py
@@ -180,3 +180,36 @@ def test_load_from_eng_file(generic_motor):
     assert generic_motor.thrust.y_array == pytest.approx(
         Function(points, "Time (s)", "Thrust (N)", "linear", "zero").y_array
     )
+
+
+def test_load_from_rse_file(generic_motor):
+    """Tests the GenericMotor.load_from_rse_file method.
+
+    Parameters
+    ----------
+    generic_motor : rocketpy.GenericMotor
+        The GenericMotor object to be used in the tests.
+    """
+
+    # Test the load_from_rse_file method
+    generic_motor = generic_motor.load_from_rse_file(
+        "data/motors/rse_example/rse_motor_example_file.rse"
+    )
+
+    # Check if the engine has been loaded correctly
+    assert generic_motor.thrust is not None
+    assert (
+        generic_motor.dry_mass == (57.0 - 20.7) / 1000
+    )  # Total mass - propellant mass
+    assert generic_motor.propellant_initial_mass == 20.7 / 1000
+    assert generic_motor.burn_time == (0.0, 2.2)
+    assert generic_motor.nozzle_radius == 0.0
+    assert generic_motor.chamber_radius == 24.0 / 1000
+    assert generic_motor.chamber_height == 70.0 / 1000
+
+    # Check the thrust curve values
+    thrust_curve = generic_motor.thrust.source
+    assert thrust_curve[0][0] == 0.0  # First time point
+    assert thrust_curve[0][1] == 0.0  # First thrust point
+    assert thrust_curve[-1][0] == 2.129  # Last point of time
+    assert thrust_curve[-1][1] == 0.0  # Last thrust point

From 668ac3559e79691b0ad645fb395ccbeb9e7c02e5 Mon Sep 17 00:00:00 2001
From: Julio Machado <julioromac@outlook.com>
Date: Sun, 30 Mar 2025 01:40:12 -0300
Subject: [PATCH 3/5] ENH: fixing mistakes on the method and test file

---
 rocketpy/motors/motor.py        |  4 ++--
 tests/unit/test_genericmotor.py | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/rocketpy/motors/motor.py b/rocketpy/motors/motor.py
index 4665014b3..cc6d56fd6 100644
--- a/rocketpy/motors/motor.py
+++ b/rocketpy/motors/motor.py
@@ -1046,7 +1046,7 @@ def import_rse(file_name):
             "diameter": float(engine.attrib.get("dia", 0)) / 1000,
             "length": float(engine.attrib.get("len", 0)) / 1000,
             "throat_diameter": float(engine.attrib.get("throatDia", 0)) / 1000,
-            "exit_diameter": float(engine.attrib.get("len", 0)) / 1000,
+            "exit_diameter": float(engine.attrib.get("exitDia", 0)) / 1000,
             "total_mass": float(engine.attrib.get("initWt", 0)) / 1000,
             "propellant_mass": float(engine.attrib.get("propWt", 0)) / 1000,
             "average_thrust": float(engine.attrib.get("avgThrust", 0)),
@@ -1749,7 +1749,7 @@ def load_from_rse_file(
         # handle eng parameters
         if not chamber_radius:
             chamber_radius = description["description"][
-                "throat_diameter"
+                "diameter"
             ]  # get motor diameter in meters
 
         if not chamber_height:
diff --git a/tests/unit/test_genericmotor.py b/tests/unit/test_genericmotor.py
index 278c9bbd6..776d7b691 100644
--- a/tests/unit/test_genericmotor.py
+++ b/tests/unit/test_genericmotor.py
@@ -198,18 +198,16 @@ def test_load_from_rse_file(generic_motor):
 
     # Check if the engine has been loaded correctly
     assert generic_motor.thrust is not None
-    assert (
-        generic_motor.dry_mass == (57.0 - 20.7) / 1000
-    )  # Total mass - propellant mass
-    assert generic_motor.propellant_initial_mass == 20.7 / 1000
+    assert generic_motor.dry_mass == 0.0363  # Total mass - propellant mass
+    assert generic_motor.propellant_initial_mass == 0.0207
     assert generic_motor.burn_time == (0.0, 2.2)
-    assert generic_motor.nozzle_radius == 0.0
-    assert generic_motor.chamber_radius == 24.0 / 1000
-    assert generic_motor.chamber_height == 70.0 / 1000
+    assert generic_motor.nozzle_radius == 0.00
+    assert generic_motor.chamber_radius == 0.024
+    assert generic_motor.chamber_height == 0.07
 
     # Check the thrust curve values
     thrust_curve = generic_motor.thrust.source
     assert thrust_curve[0][0] == 0.0  # First time point
     assert thrust_curve[0][1] == 0.0  # First thrust point
-    assert thrust_curve[-1][0] == 2.129  # Last point of time
+    assert thrust_curve[-1][0] == 2.2  # Last point of time
     assert thrust_curve[-1][1] == 0.0  # Last thrust point

From 9a8971d177a6162d652aeefa5754f6671013111b Mon Sep 17 00:00:00 2001
From: Julio Machado <julioromac@outlook.com>
Date: Mon, 31 Mar 2025 17:09:22 -0300
Subject: [PATCH 4/5] MNT: Running ruff

---
 rocketpy/motors/motor.py                      |  2 +-
 .../stochastic/stochastic_aero_surfaces.py    |  2 +-
 tests/integration/test_environment.py         | 40 +++++--------------
 tests/integration/test_flight.py              | 28 ++++---------
 .../integration/test_flight_data_importer.py  | 12 +++---
 tests/integration/test_rocket.py              |  4 +-
 tests/integration/test_sensor.py              |  4 +-
 7 files changed, 27 insertions(+), 65 deletions(-)

diff --git a/rocketpy/motors/motor.py b/rocketpy/motors/motor.py
index cc6d56fd6..6a12665dd 100644
--- a/rocketpy/motors/motor.py
+++ b/rocketpy/motors/motor.py
@@ -1,6 +1,6 @@
 import re
-import xml.etree.ElementTree as ET
 import warnings
+import xml.etree.ElementTree as ET
 from abc import ABC, abstractmethod
 from functools import cached_property
 from os import path
diff --git a/rocketpy/stochastic/stochastic_aero_surfaces.py b/rocketpy/stochastic/stochastic_aero_surfaces.py
index 5dda716bb..5e3750f48 100644
--- a/rocketpy/stochastic/stochastic_aero_surfaces.py
+++ b/rocketpy/stochastic/stochastic_aero_surfaces.py
@@ -4,12 +4,12 @@
 """
 
 from rocketpy.rocket.aero_surface import (
+    AirBrakes,
     EllipticalFins,
     NoseCone,
     RailButtons,
     Tail,
     TrapezoidalFins,
-    AirBrakes,
 )
 
 from .stochastic_model import StochasticModel
diff --git a/tests/integration/test_environment.py b/tests/integration/test_environment.py
index 17d81a76e..e4c6b07f5 100644
--- a/tests/integration/test_environment.py
+++ b/tests/integration/test_environment.py
@@ -28,9 +28,7 @@ def test_set_elevation_open_elevation(
 
 
 @patch("matplotlib.pyplot.show")
-def test_era5_atmosphere(
-    mock_show, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_era5_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
     """Tests the Reanalysis model with the ERA5 file. It uses an example file
     available in the data/weather folder of the RocketPy repository.
 
@@ -51,9 +49,7 @@ def test_era5_atmosphere(
 
 
 @patch("matplotlib.pyplot.show")
-def test_custom_atmosphere(
-    mock_show, example_plain_env
-):  # pylint: disable=unused-argument
+def test_custom_atmosphere(mock_show, example_plain_env):  # pylint: disable=unused-argument
     """Tests the custom atmosphere model in the environment object.
 
     Parameters
@@ -78,9 +74,7 @@ def test_custom_atmosphere(
 
 
 @patch("matplotlib.pyplot.show")
-def test_standard_atmosphere(
-    mock_show, example_plain_env
-):  # pylint: disable=unused-argument
+def test_standard_atmosphere(mock_show, example_plain_env):  # pylint: disable=unused-argument
     """Tests the standard atmosphere model in the environment object.
 
     Parameters
@@ -132,9 +126,7 @@ def test_windy_atmosphere(example_euroc_env, model_name):
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_gfs_atmosphere(
-    mock_show, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_gfs_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
     """Tests the Forecast model with the GFS file. It does not test the values,
     instead the test checks if the method runs without errors.
 
@@ -151,9 +143,7 @@ def test_gfs_atmosphere(
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_nam_atmosphere(
-    mock_show, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_nam_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
     """Tests the Forecast model with the NAM file.
 
     Parameters
@@ -169,9 +159,7 @@ def test_nam_atmosphere(
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_rap_atmosphere(
-    mock_show, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_rap_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
     today = date.today()
     now = datetime.now(timezone.utc)
     example_spaceport_env.set_date((today.year, today.month, today.day, now.hour))
@@ -181,9 +169,7 @@ def test_rap_atmosphere(
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_gefs_atmosphere(
-    mock_show, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_gefs_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
     """Tests the Ensemble model with the GEFS file.
 
     Parameters
@@ -199,9 +185,7 @@ def test_gefs_atmosphere(
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_wyoming_sounding_atmosphere(
-    mock_show, example_plain_env
-):  # pylint: disable=unused-argument
+def test_wyoming_sounding_atmosphere(mock_show, example_plain_env):  # pylint: disable=unused-argument
     """Asserts whether the Wyoming sounding model in the environment
     object behaves as expected with respect to some attributes such
     as pressure, barometric_height, wind_velocity and temperature.
@@ -236,9 +220,7 @@ def test_wyoming_sounding_atmosphere(
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_hiresw_ensemble_atmosphere(
-    mock_show, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_hiresw_ensemble_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
     """Tests the Forecast model with the HIRESW file.
 
     Parameters
@@ -264,9 +246,7 @@ def test_hiresw_ensemble_atmosphere(
 
 @pytest.mark.skip(reason="CMC model is currently not working")
 @patch("matplotlib.pyplot.show")
-def test_cmc_atmosphere(
-    mock_show, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_cmc_atmosphere(mock_show, example_spaceport_env):  # pylint: disable=unused-argument
     """Tests the Ensemble model with the CMC file.
 
     Parameters
diff --git a/tests/integration/test_flight.py b/tests/integration/test_flight.py
index 3efc0c285..e1606ce75 100644
--- a/tests/integration/test_flight.py
+++ b/tests/integration/test_flight.py
@@ -195,9 +195,7 @@ def test_export_pressures(flight_calisto_robust):
 
 
 @patch("matplotlib.pyplot.show")
-def test_hybrid_motor_flight(
-    mock_show, flight_calisto_hybrid_modded
-):  # pylint: disable=unused-argument
+def test_hybrid_motor_flight(mock_show, flight_calisto_hybrid_modded):  # pylint: disable=unused-argument
     """Test the flight of a rocket with a hybrid motor. This test only validates
     that a flight simulation can be performed with a hybrid motor; it does not
     validate the results.
@@ -213,9 +211,7 @@ def test_hybrid_motor_flight(
 
 
 @patch("matplotlib.pyplot.show")
-def test_liquid_motor_flight(
-    mock_show, flight_calisto_liquid_modded
-):  # pylint: disable=unused-argument
+def test_liquid_motor_flight(mock_show, flight_calisto_liquid_modded):  # pylint: disable=unused-argument
     """Test the flight of a rocket with a liquid motor. This test only validates
     that a flight simulation can be performed with a liquid motor; it does not
     validate the results.
@@ -232,9 +228,7 @@ def test_liquid_motor_flight(
 
 @pytest.mark.slow
 @patch("matplotlib.pyplot.show")
-def test_time_overshoot(
-    mock_show, calisto_robust, example_spaceport_env
-):  # pylint: disable=unused-argument
+def test_time_overshoot(mock_show, calisto_robust, example_spaceport_env):  # pylint: disable=unused-argument
     """Test the time_overshoot parameter of the Flight class. This basically
     calls the all_info() method for a simulation without time_overshoot and
     checks if it returns None. It is not testing if the values are correct,
@@ -263,9 +257,7 @@ def test_time_overshoot(
 
 
 @patch("matplotlib.pyplot.show")
-def test_simpler_parachute_triggers(
-    mock_show, example_plain_env, calisto_robust
-):  # pylint: disable=unused-argument
+def test_simpler_parachute_triggers(mock_show, example_plain_env, calisto_robust):  # pylint: disable=unused-argument
     """Tests different types of parachute triggers. This is important to ensure
     the code is working as intended, since the parachute triggers can have very
     different format definitions. It will add 3 parachutes using different
@@ -407,9 +399,7 @@ def test_eccentricity_on_flight(  # pylint: disable=unused-argument
 
 
 @patch("matplotlib.pyplot.show")
-def test_air_brakes_flight(
-    mock_show, flight_calisto_air_brakes
-):  # pylint: disable=unused-argument
+def test_air_brakes_flight(mock_show, flight_calisto_air_brakes):  # pylint: disable=unused-argument
     """Test the flight of a rocket with air brakes. This test only validates
     that a flight simulation can be performed with air brakes; it does not
     validate the results.
@@ -429,9 +419,7 @@ def test_air_brakes_flight(
 
 
 @patch("matplotlib.pyplot.show")
-def test_initial_solution(
-    mock_show, example_plain_env, calisto_robust
-):  # pylint: disable=unused-argument
+def test_initial_solution(mock_show, example_plain_env, calisto_robust):  # pylint: disable=unused-argument
     """Tests the initial_solution option of the Flight class. This test simply
     simulates the flight using the initial_solution option and checks if the
     all_info method returns None.
@@ -476,9 +464,7 @@ def test_initial_solution(
 
 
 @patch("matplotlib.pyplot.show")
-def test_empty_motor_flight(
-    mock_show, example_plain_env, calisto_motorless
-):  # pylint: disable=unused-argument
+def test_empty_motor_flight(mock_show, example_plain_env, calisto_motorless):  # pylint: disable=unused-argument
     flight = Flight(
         rocket=calisto_motorless,
         environment=example_plain_env,
diff --git a/tests/integration/test_flight_data_importer.py b/tests/integration/test_flight_data_importer.py
index 0187e0397..9cff30d57 100644
--- a/tests/integration/test_flight_data_importer.py
+++ b/tests/integration/test_flight_data_importer.py
@@ -26,9 +26,9 @@ def test_flight_importer_bella_lui():
     )
     assert fd.name == "Bella Lui, EPFL Rocket Team, 2020"
     assert "time" in fd._columns[path], "Can't find 'time' column in fd._columns"
-    assert (
-        "altitude" in fd._columns[path]
-    ), "Can't find 'altitude' column in fd._columns"
+    assert "altitude" in fd._columns[path], (
+        "Can't find 'altitude' column in fd._columns"
+    )
     assert "vz" in fd._columns[path], "Can't find 'vz' column in fd._columns"
     assert np.isclose(fd.altitude(0), 0.201, atol=1e-4)
     assert np.isclose(fd.vz(0), 5.028, atol=1e-4)
@@ -51,7 +51,7 @@ def test_flight_importer_ndrt():
     )
     assert fd.name == "NDRT Rocket team, 2020"
     assert "time" in fd._columns[path], "Can't find 'time' column in fd._columns"
-    assert (
-        "altitude" in fd._columns[path]
-    ), "Can't find 'altitude' column in fd._columns"
+    assert "altitude" in fd._columns[path], (
+        "Can't find 'altitude' column in fd._columns"
+    )
     assert np.isclose(fd.altitude(0), 0)
diff --git a/tests/integration/test_rocket.py b/tests/integration/test_rocket.py
index 9eeda0cdc..c47096617 100644
--- a/tests/integration/test_rocket.py
+++ b/tests/integration/test_rocket.py
@@ -45,9 +45,7 @@ def test_airfoil(
 
 
 @patch("matplotlib.pyplot.show")
-def test_air_brakes_clamp_on(
-    mock_show, calisto_air_brakes_clamp_on
-):  # pylint: disable=unused-argument
+def test_air_brakes_clamp_on(mock_show, calisto_air_brakes_clamp_on):  # pylint: disable=unused-argument
     """Test the air brakes class with clamp on configuration. This test checks
     the basic attributes and the deployment_level setter. It also checks the
     all_info method.
diff --git a/tests/integration/test_sensor.py b/tests/integration/test_sensor.py
index 744a4178b..2d98326b3 100644
--- a/tests/integration/test_sensor.py
+++ b/tests/integration/test_sensor.py
@@ -89,9 +89,7 @@ def test_gnss_receiver(self):
 
 @pytest.mark.parametrize("plane", ["xz", "yz"])
 @patch("matplotlib.pyplot.show")
-def test_draw(
-    mock_show, calisto_with_sensors, plane
-):  # pylint: disable=unused-argument
+def test_draw(mock_show, calisto_with_sensors, plane):  # pylint: disable=unused-argument
     """Test the drawing of the sensors."""
     calisto_with_sensors.draw(plane=plane)
 

From 028990c6ed60bf091667d5c4aeedc1d09d4952a9 Mon Sep 17 00:00:00 2001
From: Julio Machado <julioromac@outlook.com>
Date: Sat, 5 Apr 2025 12:01:26 -0300
Subject: [PATCH 5/5] MNT: Adding the PR to CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a2503d23..a59eebab5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ Attention: The newest changes should be on top -->
 
 ### Added
 
+- ENH: Support for the RSE file format has been added to the library [#798](https://github.com/RocketPy-Team/RocketPy/pull/798)
 
 ### Changed