Merge branch 'develop' into master

Author: ayoubdsp

.vscode/settings.json

@@ -241,6 +241,7 @@
         "outerboundaryis",
         "overshootable",
         "planform",
+        "pointmassmotor",
         "polystyle",
         "powerseries",
         "Prandtl",

CHANGELOG.md

@@ -32,10 +32,20 @@ Attention: The newest changes should be on top -->
 
 ### Added
 
+- ENH: Add save functionality to `_MonteCarloPlots.all` method [#848](https://github.com/RocketPy-Team/RocketPy/pull/848)
+- ENH: Add persistent caching for ThrustCurve API [#881](https://github.com/RocketPy-Team/RocketPy/pull/881)
+- ENH: Compatibility with MERRA-2 atmosphere reanalysis files [#825](https://github.com/RocketPy-Team/RocketPy/pull/825)
+- ENH: Enable only radial burning [#815](https://github.com/RocketPy-Team/RocketPy/pull/815)
+- ENH: Add thrustcurve api integration to retrieve motor eng data [#870](https://github.com/RocketPy-Team/RocketPy/pull/870)
+- ENH: custom warning no motor or aerosurface [#871](https://github.com/RocketPy-Team/RocketPy/pull/871)
+
 ### Changed
 
+-
+
 ### Fixed
 
+- BUG: Fix parallel Monte Carlo simulation showing incorrect iteration count [#806](https://github.com/RocketPy-Team/RocketPy/pull/806)
 - BUG: Fix CSV column header spacing in FlightDataExporter [#864](https://github.com/RocketPy-Team/RocketPy/issues/864)
 
 
@@ -73,6 +83,7 @@ Attention: The newest changes should be on top -->
 ## [v1.10.0] - 2025-05-16
 
 ### Added
+
 - ENH: Support for ND arithmetic in Function class. [#810] (https://github.com/RocketPy-Team/RocketPy/pull/810)
 - ENH: allow users to provide custom samplers [#803](https://github.com/RocketPy-Team/RocketPy/pull/803)
 - ENH: Implement Multivariate Rejection Sampling (MRS) [#738] (https://github.com/RocketPy-Team/RocketPy/pull/738)

docs/user/environment/1-atm-models/reanalysis.rst

@@ -46,6 +46,27 @@ ERA5 data can be downloaded from the
     processed by RocketPy. It is recommended that you download only the \
     necessary data.
 
+MERRA-2
+-------
+
+The Modern-Era Retrospective analysis for Research and Applications, Version 2 (MERRA-2) is a NASA atmospheric reanalysis for the satellite era using the Goddard Earth Observing System, Version 5 (GEOS-5) with its Atmospheric Data Assimilation System (ADAS).
+
+You can download these files from the `NASA GES DISC <https://disc.gsfc.nasa.gov/>`_.
+
+To use MERRA-2 data in RocketPy, you generally need the **Assimilated Meteorological Fields** collection (specifically the 3D Pressure Level data, usually named ``inst3_3d_asm_Np``). Note that MERRA-2 files typically use the ``.nc4`` extension (NetCDF-4), which is fully supported by RocketPy.
+
+You can load these files using the ``dictionary="MERRA2"`` argument:
+
+.. code-block:: python
+
+    env.set_atmospheric_model(
+        type="Reanalysis",
+        file="MERRA2_400.inst3_3d_asm_Np.20230620.nc4",
+        dictionary="MERRA2"
+    )
+
+RocketPy automatically handles the unit conversion for MERRA-2's surface geopotential (energy) to geometric height (meters).
+
 
 Setting the Environment
 ^^^^^^^^^^^^^^^^^^^^^^^

docs/user/environment/1-atm-models/standard_atmosphere.rst

@@ -22,8 +22,7 @@ Other profiles can be derived from it, however, winds are automatically set to
 
     env.plots.atmospheric_model()
 
-.. skip one line with |
-| 
+|
 
 The International Standard Atmosphere can also be reset at any time by using the
 :meth:`rocketpy.Environment.set_atmospheric_model` method. For example:

docs/user/first_simulation.rst

@@ -90,6 +90,7 @@ regarding the launch site:
 
 | This roughly corresponds to the location of Spaceport America, New Mexico.
 
+
 Next, we need to specify the atmospheric model to be used. In this example,
 we will get GFS forecasts data from tomorrow.
 
@@ -110,6 +111,7 @@ of tomorrow:
 
 | Now we set the atmospheric model to be used:
 
+
 .. jupyter-execute::
 
     env.set_atmospheric_model(type="Forecast", file="GFS")
@@ -189,6 +191,7 @@ to specify several parameters:
 
 | We can see its characteristics by calling the info method:
 
+
 .. jupyter-execute::
 
     Pro75M1670.info()
@@ -637,8 +640,9 @@ and the rocket Mach number (see :meth:`rocketpy.Flight.mach_number`) to the file
     )
 
 | As you can see, the first argument is the file name to be created. The following
-arguments are the attributes to be exported. We can check the file by reading it
-with :func:`pandas.read_csv`:
+  arguments are the attributes to be exported. We can check the file by reading it
+  with :func:`pandas.read_csv`:
+
 
 .. jupyter-execute::
 
@@ -647,8 +651,9 @@ with :func:`pandas.read_csv`:
     pd.read_csv("calisto_flight_data.csv")
 
 | The file header specifies the meaning of each column. The time samples are
-obtained from the simulation solver steps. To export the data at a different
-sampling rate, use the ``time_step`` argument:
+  obtained from the simulation solver steps. To export the data at a different
+  sampling rate, use the ``time_step`` argument:
+
 
 .. jupyter-execute::
 

docs/user/index.rst

@@ -7,10 +7,11 @@ RocketPy's User Guide
 
    Installation and Requirements <installation.rst>
    First Simulation <first_simulation.rst>
+   3-DOF Simulations <three_dof_simulation.rst>
 
 .. toctree::
    :maxdepth: 1
-   :caption: Main Classes Usage  
+   :caption: Main Classes Usage
 
    Positions and Coordinate Systems <positions.rst>
    Motors <motors/motors.rst>

docs/user/motors/genericmotor.rst

@@ -106,3 +106,53 @@ note that the user can still provide the parameters manually if needed.
   The ``load_from_eng_file`` method is a very useful tool for simulating motors \
   when the user does not have all the information required to build a ``SolidMotor`` yet.
 
+The ``load_from_thrustcurve_api`` method
+----------------------------------------
+
+The ``GenericMotor`` class provides a convenience loader that downloads an
+`.eng` file from the ThrustCurve.org public API and builds a ``GenericMotor``
+instance from it. This is useful when you know a motor designation (for example
+``"M1670"``) but do not want to manually download and save the `.eng` file.
+
+The method also includes automatic caching for faster repeated usage.  
+Downloaded `.eng` files are stored in the user's RocketPy cache folder
+(``~/.rocketpy_cache``). When a subsequent request is made for the same motor,
+the cached copy is used instead of performing another network request.
+
+You can bypass the cache by setting ``no_cache=True``:
+
+- ``no_cache=False`` (default):  
+  Use a cached file if available; otherwise download and store it.
+
+- ``no_cache=True``:  
+  Always fetch a fresh version from the API and overwrite the cache.
+
+.. note::
+
+    This method performs network requests to the ThrustCurve API unless a cached
+    version exists. For automated testing or fully reproducible workflows, prefer
+    local `.eng` files or set ``no_cache=True`` explicitly.
+
+Example
+-------
+
+.. jupyter-execute::
+
+    from rocketpy.motors import GenericMotor
+
+    # Build a motor by name (requires network access unless cached)
+    motor = GenericMotor.load_from_thrustcurve_api("M1670")
+
+    # Print the motor information
+    motor.info()
+
+Using the no_cache option
+-------------------------
+
+If you want to force RocketPy to ignore the cache and download a fresh copy
+every time, use:
+
+.. jupyter-execute::
+
+    motor = GenericMotor.load_from_thrustcurve_api("M1670", no_cache=True)
+    motor.info()