Merge remote-tracking branch 'RocketPy/master' into enh/merge-from-rocketpy

Author: zuorenchen

CHANGELOG.md

@@ -32,42 +32,33 @@ Attention: The newest changes should be on top -->
 
 ### Added
 
-- ENH: ENH: Interactive 3D Flight Trajectory and Attitude Animation. [#1066](https://github.com/RocketPy-Team/RocketPy/pull/1066)
-- ENH: ENH: Interactive 3D Flight Trajectory and Attitude Animation [#1066](https://github.com/RocketPy-Team/RocketPy/pull/1066)
-- ENH: ENH: `Function` vectorized speed-up and refactor [#1049](https://github.com/RocketPy-Team/RocketPy/pull/1049)
-- ENH: REV: Revert PR #958 [#1063](https://github.com/RocketPy-Team/RocketPy/pull/1063)
-- ENH: MNT: remove duplicate and merge-sync entries from Unreleased changelog [#1062](https://github.com/RocketPy-Team/RocketPy/pull/1062)
 ### Changed
 
-- MNT: MNT: Remove Unused pylint Disable Statements. [#1067](https://github.com/RocketPy-Team/RocketPy/pull/1067)
-- MNT: MNT: Remove Unused pylint Disable Statements. [#1067](https://github.com/RocketPy-Team/RocketPy/pull/1067)
-
 ### Fixed
 
-## [v1.13.0] - 2026-07-04
+## [v1.13.0] - 2026-07-21
 
 ### Added
 
-- ENH: ENH: Refactor flight.py latitude/longitude to use inverted_haversine [#1055](https://github.com/RocketPy-Team/RocketPy/pull/1055)
-- ENH: TST: Add unit tests for evaluate_reduced_mass and remove TODO [#1051](https://github.com/RocketPy-Team/RocketPy/pull/1051)
+- ENH: BUG/MNT: pre-release v1.13.0 review fixes [#1074](https://github.com/RocketPy-Team/RocketPy/pull/1074)
+- ENH: `Function` vectorized speed-up and refactor [#1049](https://github.com/RocketPy-Team/RocketPy/pull/1049)
+- ENH: Interactive 3D Flight Trajectory and Attitude Animation (PyVista) [#1066](https://github.com/RocketPy-Team/RocketPy/pull/1066)
+- ENH: Add optional `max_time` to `StochasticFlight` and carry base-flight attributes into created objects [#1070](https://github.com/RocketPy-Team/RocketPy/pull/1070)
 - ENH: seed sensor measurement noise per instance [#1052](https://github.com/RocketPy-Team/RocketPy/pull/1052)
-- ENH: FIX: pre release hardening [#1047](https://github.com/RocketPy-Team/RocketPy/pull/1047)
-- ENH: DEV: Claude Code ruff hooks (auto-format on edit + pre-push lint guard) [#1046](https://github.com/RocketPy-Team/RocketPy/pull/1046)
-- ENH: CI: create a CI for testing docs updates + solve different docs issues [#1045](https://github.com/RocketPy-Team/RocketPy/pull/1045)
-- ENH: MNT: final fixes before next release [#1044](https://github.com/RocketPy-Team/RocketPy/pull/1044)
+- DEV: Claude Code ruff hooks (auto-format on edit + pre-push lint guard) [#1046](https://github.com/RocketPy-Team/RocketPy/pull/1046)
+- CI: create a CI for testing docs updates + solve different docs issues [#1045](https://github.com/RocketPy-Team/RocketPy/pull/1045)
+- MNT: final fixes before next release [#1044](https://github.com/RocketPy-Team/RocketPy/pull/1044)
 - ENH: Individual Fins: add `Fin`, `TrapezoidalFin`, `EllipticalFin`, and `FreeFormFin` classes for modeling asymmetric or individually-positioned fins [#818](https://github.com/RocketPy-Team/RocketPy/pull/818)
 - ENH: Add AIGFS and HRRR forecast models to the Environment class [#951](https://github.com/RocketPy-Team/RocketPy/pull/951)
 - ENH: Add RingClusterMotor for annular clustered motor modeling [#924](https://github.com/RocketPy-Team/RocketPy/pull/924)
 - ENH: Discrete and Continuous Controllers [#946](https://github.com/RocketPy-Team/RocketPy/pull/946)
 - ENH: Add custom exceptions and unstable rocket warning [#970](https://github.com/RocketPy-Team/RocketPy/pull/970)
 - ENH: Adopt built-in Python logging instead of print() calls (closes [#450](https://github.com/RocketPy-Team/RocketPy/issues/450)) [#973](https://github.com/RocketPy-Team/RocketPy/pull/973)
 - ENH: Pass acceleration (`u_dot`) data to parachute trigger functions [#911](https://github.com/RocketPy-Team/RocketPy/pull/911)
-- ENH: Add 3D flight trajectory and attitude animations in Flight plots layer [#909](https://github.com/RocketPy-Team/RocketPy/pull/909)
 - ENH: Monte Carlo Formatting Options [#947](https://github.com/RocketPy-Team/RocketPy/pull/947)
 - ENH: Adaptive Monte Carlo via Convergence Criteria [#922](https://github.com/RocketPy-Team/RocketPy/pull/922)
 - ENH: Auto-Detection of Pressure Conversion Factor [#966](https://github.com/RocketPy-Team/RocketPy/pull/966)
 - ENH: Introduce pressure unit conversion when using forecast/reanalysis/ensemble data [#955](https://github.com/RocketPy-Team/RocketPy/pull/955)
-- MNT: Refactor parachute implementation with abstract base and hemispherical model split [#958](https://github.com/RocketPy-Team/RocketPy/pull/958)
 - DOC: Add aerodynamic surfaces user guide [#1043](https://github.com/RocketPy-Team/RocketPy/pull/1043)
 - DOC: Add Valkyrie flight example (Bisky Team) [#967](https://github.com/RocketPy-Team/RocketPy/pull/967)
 - DOC: Configure AI instructions and update developer docs [#975](https://github.com/RocketPy-Team/RocketPy/pull/975)
@@ -78,11 +69,13 @@ Attention: The newest changes should be on top -->
 ### Changed
 
 - REL: bumps up rocketpy version to 1.13.0 [#1048](https://github.com/RocketPy-Team/RocketPy/pull/1048)
-- MNT: **Breaking**: `Parachute` is now an abstract base class and can no longer be instantiated directly; use `HemisphericalParachute` (or `Rocket.add_parachute`, which builds it for you). Loading old serialized files still works [#958](https://github.com/RocketPy-Team/RocketPy/pull/958)
+- MNT: Remove unused pylint disable statements [#1067](https://github.com/RocketPy-Team/RocketPy/pull/1067)
 - MNT: Discrete controllers are now called exactly once per time node (previously twice); results may change for stateful controllers and `observed_variables` no longer contains duplicated entries [#949](https://github.com/RocketPy-Team/RocketPy/pull/949)
 - MNT: Multi-dimensional linear `Function` objects now apply their extrapolation rule to points outside the data's convex hull (previously returned NaN) [#969](https://github.com/RocketPy-Team/RocketPy/pull/969)
-- MNT: Informational messages previously shown with `print()` now use Python logging and are silent by default; call `rocketpy.utils.enable_logging()` to see them [#973](https://github.com/RocketPy-Team/RocketPy/pull/973)
+- MNT: Informational messages previously shown with `print()` now use Python logging and are silent by default; call `rocketpy.utilities.enable_logging()` to see them [#973](https://github.com/RocketPy-Team/RocketPy/pull/973)
 - ENH: Refactor flight.py latitude/longitude to use inverted_haversine [#1055](https://github.com/RocketPy-Team/RocketPy/pull/1055)
+- MNT: `Function` with `interpolation="akima"` now matches the canonical (SciPy) Akima spline; interpolated values differ slightly from previous releases [#1049](https://github.com/RocketPy-Team/RocketPy/pull/1049)
+- MNT: `Function.differentiate` on 1-D array Functions now returns the analytical derivative of the interpolation (previously central finite differences); values at knots and domain edges may change [#1049](https://github.com/RocketPy-Team/RocketPy/pull/1049)
 
 ### Deprecated
 

docs/examples/index.rst

@@ -12,6 +12,13 @@ apogee of some rockets.
    :hide-code:
 
    import plotly.graph_objects as go
+   import plotly.io as pio
+
+   # Emit an HTML output that pulls plotly.js from the CDN, so the figure
+   # renders on the static documentation pages. Without an explicit renderer,
+   # ``fig.show()`` under jupyter-execute produces a plotly-mimetype bundle
+   # that a static HTML page has no frontend to display (blank chart).
+   pio.renderers.default = "notebook_connected"
 
    results = {
       # "Name (Year)": (simulated, measured) m

pyproject.toml

@@ -72,6 +72,7 @@ monte-carlo = [
 
 animation = [
     "pyvista>=0.45",
+    "imageio",
     "imageio-ffmpeg>=0.5"
 ]
 

requirements-optional.txt

@@ -7,4 +7,5 @@ imageio
 multiprocess>=0.70
 statsmodels
 prettytable
-vedo>=2024.5.1
+pyvista>=0.45
+imageio-ffmpeg>=0.5

rocketpy/environment/environment.py

@@ -38,6 +38,7 @@
     get_interval_date_from_time_array,
     get_pressure_levels_from_file,
     mask_and_clean_dataset,
+    pressure_unit_to_factor,
 )
 from rocketpy.environment.weather_model_mapping import WeatherModelMapping
 from rocketpy.mathutils.function import NUMERICAL_TYPES, Function, funcify_method
@@ -1158,9 +1159,7 @@ def __determine_pressure_conversion_factor(
         if pressure_conversion_factor is not None:
             # User explicitly supplied a value — honour it.
             if isinstance(pressure_conversion_factor, str):
-                return (
-                    100 if pressure_conversion_factor.lower() in ("mbar", "hpa") else 1
-                )
+                return pressure_unit_to_factor(pressure_conversion_factor)
             return pressure_conversion_factor
 
         # Auto-detect. Primary source: known-model lookup table.
@@ -1173,9 +1172,9 @@ def __determine_pressure_conversion_factor(
         _pa_files = {"GFS", "NAM", "RAP", "HRRR", "AIGFS"}
         if input_dict in _hpa_dicts or input_file in _hpa_dicts:
             return 100
-        if input_file in _hpa_files:
+        if input_dict in _hpa_files or input_file in _hpa_files:
             return 100
-        if input_file in _pa_files:
+        if input_dict in _pa_files or input_file in _pa_files:
             return 1
         return None
 
@@ -1360,11 +1359,7 @@ def set_atmospheric_model(  # pylint: disable=too-many-statements
                                 "Argument 'pressure_conversion_factor' must be strictly positive!"
                             )
                     if isinstance(pressure_conversion_factor, str):
-                        if pressure_conversion_factor.lower() not in (
-                            "mbar",
-                            "hpa",
-                            "pa",
-                        ):
+                        if pressure_unit_to_factor(pressure_conversion_factor) is None:
                             raise ValueError(
                                 "Argument 'pressure_conversion_factor' unit must be a standard pressure unit ('mbar', 'hPa', 'Pa')!"
                             )
@@ -2961,6 +2956,7 @@ def to_dict(self, **kwargs):
             "wind_direction_ensemble": getattr(self, "wind_direction_ensemble", None),
             "wind_speed_ensemble": getattr(self, "wind_speed_ensemble", None),
             "num_ensemble_members": getattr(self, "num_ensemble_members", None),
+            "ensemble_member": getattr(self, "ensemble_member", None),
         }
 
         if kwargs.get("include_outputs", False):
@@ -3027,6 +3023,7 @@ def from_dict(cls, data):  # pylint: disable=too-many-statements
             env.wind_direction_ensemble = data["wind_direction_ensemble"]
             env.wind_speed_ensemble = data["wind_speed_ensemble"]
             env.num_ensemble_members = data["num_ensemble_members"]
+            env.ensemble_member = data.get("ensemble_member", 0) or 0
 
         env.__reset_barometric_height_function()
         env.calculate_density_profile()

rocketpy/environment/tools.py

@@ -190,6 +190,35 @@ def geodesic_to_lambert_conformal(lat, lon, projection_variable, x_units="m"):
 ## These functions are meant to be used with netcdf4 datasets
 
 
+HPA_UNIT_SYNONYMS = frozenset(
+    {"hpa", "mbar", "mb", "millibar", "millibars", "hectopascal", "hectopascals"}
+)
+PA_UNIT_SYNONYMS = frozenset({"pa", "pascal"})
+
+
+def pressure_unit_to_factor(unit):
+    """Return the Pa conversion factor for a pressure-unit string.
+
+    Parameters
+    ----------
+    unit : str
+        Pressure unit label (case-insensitive), e.g. ``"hPa"``, ``"mb"``,
+        ``"millibar"`` or ``"Pa"``.
+
+    Returns
+    -------
+    int or None
+        ``100`` for hPa/millibar synonyms, ``1`` for Pa synonyms, or ``None``
+        if the unit string is not recognised.
+    """
+    unit = unit.lower().strip()
+    if unit in HPA_UNIT_SYNONYMS:
+        return 100
+    if unit in PA_UNIT_SYNONYMS:
+        return 1
+    return None
+
+
 def get_pressure_levels_from_file(data, dictionary, conversion_factor):
     """Extracts pressure levels from a netCDF4 dataset and converts them to Pa.
 
@@ -219,7 +248,7 @@ def get_pressure_levels_from_file(data, dictionary, conversion_factor):
         level_var = data.variables[dictionary["level"]]
         if conversion_factor is None:
             raw_units = getattr(level_var, "units", "").lower().strip()
-            if raw_units in ("hpa", "mbar", "millibars", "hectopascal", "hectopascals"):
+            if raw_units in HPA_UNIT_SYNONYMS:
                 conversion_factor = 100
             else:
                 conversion_factor = 1

rocketpy/mathutils/_calc/_fitting.py

@@ -100,6 +100,12 @@ def fit_akima(x, y):
     h = np.diff(x)
     m = np.diff(y) / h  # slopes of segments, shape (n-1,)
 
+    if n == 2:
+        # A single segment: Akima reduces to linear interpolation. The ghost-
+        # value reflection below indexes ``m[1]``/``m[-2]``, which do not exist
+        # for two points, so this case must be handled explicitly.
+        return np.vstack([y[:-1], m, np.zeros(1), np.zeros(1)])
+
     # Extend m with 2 ghost values on each side (Akima boundary reflection)
     # m_ext indices: 0..n+2  (n-1 interior + 2 left + 2 right)
     m_ext = np.empty(n + 3)
@@ -176,12 +182,15 @@ def fit_pchip(x, y):
         sign_change = (m[:-1] * m[1:]) <= 0
         pos_mask = ~sign_change
 
-        # Safe harmonic mean
-        t[1:-1] = np.where(
-            pos_mask,
-            (w1 + w2) / (w1 / m[:-1] + w2 / m[1:]),
-            0.0,
-        )
+        # Safe harmonic mean. The reciprocals are evaluated eagerly before
+        # ``np.where`` masks them, so silence the harmless divide-by-zero that
+        # occurs on flat segments (where ``pos_mask`` is already False).
+        with np.errstate(divide="ignore", invalid="ignore"):
+            t[1:-1] = np.where(
+                pos_mask,
+                (w1 + w2) / (w1 / m[:-1] + w2 / m[1:]),
+                0.0,
+            )
 
     # Boundary slopes: one-sided, clamped for monotonicity
     t[0] = _pchip_edge_slope(

rocketpy/motors/ring_cluster_motor.py

@@ -289,7 +289,9 @@ def info(self, *args, **kwargs):
         print("Cluster Configuration:")
         print(f" - Motors: {self.number} x {type(self.motor).__name__}")
         print(f" - Radial Distance: {self.radius} m")
-        return self.motor.info(*args, **kwargs)
+        # Report the cluster's own (N-times scaled) quantities, not the single
+        # base motor's, mirroring the correct behaviour of ``all_info``.
+        return super().info(*args, **kwargs)
 
     def to_dict(self, **kwargs):
         data = super().to_dict(**kwargs)

rocketpy/plots/flight_plots.py

@@ -888,10 +888,7 @@ def _animation_options(  # pylint: disable=too-many-statements
         options = {
             "background_color": kwargs.pop("background_color", None),
             "playback_controls": kwargs.pop("playback_controls", True),
-            "show_subrocket_point": kwargs.pop(
-                "show_subrocket_point",
-                kwargs.pop("show_subrocket_point", True),
-            ),
+            "show_subrocket_point": kwargs.pop("show_subrocket_point", True),
             "ground_image": kwargs.pop("ground_image", None),
             "ground_image_bounds": kwargs.pop("ground_image_bounds", None),
             "ground_image_coordinates": kwargs.pop("ground_image_coordinates", "enu"),
@@ -1265,9 +1262,10 @@ def animate_trajectory(  # pylint: disable=too-many-statements,too-many-locals
             Ground texture. A mapping may define ``image``, ``bounds``,
             ``coordinates`` (``"enu"`` or ``"latlon"``), and ``flip_y`` for
             geographic placement. Default is None.
-        color_by : {"speed", "mach", "dynamic_pressure", "acceleration",
-            "altitude", False, None}, optional
-            Trajectory point scalar. Default is "speed".
+        color_by : str | bool | None, optional
+            Trajectory point scalar, one of ``"speed"``, ``"mach"``,
+            ``"dynamic_pressure"``, ``"acceleration"``, ``"altitude"``,
+            ``False`` or ``None``. Default is "speed".
         show_kinematic_plots : bool, optional
             Show altitude, speed and acceleration histories. Default is False.
         camera_mode : {"static", "follow", "ground", "body"}, optional

rocketpy/rocket/parachute.py

@@ -1,4 +1,4 @@
-from inspect import signature
+from inspect import Parameter, signature
 
 import numpy as np
 
@@ -302,6 +302,10 @@ def __evaluate_trigger_function(self, trigger):  # pylint: disable=too-many-stat
         def _make_wrapper(fn):
             sig = signature(fn)
             params = list(sig.parameters.keys())
+            has_var_positional = any(
+                param.kind is Parameter.VAR_POSITIONAL
+                for param in sig.parameters.values()
+            )
 
             # detect if user function expects acceleration-like argument
             expects_udot = any(
@@ -324,6 +328,12 @@ def wrapper(p, h, y, sensors, u_dot):
                 if num_params >= 5:
                     # Pass both sensors and u_dot
                     return fn(p, h, y, sensors, u_dot)
+                if has_var_positional:
+                    # Variadic triggers (e.g. ``lambda *args: ...``) accept any
+                    # number of positional arguments. Preserve the pre-1.13
+                    # behaviour of calling them with (pressure, height, state,
+                    # sensors).
+                    return fn(p, h, y, sensors)
                 # If function signature is not supported, raise an error
                 raise TypeError(
                     f"Trigger function '{fn.__name__}' has unsupported signature: "