Merge pull request #581 from RocketPy-Team/mnt/flight-simulation-speed-up

ENH: Flight simulation speed up

Author: Gui-FernandesBR

CHANGELOG.md

@@ -33,13 +33,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - ENH: Exponential backoff decorator (fix #449) [#588](https://github.com/RocketPy-Team/RocketPy/pull/588)
+- ENH: Function Validation Rework & Swap `np.searchsorted` to `bisect_left` [#582](https://github.com/RocketPy-Team/RocketPy/pull/582)
 - ENH: Add new stability margin properties to Flight class [#572](https://github.com/RocketPy-Team/RocketPy/pull/572)
 - ENH: adds `Function.remove_outliers` method [#554](https://github.com/RocketPy-Team/RocketPy/pull/554)
 
 ### Changed
 
 - BLD: Change setup.py to pyproject.toml [#589](https://github.com/RocketPy-Team/RocketPy/pull/589)
-- DEP: delete deprecated rocketpy.tools.cached_property [#587](https://github.com/RocketPy-Team/RocketPy/pull/587) 
+- DEP: delete deprecated rocketpy.tools.cached_property [#587](https://github.com/RocketPy-Team/RocketPy/pull/587)
+- ENH: Flight simulation speed up [#581] (https://github.com/RocketPy-Team/RocketPy/pull/581) 
 - MNT: Modularize Rocket Draw [#580](https://github.com/RocketPy-Team/RocketPy/pull/580)
 - DOC: Improvements of Environment docstring phrasing [#565](https://github.com/RocketPy-Team/RocketPy/pull/565)
 - MNT: Refactor flight prints module [#579](https://github.com/RocketPy-Team/RocketPy/pull/579)

rocketpy/environment/environment.py

@@ -1551,24 +1551,26 @@ def process_custom_atmosphere(
         # Check maximum height of custom wind input
         if not callable(self.wind_velocity_x.source):
             max_expected_height = max(self.wind_velocity_x[-1, 0], max_expected_height)
-        if not callable(self.wind_velocity_y.source):
-            max_expected_height = max(self.wind_velocity_y[-1, 0], max_expected_height)
 
-        # Compute wind profile direction and heading
-        wind_heading = (
-            lambda h: np.arctan2(self.wind_velocity_x(h), self.wind_velocity_y(h))
-            * (180 / np.pi)
-            % 360
-        )
+        def wind_heading_func(h):
+            return (
+                np.arctan2(
+                    self.wind_velocity_x.get_value_opt(h),
+                    self.wind_velocity_y.get_value_opt(h),
+                )
+                * (180 / np.pi)
+                % 360
+            )
+
         self.wind_heading = Function(
-            wind_heading,
+            wind_heading_func,
             inputs="Height Above Sea Level (m)",
             outputs="Wind Heading (Deg True)",
             interpolation="linear",
         )
 
         def wind_direction(h):
-            return (wind_heading(h) - 180) % 360
+            return (wind_heading_func(h) - 180) % 360
 
         self.wind_direction = Function(
             wind_direction,
@@ -1578,7 +1580,10 @@ def wind_direction(h):
         )
 
         def wind_speed(h):
-            return np.sqrt(self.wind_velocity_x(h) ** 2 + self.wind_velocity_y(h) ** 2)
+            return np.sqrt(
+                self.wind_velocity_x.get_value_opt(h) ** 2
+                + self.wind_velocity_y.get_value_opt(h) ** 2
+            )
 
         self.wind_speed = Function(
             wind_speed,
@@ -3197,22 +3202,26 @@ def add_wind_gust(self, wind_gust_x, wind_gust_y):
         # Reset wind heading and velocity magnitude
         self.wind_heading = Function(
             lambda h: (180 / np.pi)
-            * np.arctan2(self.wind_velocity_x(h), self.wind_velocity_y(h))
+            * np.arctan2(
+                self.wind_velocity_x.get_value_opt(h),
+                self.wind_velocity_y.get_value_opt(h),
+            )
             % 360,
             "Height (m)",
             "Wind Heading (degrees)",
             extrapolation="constant",
         )
         self.wind_speed = Function(
-            lambda h: (self.wind_velocity_x(h) ** 2 + self.wind_velocity_y(h) ** 2)
+            lambda h: (
+                self.wind_velocity_x.get_value_opt(h) ** 2
+                + self.wind_velocity_y.get_value_opt(h) ** 2
+            )
             ** 0.5,
             "Height (m)",
             "Wind Speed (m/s)",
             extrapolation="constant",
         )
 
-        return None
-
     def info(self):
         """Prints most important data and graphs available about the
         Environment.