pycontrails 0.40.1__cp39-cp39-macosx_11_0_arm64.whl → 0.42.0__cp39-cp39-macosx_11_0_arm64.whl

pycontrails/models/cocip/wind_shear.py

@@ -78,7 +78,7 @@ def wind_shear_normal(
     Returns
     -------
     ArrayScalarLike
-       Wind shear normal to axis, [:math:`m \ s^{-1}`]
+       Wind shear normal to axis, [:math:`s^{-1}`]
     """
     du_dz = (u_wind_top - u_wind_btm) / dz
     dv_dz = (v_wind_top - v_wind_btm) / dz
@@ -112,7 +112,7 @@ def wind_shear(
     Returns
     -------
     ArrayScalarLike
-       Total wind shear, [:math:`m \ s^{-1}`]
+       Total wind shear, [:math:`s^{-1}`]
     """
     du_dz = (u_wind_top - u_wind_btm) / dz
     dv_dz = (v_wind_top - v_wind_btm) / dz

pycontrails/models/emissions/emissions.py

@@ -494,7 +494,7 @@ class Emissions(Model):
     def _total_pollutant_emissions(self) -> None:
         # Required variables
         # FIXME: These two variables are already calculated in BADA models
-        dt_sec = flight._dt_waypoints(self.source["time"], dtype=self.source.altitude_ft.dtype)
+        dt_sec = flight.segment_duration(self.source["time"], dtype=self.source.altitude_ft.dtype)
         fuel_burn = jet.fuel_burn(self.source.get_data_or_attr("fuel_flow"), dt_sec)
 
         # TODO: these currently overwrite values and will throw warnings

pycontrails/models/humidity_scaling.py

@@ -149,7 +149,7 @@ class HumidityScaling(Model):
         kwargs = {k: self.get_source_param(k) for k in self.scaler_specific_keys}
 
         q, rhi = self.scale(q, T, p, **kwargs)
-        self.source.update(specific_humidity=q, rhi=rhi)  # type: ignore[arg-type]
+        self.source.update(specific_humidity=q, rhi=rhi)
 
         return self.source
 

pycontrails/models/issr.py

@@ -136,7 +136,7 @@ class ISSR(Model):
             rhi=self.source.data.get("rhi", None),  # if rhi already known, pass it in
             rhi_threshold=self.params["rhi_threshold"],
         )
-        self.source["issr"] = issr_  # type: ignore[assignment]
+        self.source["issr"] = issr_
 
         # Tag output with additional attrs when source is MetDataset
         if isinstance(self.source, MetDataset):

pycontrails/models/pcr.py

@@ -97,7 +97,7 @@ class PCR(Model):
         sac_model.eval(self.source)
 
         pcr_ = _pcr_from_issr_and_sac(self.source.data["issr"], self.source.data["sac"])
-        self.source["pcr"] = pcr_  # type: ignore[assignment]
+        self.source["pcr"] = pcr_
         # Tag output with additional attrs when source is MetDataset
         if isinstance(self.source, MetDataset):
             attrs = {**self.source["issr"].attrs, **self.source["sac"].attrs}

pycontrails/models/sac.py

@@ -139,11 +139,11 @@ class SAC(Model):
         sac_ = sac(rh, rh_crit_sac)
 
         # Attaching some intermediate artifacts onto the source
-        self.source["G"] = G  # type: ignore[assignment]
-        self.source["T_sat_liquid"] = T_sat_liquid_  # type: ignore[assignment]
-        self.source["rh"] = rh  # type: ignore[assignment]
-        self.source["rh_critical_sac"] = rh_crit_sac  # type: ignore[assignment]
-        self.source["sac"] = sac_  # type: ignore[assignment]
+        self.source["G"] = G
+        self.source["T_sat_liquid"] = T_sat_liquid_
+        self.source["rh"] = rh
+        self.source["rh_critical_sac"] = rh_crit_sac
+        self.source["sac"] = sac_
 
         # Tag output with additional attrs when source is MetDataset
         if isinstance(self.source, MetDataset):

pycontrails/physics/geo.py

