pycontrails 0.54.2__cp310-cp310-win_amd64.whl → 0.54.4__cp310-cp310-win_amd64.whl

pycontrails/models/emissions/emissions.py

@@ -369,7 +369,7 @@ class Emissions(Model):
 
     def _nvpm_emission_indices_edb(
         self, edb_nvpm: EDBnvpm, fuel: Fuel
-    ) -> tuple[str, npt.NDArray[np.float64], npt.NDArray[np.float64]]:
+    ) -> tuple[str, npt.NDArray[np.floating], npt.NDArray[np.floating]]:
         """Calculate emission indices for nvPM mass and number.
 
         This method uses data from the ICAO EDB along with the T4/T2 methodology.
@@ -385,9 +385,9 @@ class Emissions(Model):
         -------
         nvpm_data_source : str
             Source of nvpm data.
-        nvpm_ei_m : npt.NDArray[np.float64]
+        nvpm_ei_m : npt.NDArray[np.floating]
             Non-volatile particulate matter (nvPM) mass emissions index, [:math:`kg/kg_{fuel}`]
-        nvpm_ei_n : npt.NDArray[np.float64]
+        nvpm_ei_n : npt.NDArray[np.floating]
             Black carbon number emissions index, [:math:`kg_{fuel}^{-1}`]
 
         References
@@ -408,7 +408,7 @@ class Emissions(Model):
 
     def _nvpm_emission_indices_sac(
         self, edb_gaseous: EDBGaseous, fuel: Fuel
-    ) -> tuple[str, npt.NDArray[np.float64], npt.NDArray[np.float64]]:
+    ) -> tuple[str, npt.NDArray[np.floating], npt.NDArray[np.floating]]:
         """Calculate EIs for nvPM mass and number assuming the profile of single annular combustors.
 
         nvPM EI_m is calculated using the FOX and ImFOX methods, while the nvPM EI_n
@@ -425,9 +425,9 @@ class Emissions(Model):
         -------
         nvpm_data_source : str
             Source of nvpm data.
-        nvpm_ei_m : npt.NDArray[np.float64]
+        nvpm_ei_m : npt.NDArray[np.floating]
             Non-volatile particulate matter (nvPM) mass emissions index, [:math:`kg/kg_{fuel}`]
-        nvpm_ei_n : npt.NDArray[np.float64]
+        nvpm_ei_n : npt.NDArray[np.floating]
             Black carbon number emissions index, [:math:`kg_{fuel}^{-1}`]
 
         References
@@ -467,7 +467,7 @@ class Emissions(Model):
 
     def _nvpm_emission_indices_constant(
         self,
-    ) -> tuple[str, npt.NDArray[np.float64], npt.NDArray[np.float64]]:
+    ) -> tuple[str, npt.NDArray[np.floating], npt.NDArray[np.floating]]:
         """
         Assume constant emission indices for nvPM mass and number.
 
@@ -481,9 +481,9 @@ class Emissions(Model):
         -------
         nvpm_data_source : str
             Source of nvpm data.
-        nvpm_ei_m : npt.NDArray[np.float64]
+        nvpm_ei_m : npt.NDArray[np.floating]
             Non-volatile particulate matter (nvPM) mass emissions index, [:math:`kg/kg_{fuel}`]
-        nvpm_ei_n : npt.NDArray[np.float64]
+        nvpm_ei_n : npt.NDArray[np.floating]
             Black carbon number emissions index, [:math:`kg_{fuel}^{-1}`]
 
         References
@@ -605,12 +605,12 @@ class Emissions(Model):
 
 def nitrogen_oxide_emissions_index_ffm2(
     edb_gaseous: EDBGaseous,
-    fuel_flow_per_engine: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-    air_pressure: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-    specific_humidity: None | npt.NDArray[np.float64] = None,
-) -> npt.NDArray[np.float64]:
+    fuel_flow_per_engine: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    air_pressure: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+    specific_humidity: None | npt.NDArray[np.floating] = None,
+) -> npt.NDArray[np.floating]:
     """
     Estimate the nitrogen oxide (NOx) emissions index (EI) using the Fuel Flow Method 2 (FFM2).
 
@@ -618,20 +618,20 @@ def nitrogen_oxide_emissions_index_ffm2(
     ----------
     edb_gaseous : EDBGaseous
         EDB gaseous data
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         fuel mass flow rate per engine, [:math:`kg s^{-1}`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    air_pressure : npt.NDArray[np.float64]
+    air_pressure : npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    air_temperature : npt.NDArray[np.float64]
+    air_temperature : npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
-    specific_humidity: npt.NDArray[np.float64]
+    specific_humidity: npt.NDArray[np.floating]
         specific humidity for each waypoint, [:math:`kg_{H_{2}O}/kg_{air}`]
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Nitrogen oxide emissions index for each waypoint, [:math:`kg_{NO_{X}}/kg_{fuel}`]
     """
     res_nox = ffm2.estimate_nox(
@@ -647,11 +647,11 @@ def nitrogen_oxide_emissions_index_ffm2(
 
 def carbon_monoxide_emissions_index_ffm2(
     edb_gaseous: EDBGaseous,
-    fuel_flow_per_engine: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-    air_pressure: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-) -> npt.NDArray[np.float64]:
+    fuel_flow_per_engine: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    air_pressure: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
     """
     Estimate the carbon monoxide (CO) emissions index (EI) using the Fuel Flow Method 2 (FFM2).
 
@@ -659,18 +659,18 @@ def carbon_monoxide_emissions_index_ffm2(
     ----------
     edb_gaseous : EDBGaseous
         EDB gaseous data
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         fuel mass flow rate per engine, [:math:`kg s^{-1}`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    air_pressure : npt.NDArray[np.float64]
+    air_pressure : npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    air_temperature : npt.NDArray[np.float64]
+    air_temperature : npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Carbon monoxide emissions index for each waypoint, [:math:`kg_{CO}/kg_{fuel}`]
     """
     res_co = ffm2.estimate_ei(
@@ -685,11 +685,11 @@ def carbon_monoxide_emissions_index_ffm2(
 
 def hydrocarbon_emissions_index_ffm2(
     edb_gaseous: EDBGaseous,
-    fuel_flow_per_engine: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-    air_pressure: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-) -> npt.NDArray[np.float64]:
+    fuel_flow_per_engine: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    air_pressure: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
     """
     Estimate the hydrocarbon (HC) emissions index (EI) using the Fuel Flow Method 2 (FFM2).
 
@@ -697,18 +697,18 @@ def hydrocarbon_emissions_index_ffm2(
     ----------
     edb_gaseous : EDBGaseous
         EDB gaseous data
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         fuel mass flow rate per engine, [:math:`kg s^{-1}`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    air_pressure : npt.NDArray[np.float64]
+    air_pressure : npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    air_temperature : npt.NDArray[np.float64]
+    air_temperature : npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Hydrocarbon emissions index for each waypoint, [:math:`kg_{HC}/kg_{fuel}`]
     """
     res_hc = ffm2.estimate_ei(
@@ -723,12 +723,12 @@ def hydrocarbon_emissions_index_ffm2(
 
 def get_nvpm_emissions_index_edb(
     edb_nvpm: EDBnvpm,
-    true_airspeed: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-    air_pressure: npt.NDArray[np.float64],
-    thrust_setting: npt.NDArray[np.float64],
+    true_airspeed: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+    air_pressure: npt.NDArray[np.floating],
+    thrust_setting: npt.NDArray[np.floating],
     q_fuel: float,
-) -> tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]:
+) -> tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]:
     r"""Calculate nvPM mass emissions index (nvpm_ei_m) and number emissions index (nvpm_ei_n).
 
     Interpolate the non-volatile particulate matter (nvPM) mass and number emissions index from
@@ -741,24 +741,24 @@ def get_nvpm_emissions_index_edb(
     ----------
     edb_nvpm : EDBnvpm
         EDB nvPM data
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         fuel mass flow rate per engine, [:math:`kg s^{-1}`]
-    air_temperature: npt.NDArray[np.float64]
+    air_temperature: npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
-    air_pressure: npt.NDArray[np.float64]
+    air_pressure: npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    thrust_setting : npt.NDArray[np.float64]
+    thrust_setting : npt.NDArray[np.floating]
         thrust setting
     q_fuel : float
         Lower calorific value (LCV) of fuel, [:math:`J \ kg_{fuel}^{-1}`].
 
     Returns
     -------
-    nvpm_ei_m : npt.NDArray[np.float64]
+    nvpm_ei_m : npt.NDArray[np.floating]
         Non-volatile particulate matter (nvPM) mass emissions index, [:math:`kg/kg_{fuel}`]
-    nvpm_ei_n : npt.NDArray[np.float64]
+    nvpm_ei_n : npt.NDArray[np.floating]
         Black carbon number emissions index, [:math:`kg_{fuel}^{-1}`]
     """
     # Non-dimensionalized thrust setting
@@ -781,13 +781,13 @@ def get_nvpm_emissions_index_edb(
 
 def nvpm_mass_emissions_index_sac(
     edb_gaseous: EDBGaseous,
-    air_pressure: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-    thrust_setting: npt.NDArray[np.float64],
-    fuel_flow_per_engine: npt.NDArray[np.float64],
+    air_pressure: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+    thrust_setting: npt.NDArray[np.floating],
+    fuel_flow_per_engine: npt.NDArray[np.floating],
     hydrogen_content: float,
-) -> npt.NDArray[np.float64]:
+) -> npt.NDArray[np.floating]:
     """Estimate nvPM mass emission index for singular annular combustor (SAC) engines.
 
     Here, SAC should not be confused with the Schmidt-Appleman Criterion.
@@ -799,22 +799,22 @@ def nvpm_mass_emissions_index_sac(
     ----------
     edb_gaseous : EDBGaseous
         EDB gaseous data
-    air_pressure: npt.NDArray[np.float64]
+    air_pressure: npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    air_temperature: npt.NDArray[np.float64]
+    air_temperature: npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
-    thrust_setting : npt.NDArray[np.float64]
+    thrust_setting : npt.NDArray[np.floating]
         thrust setting
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         fuel mass flow rate per engine, [:math:`kg s^{-1}`]
     hydrogen_content : float
         Engine unique identification number from the ICAO EDB
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         nvPM mass emissions index, [:math:`kg/kg_{fuel}`]
     """
     nvpm_ei_m_fox = black_carbon.mass_emissions_index_fox(
@@ -834,12 +834,12 @@ def nvpm_mass_emissions_index_sac(
 
 def nvpm_geometric_mean_diameter_sac(
     edb_gaseous: EDBGaseous,
-    air_pressure: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-    thrust_setting: npt.NDArray[np.float64],
+    air_pressure: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+    thrust_setting: npt.NDArray[np.floating],
     q_fuel: float,
-) -> npt.NDArray[np.float64]:
+) -> npt.NDArray[np.floating]:
     r"""
     Estimate nvPM geometric mean diameter for singular annular combustor (SAC) engines.
 
@@ -847,20 +847,20 @@ def nvpm_geometric_mean_diameter_sac(
     ----------
     edb_gaseous : EDBGaseous
         EDB gaseous data
-    air_pressure: npt.NDArray[np.float64]
+    air_pressure: npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    air_temperature: npt.NDArray[np.float64]
+    air_temperature: npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
-    thrust_setting : npt.NDArray[np.float64]
+    thrust_setting : npt.NDArray[np.floating]
         thrust setting
     q_fuel : float
         Lower calorific value (LCV) of fuel, [:math:`J \ kg_{fuel}^{-1}`].
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         nvPM geometric mean diameter, [:math:`m`]
     """
     nvpm_gmd = black_carbon.geometric_mean_diameter_sac(
@@ -877,11 +877,11 @@ def nvpm_geometric_mean_diameter_sac(
 
 def get_thrust_setting(
     edb_gaseous: EDBGaseous,
-    fuel_flow_per_engine: npt.NDArray[np.float64],
-    air_pressure: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-) -> npt.NDArray[np.float64]:
+    fuel_flow_per_engine: npt.NDArray[np.floating],
+    air_pressure: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
     """
     Approximate the engine thrust setting at cruise conditions.
 
@@ -893,18 +893,18 @@ def get_thrust_setting(
     ----------
     edb_gaseous : EDBGaseous
         EDB gaseous data
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         Fuel mass flow rate per engine, [:math:`kg s^{-1}`]
-    air_pressure: npt.NDArray[np.float64]
+    air_pressure: npt.NDArray[np.floating]
         Pressure altitude at each waypoint, [:math:`Pa`]
-    air_temperature: npt.NDArray[np.float64]
+    air_temperature: npt.NDArray[np.floating]
         Ambient temperature for each waypoint, [:math:`K`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         True airspeed for each waypoint, [:math:`m s^{-1}`]
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Engine thrust setting. Returns ``np.nan`` if engine data is
         not available in the ICAO EDB dataset.
     """

pycontrails/models/emissions/ffm2.py

@@ -172,27 +172,27 @@ def co_hc_emissions_index_profile(
 
 def estimate_nox(
     log_ei_nox_profile: EmissionsProfileInterpolator,
-    fuel_flow_per_engine: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-    air_pressure: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-    specific_humidity: None | npt.NDArray[np.float64] = None,
-) -> npt.NDArray[np.float64]:
+    fuel_flow_per_engine: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    air_pressure: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+    specific_humidity: None | npt.NDArray[np.floating] = None,
+) -> npt.NDArray[np.floating]:
     """Estimate the nitrogen oxide (NOx) emissions index (EI) at cruise conditions.
 
     Parameters
     ----------
     log_ei_nox_profile: EmissionsProfileInterpolator
         emissions profile containing the log of EI NOx versus log of fuel flow.
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         fuel mass flow rate per engine, [:math:`kg s^{-1}`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    air_pressure : npt.NDArray[np.float64]
+    air_pressure : npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    air_temperature : npt.NDArray[np.float64]
+    air_temperature : npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
-    specific_humidity: npt.NDArray[np.float64] | None
+    specific_humidity: npt.NDArray[np.floating] | None
         specific humidity for each waypoint, [:math:`kg_{H_{2}O}/kg_{air}`]
     """
 
@@ -215,24 +215,24 @@ def estimate_nox(
 
 def estimate_ei(
     log_ei_profile: EmissionsProfileInterpolator,
-    fuel_flow_per_engine: npt.NDArray[np.float64],
-    true_airspeed: npt.NDArray[np.float64],
-    air_pressure: npt.NDArray[np.float64],
-    air_temperature: npt.NDArray[np.float64],
-) -> npt.NDArray[np.float64]:
+    fuel_flow_per_engine: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    air_pressure: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
     """Estimate carbon monoxide (CO) or hydrocarbon (HC) emissions index (EI).
 
     Parameters
     ----------
     log_ei_profile: EmissionsProfileInterpolator
         emissions profile containing the log of EI CO or EI HC versus log of fuel flow.
-    fuel_flow_per_engine: npt.NDArray[np.float64]
+    fuel_flow_per_engine: npt.NDArray[np.floating]
         fuel mass flow rate per engine, [:math:`kg s^{-1}`]
-    true_airspeed: npt.NDArray[np.float64]
+    true_airspeed: npt.NDArray[np.floating]
         true airspeed for each waypoint, [:math:`m s^{-1}`]
-    air_pressure : npt.NDArray[np.float64]
+    air_pressure : npt.NDArray[np.floating]
         pressure altitude at each waypoint, [:math:`Pa`]
-    air_temperature : npt.NDArray[np.float64]
+    air_temperature : npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
     """
     mach_num = units.tas_to_mach_number(true_airspeed, air_temperature)
@@ -252,29 +252,29 @@ def estimate_ei(
 
 
 def ei_at_cruise(
-    ei_sl: npt.NDArray[np.float64],
-    theta_amb: npt.NDArray[np.float64],
-    delta_amb: npt.NDArray[np.float64],
+    ei_sl: npt.NDArray[np.floating],
+    theta_amb: npt.NDArray[np.floating],
+    delta_amb: npt.NDArray[np.floating],
     ei_type: str,
-) -> npt.NDArray[np.float64]:
+) -> npt.NDArray[np.floating]:
     """Convert the estimated EI at sea level to cruise conditions.
 
     Refer to Eqs. (15) and (16) in DuBois & Paynter (2006).
 
     Parameters
     ----------
-    ei_sl : npt.NDArray[np.float64]
+    ei_sl : npt.NDArray[np.floating]
         Sea level EI values.
-    theta_amb : npt.NDArray[np.float64]
+    theta_amb : npt.NDArray[np.floating]
         Ratio of the ambient temperature to the temperature at mean sea-level.
-    delta_amb : npt.NDArray[np.float64]
+    delta_amb : npt.NDArray[np.floating]
         Ratio of the pressure altitude to the surface pressure.
     ei_type : str
         One of {"HC", "CO", "NOX"}
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Estimated cruise EI values.
 
     References
@@ -292,30 +292,30 @@ def ei_at_cruise(
 
 
 def _get_humidity_correction_factor(
-    specific_humidity: npt.NDArray[np.float64],
-) -> npt.NDArray[np.float64]:
+    specific_humidity: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
     return np.exp(-19 * (specific_humidity - 0.00634))
 
 
 def _estimate_specific_humidity(
-    air_temperature: npt.NDArray[np.float64], air_pressure: npt.NDArray[np.float64], rh: float
-) -> npt.NDArray[np.float64]:
+    air_temperature: npt.NDArray[np.floating], air_pressure: npt.NDArray[np.floating], rh: float
+) -> npt.NDArray[np.floating]:
     """Estimate the specific humidity by assuming a fixed relative humidity.
 
     Refer to Eqs. (43), (44) and (45) in DuBois & Paynter (2006).
 
     Parameters
     ----------
-    air_temperature : npt.NDArray[np.float64]
+    air_temperature : npt.NDArray[np.floating]
         Air temperature, [:math:`K`]
-    air_pressure : npt.NDArray[np.float64]
+    air_pressure : npt.NDArray[np.floating]
         Air pressure, [:math:`Pa`]
     rh : float
         Relative humidity, [:math:`0 - 1`]
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Estimated specific humidity, [:math:`kg kg^{-1}`]
 
     References

pycontrails/models/humidity_scaling/humidity_scaling.py

@@ -625,7 +625,7 @@ def histogram_matching(
     level_type: str,
     member: int | None,
     q_method: str | None,
-) -> npt.NDArray[np.float64]:
+) -> npt.NDArray[np.floating]:
     """Map ERA5-derived RHi to its corresponding IAGOS quantile via histogram matching.
 
     This matching is performed on a **single** ERA5 ensemble member.
@@ -649,7 +649,7 @@ def histogram_matching(
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         The IAGOS quantiles corresponding to the ERA5-derived RHi values. Returned
         as a numpy array with the same shape and dtype as ``era5_rhi``.
     """
@@ -691,8 +691,8 @@ def histogram_matching(
 
 
 def histogram_matching_all_members(
-    era5_rhi_all_members: npt.NDArray[np.float64], member: int, q_method: str
-) -> tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]:
+    era5_rhi_all_members: npt.NDArray[np.floating], member: int, q_method: str
+) -> tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]:
     """Recalibrate ERA5-derived RHi values to IAGOS quantiles by histogram matching.
 
     This recalibration requires values for **all** ERA5 ensemble members. Currently, the
@@ -700,7 +700,7 @@ def histogram_matching_all_members(
 
     Parameters
     ----------
-    era5_rhi_all_members : npt.NDArray[np.float64]
+    era5_rhi_all_members : npt.NDArray[np.floating]
         ERA5-derived RHi values for all ensemble members. This array should have shape ``(n, 10)``.
     member : int
         The ERA5 ensemble member to use. Must be in the range ``[0, 10)``.
@@ -709,10 +709,10 @@ def histogram_matching_all_members(
 
     Returns
     -------
-    ensemble_mean_rhi : npt.NDArray[np.float64]
+    ensemble_mean_rhi : npt.NDArray[np.floating]
         The mean RHi values after histogram matching over all ensemble members.
         This is an array of shape ``(n,)``.
-    ensemble_member_rhi : npt.NDArray[np.float64]
+    ensemble_member_rhi : npt.NDArray[np.floating]
         The RHi values after histogram matching for the given ensemble member.
         This is an array of shape ``(n,)``.
     """
@@ -727,7 +727,7 @@ def histogram_matching_all_members(
 
     # Perform histogram matching on all other ensemble members
     # Add up the results into a single 'ensemble_mean_rhi' array
-    ensemble_mean_rhi: npt.NDArray[np.float64] = 0.0  # type: ignore[assignment]
+    ensemble_mean_rhi: npt.NDArray[np.floating] = 0.0  # type: ignore[assignment]
     for r in range(n_members):
         if r == member:
             ensemble_mean_rhi += ensemble_member_rhi
@@ -743,25 +743,25 @@ def histogram_matching_all_members(
 
 
 def eckel_scaling(
-    ensemble_mean_rhi: npt.NDArray[np.float64],
-    ensemble_member_rhi: npt.NDArray[np.float64],
+    ensemble_mean_rhi: npt.NDArray[np.floating],
+    ensemble_member_rhi: npt.NDArray[np.floating],
     q_method: str,
-) -> npt.NDArray[np.float64]:
+) -> npt.NDArray[np.floating]:
     """Apply Eckel scaling to the given RHi values.
 
     Parameters
     ----------
-    ensemble_mean_rhi : npt.NDArray[np.float64]
+    ensemble_mean_rhi : npt.NDArray[np.floating]
         The ensemble mean RHi values. This should be a 1D array with the same shape as
         ``ensemble_member_rhi``.
-    ensemble_member_rhi : npt.NDArray[np.float64]
+    ensemble_member_rhi : npt.NDArray[np.floating]
         The RHi values for a single ensemble member.
     q_method : {None, "cubic-spline", "log-q-log-p"}
         The interpolation method.
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         The scaled RHi values. Values are manually clipped at 0 to ensure
         only non-negative values are returned.
 
@@ -984,11 +984,11 @@ class HistogramMatchingWithEckel(HumidityScaling):
     @override
     def scale(  # type: ignore[override]
         self,
-        specific_humidity: npt.NDArray[np.float64],
-        air_temperature: npt.NDArray[np.float64],
-        air_pressure: npt.NDArray[np.float64],
+        specific_humidity: npt.NDArray[np.floating],
+        air_temperature: npt.NDArray[np.floating],
+        air_pressure: npt.NDArray[np.floating],
         **kwargs: Any,
-    ) -> tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]:
+    ) -> tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]:
         """Scale specific humidity values via histogram matching and Eckel scaling.
 
         Unlike the method on the base class, the method assumes each of the input
@@ -996,22 +996,22 @@ class HistogramMatchingWithEckel(HumidityScaling):
 
         Parameters
         ----------
-        specific_humidity : npt.NDArray[np.float64]
+        specific_humidity : npt.NDArray[np.floating]
             A 2D array of specific humidity values for all ERA5 ensemble members.
             The shape of this array must be ``(n, 10)``, where ``n`` is the number
             of observations and ``10`` is the number of ERA5 ensemble members.
-        air_temperature : npt.NDArray[np.float64]
+        air_temperature : npt.NDArray[np.floating]
             A 1D array of air temperature values with shape ``(n,)``.
-        air_pressure : npt.NDArray[np.float64]
+        air_pressure : npt.NDArray[np.floating]
             A 1D array of air pressure values with shape ``(n,)``.
         kwargs: Any
             Unused, kept for compatibility with the base class.
 
         Returns
         -------
-        specific_humidity : npt.NDArray[np.float64]
+        specific_humidity : npt.NDArray[np.floating]
             The recalibrated specific humidity values. A 1D array with shape ``(n,)``.
-        rhi : npt.NDArray[np.float64]
+        rhi : npt.NDArray[np.floating]
             The recalibrated RHi values. A 1D array with shape ``(n,)``.
         """
 

pycontrails/models/ps_model/__init__.py

@@ -4,14 +4,15 @@ from pycontrails.models.ps_model.ps_aircraft_params import (
     PSAircraftEngineParams,
     load_aircraft_engine_params,
 )
-from pycontrails.models.ps_model.ps_grid import PSGrid, ps_nominal_grid
+from pycontrails.models.ps_model.ps_grid import PSGrid, ps_nominal_grid, ps_nominal_optimize_mach
 from pycontrails.models.ps_model.ps_model import PSFlight, PSFlightParams
 
 __all__ = [
+    "PSAircraftEngineParams",
     "PSFlight",
     "PSFlightParams",
-    "PSAircraftEngineParams",
     "PSGrid",
     "load_aircraft_engine_params",
     "ps_nominal_grid",
+    "ps_nominal_optimize_mach",
 ]