@@ -32,11 +32,12 @@ def haversine(lons0: ArrayLike, lats0: ArrayLike, lons1: ArrayLike, lats1: Array
 
     Notes
     -----
-    This formula does not take into account the non-spheroidal (ellipsoidal) shape of the Earth
+    This formula does not take into account the non-spheroidal (ellipsoidal) shape of the Earth.
+    Originally referenced from https://andrew.hedges.name/experiments/haversine/.
 
     References
     ----------
-    Source: https://andrew.hedges.name/experiments/haversine/
+    - :cite:`CalculateDistanceBearing`
 
     See Also
     --------

pycontrails/physics/jet.py

@@ -12,7 +12,7 @@ import logging
 import numpy as np
 import numpy.typing as npt
 
-from pycontrails.core.flight import FlightPhase
+from pycontrails.core import flight
 from pycontrails.physics import constants, units
 from pycontrails.utils.types import ArrayScalarLike
 
@@ -24,76 +24,20 @@ logger = logging.getLogger(__name__)
 # -------------------
 
 
-def identify_phase_of_flight(rocd: np.ndarray, *, threshold_rocd: float = 100.0) -> FlightPhase:
-    """Identify the phase of flight (climb, cruise, descent) for each waypoint.
-
-    Parameters
-    ----------
-    rocd: np.ndarray
-        Rate of climb and descent, [:math:`ft min^{-1}`]
-    threshold_rocd: float
-        ROCD threshold to identify climb and descent, [:math:`ft min^{-1}`].
-        Currently set to 100 ft/min.
-
-    Returns
-    -------
-    FlightPhase
-        Booleans marking if the waypoints are at cruise, climb, or descent
-
-    Notes
-    -----
-    Flight data derived from ADS-B and radar sources could contain noise leading
-    to small changes in altitude and ROCD. Hence, an arbitrary ``threshold_rocd``
-    is specified to identify the different phases of flight.
-    """
-    nan = np.isnan(rocd)
-    climb = rocd > threshold_rocd
-    descent = rocd < -threshold_rocd
-    cruise = ~(nan | climb | descent)
-    return FlightPhase(cruise=cruise, climb=climb, descent=descent, nan=nan)
-
-
-def rate_of_climb_descent(
-    dt: npt.NDArray[np.float_], altitude_ft: npt.NDArray[np.float_]
-) -> npt.NDArray[np.float_]:
-    """Calculate the rate of climb and descent (ROCD).
-
-    Parameters
-    ----------
-    dt: npt.NDArray[np.float_]
-        Time difference between waypoints, [:math:`s`].
-        Expected to have numeric `dtype`, not `"timedelta64".
-    altitude_ft: npt.NDArray[np.float_]
-        Altitude of each waypoint, [:math:`ft`]
-
-    Returns
-    -------
-    npt.NDArray[np.float_]
-        Rate of climb and descent, [:math:`ft min^{-1}`]
-    """
-    dt_min = dt / 60.0
-
-    out = np.empty_like(altitude_ft)
-    out[:-1] = np.diff(altitude_ft) / dt_min[:-1]
-    out[-1] = np.nan
-
-    return out
-
-
 def clip_mach_number(
-    true_airspeed: np.ndarray,
-    air_temperature: np.ndarray,
+    true_airspeed: npt.NDArray[np.float_],
+    air_temperature: npt.NDArray[np.float_],
     max_mach_number: float,
-) -> tuple[np.ndarray, np.ndarray]:
+) -> tuple[npt.NDArray[np.float_], npt.NDArray[np.float_]]:
     r"""Compute the Mach number from the true airspeed and ambient temperature.
 
     This method clips the computed Mach number to the value of `max_mach_number`.
 
     Parameters
     ----------
-    true_airspeed : np.ndarray
+    true_airspeed : npt.NDArray[np.float_]
         Array of true airspeed, [:math:`m \ s^{-1}`]
-    air_temperature : np.ndarray
+    air_temperature : npt.NDArray[np.float_]
         Array of ambient temperature, [:math: `K`]
     max_mach_number : float
         Maximum mach number associated to aircraft, [:math: `Ma`]. If no clipping
@@ -101,7 +45,7 @@ def clip_mach_number(
 
     Returns
     -------
-    tuple[np.ndarray, np.ndarray] :
+    tuple[npt.NDArray[np.float_], npt.NDArray[np.float_]] :
         Pair of true airspeed and Mach number arrays. Both are corrected so that
         the Mach numbers are clipped at `max_mach_number`.
     """
@@ -110,8 +54,8 @@ def clip_mach_number(
     is_unrealistic = mach_num > max_mach_number
     if np.any(is_unrealistic):
         msg = (
-            f"Unrealistic Mach numbers found. Discovered {np.sum(is_unrealistic)} "
-            f"/ {is_unrealistic.size} values exceeding this, the largest of which "
+            f"Unrealistic Mach numbers found. Discovered {np.sum(is_unrealistic)} / "
+            f"{is_unrealistic.size} values exceeding this, the largest of which "
             f"is {np.nanmax(mach_num)}. These are all clipped at {max_mach_number}."
         )
         logger.debug(msg)
@@ -124,13 +68,13 @@ def clip_mach_number(
 
 
 def overall_propulsion_efficiency(
-    true_airspeed: np.ndarray,
-    F_thrust: np.ndarray,
-    fuel_flow: np.ndarray,
+    true_airspeed: npt.NDArray[np.float_],
+    F_thrust: npt.NDArray[np.float_],
+    fuel_flow: npt.NDArray[np.float_],
     q_fuel: float,
-    is_descent: np.ndarray | None,
+    is_descent: npt.NDArray[np.bool_] | None,
     threshold: float = 0.5,
-) -> np.ndarray:
+) -> npt.NDArray[np.float_]:
     r"""Calculate the overall propulsion efficiency (OPE).
 
     Negative OPE values can occur during the descent phase and is clipped to a
@@ -139,22 +83,22 @@ def overall_propulsion_efficiency(
 
     Parameters
     ----------
-    true_airspeed: np.ndarray
+    true_airspeed: npt.NDArray[np.float_]
         True airspeed for each waypoint, [:math:`m s^{-1}`].
-    F_thrust: np.ndarray
+    F_thrust: npt.NDArray[np.float_]
         Thrust force provided by the engine, [:math:`N`].
-    fuel_flow: np.ndarray
+    fuel_flow: npt.NDArray[np.float_]
         Fuel mass flow rate, [:math:`kg s^{-1}`].
     q_fuel : float
         Lower calorific value (LCV) of fuel, [:math:`J \ kg_{fuel}^{-1}`].
-    is_descent : np.ndarray | None
+    is_descent : npt.NDArray[np.float_] | None
         Boolean array that indicates if a waypoint is in a descent phase.
     threshold : float
         Upper bound for realistic engine efficiency.
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Overall propulsion efficiency (OPE)
 
     References
@@ -182,22 +126,24 @@ def overall_propulsion_efficiency(
 # -------------------
 
 
-def fuel_burn(fuel_flow: np.ndarray, dt: np.ndarray) -> np.ndarray:
+def fuel_burn(
+    fuel_flow: npt.NDArray[np.float_], segment_duration: npt.NDArray[np.float_]
+) -> npt.NDArray[np.float_]:
     """Calculate the fuel consumption at each waypoint.
 
     Parameters
     ----------
-    fuel_flow: np.ndarray
+    fuel_flow: npt.NDArray[np.float_]
         Fuel mass flow rate, [:math:`kg s^{-1}`]
-    dt: np.ndarray
+    segment_duration: npt.NDArray[np.float_]
         Time difference between waypoints, [:math:`s`]
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Fuel consumption at each waypoint, [:math:`kg`]
     """
-    return fuel_flow * dt
+    return fuel_flow * segment_duration
 
 
 def equivalent_fuel_flow_rate_at_sea_level(
@@ -234,23 +180,28 @@ def equivalent_fuel_flow_rate_at_sea_level(
 
 
 def reserve_fuel_requirements(
-    rocd: np.ndarray, fuel_flow: np.ndarray, fuel_burn: np.ndarray
+    rocd: npt.NDArray[np.float_],
+    altitude_ft: npt.NDArray[np.float_],
+    fuel_flow: npt.NDArray[np.float_],
+    fuel_burn: npt.NDArray[np.float_],
 ) -> float:
     r"""
     Estimate reserve fuel requirements.
 
     Parameters
     ----------
-    rocd: np.ndarray
+    rocd: npt.NDArray[np.float_]
         Rate of climb and descent, [:math:`ft \ min^{-1}`]
-    fuel_flow: np.ndarray
+    altitude_ft: npt.NDArray[np.float_]
+        Altitude, [:math:`ft`]
+    fuel_flow: npt.NDArray[np.float_]
         Fuel mass flow rate, [:math:`kg \ s^{-1}`].
-    fuel_burn: np.ndarray
+    fuel_burn: npt.NDArray[np.float_]
         Fuel consumption for each waypoint, [:math:`kg`]
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Reserve fuel requirements, [:math:`kg`]
 
     References
@@ -269,13 +220,15 @@ def reserve_fuel_requirements(
 
     See Also
     --------
-    :func:`identify_phase_of_flight`
+    :func:`flight.segment_phase`
     :func:`fuel_burn`
     """
-    phase_of_flight = identify_phase_of_flight(rocd)
+    segment_phase = flight.segment_phase(rocd, altitude_ft)
 
     # In case flight does not have cruise phase
-    is_climb_cruise = phase_of_flight.climb | phase_of_flight.cruise
+    is_climb_cruise = (segment_phase == flight.FlightPhase.CLIMB) | (
+        segment_phase == flight.FlightPhase.CRUISE
+    )
 
     # If there are no climb and cruise phase, take the mean
     if not np.all(is_climb_cruise):
@@ -295,17 +248,17 @@ def reserve_fuel_requirements(
 # -------------------
 
 
-def aircraft_weight(aircraft_mass: np.ndarray) -> np.ndarray:
+def aircraft_weight(aircraft_mass: npt.NDArray[np.float_]) -> npt.NDArray[np.float_]:
     """Calculate the aircraft weight at each waypoint.
 
     Parameters
     ----------
-    aircraft_mass : np.ndarray
+    aircraft_mass : npt.NDArray[np.float_]
         Aircraft mass, [:math:`kg`]
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Aircraft weight, [:math:`N`]
     """
     return aircraft_mass * constants.g
@@ -384,7 +337,7 @@ def update_aircraft_mass(
         Aircraft maximum take-off weight, [:math:`kg`].
     max_payload: float
         Aircraft maximum payload, [:math:`kg`]
-    fuel_burn: np.ndarray
+    fuel_burn: npt.NDArray[np.float_]
         Fuel consumption for each waypoint, [:math:`kg`]
     total_reserve_fuel: float
         Total reserve fuel requirements, [:math:`kg`]
@@ -567,30 +520,30 @@ def turbine_inlet_temperature(
 
 
 def thrust_force(
-    altitude: np.ndarray,
-    true_airspeed: np.ndarray,
-    dt: np.ndarray,
-    aircraft_mass: np.ndarray,
-    F_drag: np.ndarray,
-) -> np.ndarray:
+    altitude: npt.NDArray[np.float_],
+    true_airspeed: npt.NDArray[np.float_],
+    dt: npt.NDArray[np.float_],
+    aircraft_mass: npt.NDArray[np.float_],
+    F_drag: npt.NDArray[np.float_],
+) -> npt.NDArray[np.float_]:
     r"""Calculate the thrust force at each waypoint.
 
     Parameters
     ----------
-    altitude : np.ndarray
+    altitude : npt.NDArray[np.float_]
         Waypoint altitude, [:math:`m`]
-    true_airspeed : np.ndarray
+    true_airspeed : npt.NDArray[np.float_]
         True airspeed, [:math:`m \ s^{-1}`]
-    dt : np.ndarray
+    dt : npt.NDArray[np.float_]
         Time between waypoints, [:math:`s`]
-    aircraft_mass : np.ndarray
+    aircraft_mass : npt.NDArray[np.float_]
         Aircraft mass, [:math:`kg`]
-    F_drag : np.ndarray
+    F_drag : npt.NDArray[np.float_]
         Draft force, [:math:`N`]
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Thrust force, [:math:`N`]
 
     References
@@ -728,49 +681,49 @@ def air_to_fuel_ratio(
 # -------------------
 
 
-def temperature_ratio(T: np.ndarray) -> np.ndarray:
+def temperature_ratio(T: npt.NDArray[np.float_]) -> npt.NDArray[np.float_]:
     """Calculate the ratio of ambient temperature relative to the temperature at mean sea level.
 
     Parameters
     ----------
-    T : np.ndarray
+    T : npt.NDArray[np.float_]
         Air temperature, [:math:`K`]
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Ratio of the temperature to the temperature at mean sea-level (MSL).
     """
     return T / constants.T_msl
 
 
-def pressure_ratio(p: np.ndarray) -> np.ndarray:
+def pressure_ratio(p: npt.NDArray[np.float_]) -> npt.NDArray[np.float_]:
     """Calculate the ratio of ambient pressure relative to the surface pressure.
 
     Parameters
     ----------
-    p : np.ndarray
+    p : npt.NDArray[np.float_]
         Air pressure, [:math:`Pa`]
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Ratio of the pressure altitude to the surface pressure.
     """
     return p / constants.p_surface
 
 
-def density_ratio(rho: np.ndarray) -> np.ndarray:
+def density_ratio(rho: npt.NDArray[np.float_]) -> npt.NDArray[np.float_]:
     r"""Calculate the ratio of air density relative to the air density at mean-sea-level.
 
     Parameters
     ----------
-    rho : np.ndarray
+    rho : npt.NDArray[np.float_]
         Air density, [:math:`kg \ m^{3}`]
 
     Returns
     -------
-    np.ndarray
+    npt.NDArray[np.float_]
         Ratio of the density to the air density at mean sea-level (MSL).
     """
     return rho / constants.rho_msl

{pycontrails-0.40.1.dist-info → pycontrails-0.42.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.40.1
+Version: 0.42.0
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0
@@ -98,6 +98,7 @@ Provides-Extra: open3d
 Requires-Dist: open3d (>=0.14) ; extra == 'open3d'
 Provides-Extra: vis
 Requires-Dist: matplotlib (>=3.3) ; extra == 'vis'
+Requires-Dist: opencv-python-headless (>=4.5) ; extra == 'vis'
 Requires-Dist: scikit-learn (>=0.23) ; extra == 'vis'
 Requires-Dist: scikit-image (>=0.18) ; extra == 'vis'
 Requires-Dist: seaborn (>=0.11) ; extra == 'vis'

{pycontrails-0.40.1.dist-info → pycontrails-0.42.0.dist-info}/RECORD

@@ -1,27 +1,28 @@
-pycontrails-0.40.1.dist-info/RECORD,,
-pycontrails-0.40.1.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.40.1.dist-info/WHEEL,sha256=d8sjrkKo8h1ZY8Oxdq-K-58JEo6nLEfNKzkM0CYZtr0,108
-pycontrails-0.40.1.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
-pycontrails-0.40.1.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.40.1.dist-info/METADATA,sha256=Oe51rO4DRHIm5lSgR78bisV9Wx5XCA0E7Xo021uhVm8,8291
-pycontrails/_version.py,sha256=Uv7Kv0aTKGB_HcctAoescgkUZZANf1_pdzcWwwttsDc,162
+pycontrails-0.42.0.dist-info/RECORD,,
+pycontrails-0.42.0.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.42.0.dist-info/WHEEL,sha256=d8sjrkKo8h1ZY8Oxdq-K-58JEo6nLEfNKzkM0CYZtr0,108
+pycontrails-0.42.0.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
+pycontrails-0.42.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.42.0.dist-info/METADATA,sha256=xQ9tt3JbcEkYt0cretDHsuaUW0Aorvo93bIC2Ue6CaM,8354
+pycontrails/_version.py,sha256=CprMv6GTEx4IrrUdo6yTukVOLmxjWTO3U6cWecLEjMA,162
 pycontrails/__init__.py,sha256=sf7Xhr91V2jAvcQkla9oPqNCaXSKQp2M_dcxkiVkl6w,1943
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=nd1shWNp3A7ebihYgiUF-SHEtk_gpuuj65KBpCMpK7Q,57940
-pycontrails/core/rgi_cython.cpython-39-darwin.so,sha256=YvlNycR1yUuhx-KIbxBFivPHfTsnzwtyC400Q_i7zWM,261692
+pycontrails/core/vector.py,sha256=qxxYQK1YJF5rC5d3wIeOumlDh0QPATiAUTFYipQhEtQ,58368
+pycontrails/core/rgi_cython.cpython-39-darwin.so,sha256=s2Q4wCdEYJT8hFnIkUe6aXnWlVB_32nie-s1ZHGvItM,261692
 pycontrails/core/models.py,sha256=eapTP-JlMgfXVvvLn3WcbushGpCRgbUp3u25sgwi9IU,26792
 pycontrails/core/interpolation.py,sha256=3SK7xE0ChmCc7Ev4uM1saUF3LhS7h0mqNMk4qR3XxwY,24032
-pycontrails/core/fleet.py,sha256=7BqRWNWAHhtpYsGSslYiMo1Zk4cM9vJe_L7UrZHi2dM,12341
-pycontrails/core/flight.py,sha256=o6LfqDhd2WRbVEiPxKU263dZvfrjH0JieRY1-LmqjGw,49611
+pycontrails/core/fleet.py,sha256=L-tQPLjflT_ofc5z0mt49O2o4_gzXxoQTpCZLA_VkpE,12453
+pycontrails/core/flight.py,sha256=qd0lZQ_0xIUVMbDByOVlYl_8gdm85r0tPtK5SIlptcM,57318
 pycontrails/core/fuel.py,sha256=lEMUgLeFBoazDsiKN07s9udQ12xghOos5v3H9bjveBs,4044
-pycontrails/core/polygon.py,sha256=mkpvZ7y5M-3lJAYyM_-LJQuUwVuVUVz6P1ZbEGMU0NU,18361
-pycontrails/core/datalib.py,sha256=JVI1rGndJ6GgcfbVI8f3jpk1nROILvc2jCYumfCmEFI,21346
+pycontrails/core/polygon.py,sha256=FlFHJvonnxajq6iY12cuqW-MP8wGGeb3aiNJh-hks3g,16636
+pycontrails/core/datalib.py,sha256=BT-iFvD2nACKqh82j0wxBRcRgH2WL8VtN3FdSmNFMiQ,21517
 pycontrails/core/cache.py,sha256=uMzN45MUgIni1uhlypLVjc0NhFDvn6m-uK78p9sDdE8,28536
 pycontrails/core/__init__.py,sha256=C6bOLNBKeQaLCHCRza1oPrQTUazutPST7hX4C6O2MG0,866
-pycontrails/core/met.py,sha256=bEFiBItpxNzF0-HsTHcy4KqdJ4RvgkoPHxC1cjSXDfA,87281
+pycontrails/core/met.py,sha256=jID-joG-1Mm-SSHVAWijOZL6yLwGd7GJAs2v7dybR2E,86826
+pycontrails/core/airports.py,sha256=5D0VF9DxleQlVOmMW-P8_fVVkob-aB3doO1Co2XNFss,6766
 pycontrails/core/met_var.py,sha256=-gaodcmxx507ryMVKvFclqKkf1c8OHVVtXeG9s2eOOs,9191
 pycontrails/core/coordinates.py,sha256=b7D2lknnnwh8rBSla9M3ojqRYiASAOrVv0OAFD8xpDw,5078
-pycontrails/datalib/__init__.py,sha256=xcEVKnOmDvtswY6SQgiSVAWmx4YMTaqZECSnDzsTbEQ,200
+pycontrails/datalib/__init__.py,sha256=s5b8W6scXgespKZjPcaC-8jyLd3FqZqN0BZccLxaGuE,237
 pycontrails/datalib/ecmwf/era5.py,sha256=ulII_wQDSLmaqpMdZpAlOCmCCxhpzfSdBBgb8NW4ioA,19590
 pycontrails/datalib/ecmwf/hres.py,sha256=wnGSZ67fnJ7NOw4hZXk3UCNcfFvShK1pWMm4nx0fz6c,30333
 pycontrails/datalib/ecmwf/variables.py,sha256=akqjUS3WKnSzV1Y0KkHLylH7QByvitc3wo8NBFeSNew,8714
@@ -31,6 +32,8 @@ pycontrails/datalib/ecmwf/ifs.py,sha256=2Atnpc4q6Yy9LjEyE4tYzmnlC0bnnbzUiZvj7XUh
 pycontrails/datalib/gfs/gfs.py,sha256=-3_Qd1fKRU2LYCBK8mDvc9FycL2lYTEzJfXeAXpP73M,23084
 pycontrails/datalib/gfs/variables.py,sha256=s6rKyFdDA8E0Jz8X4twM7mgq5zhRGlk5qTedItyqoY8,2860
 pycontrails/datalib/gfs/__init__.py,sha256=tWxgqmlW8Uo07J-3fBTXPrteatzTka9mSXomhWy3NVA,684
+pycontrails/datalib/spire/spire.py,sha256=l52ID6LdYWpWcxxVbupCBono06MvPfwIBOGI9AcxpHQ,25351
+pycontrails/datalib/spire/__init__.py,sha256=4EZPJUmNnF8v2n6QhBvSi_3rYXRBX2zGcPE-WEA-dP8,343
 pycontrails/ext/cirium/__init__.py,sha256=dkNoMUbMfNQJCK69OMgspJGBBI5T6rXzp2MqjDtfkTw,406
 pycontrails/ext/bada/__init__.py,sha256=LYRF_nDHDocSJ603XSJKEEFIX0kfUpFBMXercEndQd8,1054
 pycontrails/utils/iteration.py,sha256=UjMn2FRDyC0A7q_MqKNpqqeNZm-lA23Ws-KV7zFzAl4,292
@@ -39,23 +42,23 @@ pycontrails/utils/__init__.py,sha256=Gt_57sBgfliFSxx9sDpuchykFDxmM11Wg9xAeSqPcnI
 pycontrails/utils/types.py,sha256=0uH2eVmQJZiL76N0v_UtHDyv3FJHeRd7BxEZ_occ0n4,4525
 pycontrails/utils/temp.py,sha256=6BlJ5NaQpACyL-n3FuqfscFb9Mfbgvs72BwWfSzBfmU,1100
 pycontrails/utils/json.py,sha256=lcZtaeJQNx_U5rgR322spbI8zs1XcQ-5So1bb26ow9E,5993
-pycontrails/models/humidity_scaling.py,sha256=MtirrysltE2s0e0zs-UxoG0qCBEQr6n8mQPssckgsoA,19949
+pycontrails/models/humidity_scaling.py,sha256=pmKDGFT9wRkz7u_qHjeE1uZSi_lOADM2BVg0VlpZof4,19923
 pycontrails/models/pcc.py,sha256=yWi0TochaCWCgrb68dUad9xPMqysIRa2hr6VT8PvxL4,11286
 pycontrails/models/tau_cirrus.py,sha256=jYilgsGQw7aFLjIJaG8zvbu8ITNGlXZvbl18C8vHbE4,4491
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
-pycontrails/models/issr.py,sha256=mPDH1S2pmp6uOO4OR7Vw7jlXptk3B8P3s2EaxjgtZPM,7605
-pycontrails/models/sac.py,sha256=FejQdWiio1emxNuo15UbV559QEs1NdzOp423a3ttEf0,16245
+pycontrails/models/issr.py,sha256=VIafGHMXLrTnU52WKvpujsKwUIPu4cVwFjGbB1-9ncs,7577
+pycontrails/models/sac.py,sha256=6kwCAC3kFfgXiEJfyEzdPdH9OhlguPaaVBiESSPSFBs,16105
 pycontrails/models/accf.py,sha256=WRFGNrkt2hLgO-mIsgk3JXk9_R7Hbw0jCPUC6iGpcCg,12368
 pycontrails/models/aircraft_performance.py,sha256=r-SdOw6Aor9JXIz4mVKe7HTrG4lKCXpAraUY2KTZhiE,1722
-pycontrails/models/pcr.py,sha256=locpyVbjMRJD3c0EW2eMpZ4elSuoy6ITn0lTl6tsUnI,5928
+pycontrails/models/pcr.py,sha256=m9cLtZr2DK4omtljgWdIVzDpQAeb3hDEDVVfr6zMDtM,5900
 pycontrails/models/emissions/__init__.py,sha256=MifzpNgS4b4NOjfh2oPYQCs_pvvkb97YvOY7jOHeYWM,122
 pycontrails/models/emissions/ffm2.py,sha256=n08PnKM9DigYXMwPmA2GTNi6UGeLxC_dNAwank6AeCs,11943
-pycontrails/models/emissions/emissions.py,sha256=s-mPlLmPG9mSKRyWVOPgpVGpOz8PabyJLlNiV5oYKDo,44626
+pycontrails/models/emissions/emissions.py,sha256=VW7ZPWmeWfmIsEgcQ88-A08YlmdBTpKXaFXWEoyjm-8,44629
 pycontrails/models/emissions/black_carbon.py,sha256=EDU5yMTuPeWQIeUE3YDkZ6HHFii8ngfi67Svt3AOVH4,20122
 pycontrails/models/emissions/static/edb-gaseous-v28c-engines.csv,sha256=9mok7P9NQSNJnej_gna29pTbgBuZsfI9N5OOoj1S4WI,118901
 pycontrails/models/emissions/static/edb-nvpm-v28c-engines.csv,sha256=otZ3PWXcbu7ZuEgZ3v3bLB0CGjGRAacd69CGFUXAdSU,63472
 pycontrails/models/cocip/radiative_forcing.py,sha256=ReLufq2BWw_Vot18MIBkTkaOqNXrbGyGcoZnAwO0NOg,28853
-pycontrails/models/cocip/wind_shear.py,sha256=g6T_ZL77Vs7kxagrp6o_nFpycbnc5SyA4PBL1DOD0nA,3735
+pycontrails/models/cocip/wind_shear.py,sha256=p4QVwqcpqCP4Pf8rAHPhU_rPM6LlmuWy_fSpOwdIi5w,3727
 pycontrails/models/cocip/cocip.py,sha256=PDnMfZZ7FXqd5r-WWtQCZurD_FyLIvcY2qBELw0YXZE,86552
 pycontrails/models/cocip/__init__.py,sha256=vBicDVNyw-M3bglx1iVplxm6CQRPRk5SS-3_VgL7WQM,370
 pycontrails/models/cocip/cocip_params.py,sha256=0624P6cVc2vBeD8-2S3lMnfZtKkdOaycGhscgyp_nYo,9098
@@ -70,9 +73,9 @@ pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=fe7w2bw-wQ-PG8ua5K7nBb1
 pycontrails/models/cocipgrid/__init__.py,sha256=ar6bF_8Pusbb-myujz_q5ntFylQTNH8yiM8fxP7Zk30,262
 pycontrails/models/cocipgrid/cocip_time_handling.py,sha256=kXO8ePbmjlqZgdV6FMxqA7IAWXUQtVQDRU8RJ12ClWU,13826
 pycontrails/models/cocipgrid/cocip_grid.py,sha256=RCtYk1I49qNgALzLaNlI6EoJaAX4JMmXr_pDYUYJhy4,84548
-pycontrails/physics/geo.py,sha256=ysIKDTTkcDkA3xZBr9l1I7HdkUaagwOcwd499dzp_qY,25061
+pycontrails/physics/geo.py,sha256=-PoXkcdRJ-KR_a7YdZN15q-b5DnGuSuYboG8ATzqFOM,25121
 pycontrails/physics/units.py,sha256=MV2C3qDV7Qf9Bk-ri_crqNSY-qSZj8MPdelNNu--crM,11349
 pycontrails/physics/constants.py,sha256=GJ_M9W7N78osXopNIfRDcHuqcaINLLAhOpOHQBsaI3I,2955
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44
 pycontrails/physics/thermo.py,sha256=AT5AcAsjpxL5xvAH7Lbjphmo54ynP9EmCxL9QOE0Kvg,12811
-pycontrails/physics/jet.py,sha256=uFynNHcLDrSA2VIIqnSdMRX3E7HmAgQYUxWF2zzArqM,22858
+pycontrails/physics/jet.py,sha256=eEoBZ9dei1YeG8g_TDVPsd9BsISqJQ2XQB6xGmd0nXY,22073