pycontrails 0.52.0__cp310-cp310-macosx_11_0_arm64.whl → 0.52.2__cp310-cp310-macosx_11_0_arm64.whl

pycontrails/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.52.0'
-__version_tuple__ = version_tuple = (0, 52, 0)
+__version__ = version = '0.52.2'
+__version_tuple__ = version_tuple = (0, 52, 2)

pycontrails/core/aircraft_performance.py

@@ -9,6 +9,7 @@ from typing import Any, Generic, NoReturn, overload
 
 import numpy as np
 import numpy.typing as npt
+from overrides import overrides
 
 from pycontrails.core import flight, fuel
 from pycontrails.core.flight import Flight
@@ -39,6 +40,19 @@ class AircraftPerformanceParams(ModelParams):
     #: The default value of 3 is sufficient for most cases.
     n_iter: int = 3
 
+    #: Experimental. If True, fill waypoints below the lowest altitude met
+    #: level with ISA temperature when interpolating "air_temperature" or "t".
+    #: If the ``met`` data is not provided, the entire air temperature array
+    #: is approximated with the ISA temperature. Enabling this does NOT
+    #: remove any NaN values in the ``met`` data itself.
+    fill_low_altitude_with_isa_temperature: bool = False
+
+    #: Experimental. If True, fill waypoints below the lowest altitude met
+    #: level with zero wind when computing true airspeed. In other words,
+    #: approximate low-altitude true airspeed with the ground speed. Enabling
+    #: this does NOT remove any NaN values in the ``met`` data itself.
+    fill_low_altitude_with_zero_wind: bool = False
+
 
 class AircraftPerformance(Model):
     """
@@ -104,6 +118,23 @@ class AircraftPerformance(Model):
             Flight trajectory with aircraft performance data.
         """
 
+    @overrides
+    def set_source_met(self, *args: Any, **kwargs: Any) -> None:
+        fill_with_isa = self.params["fill_low_altitude_with_isa_temperature"]
+        if fill_with_isa and (self.met is None or "air_temperature" not in self.met):
+            if "air_temperature" in self.source:
+                _fill_low_altitude_with_isa_temperature(self.source, 0.0)
+            else:
+                self.source["air_temperature"] = self.source.T_isa()
+            fill_with_isa = False  # we've just filled it
+
+        super().set_source_met(*args, **kwargs)
+        if not fill_with_isa:
+            return
+
+        met_level_0 = self.met.data["level"][-1].item()  # type: ignore[union-attr]
+        _fill_low_altitude_with_isa_temperature(self.source, met_level_0)
+
     def simulate_fuel_and_performance(
         self,
         *,
@@ -426,27 +457,41 @@ class AircraftPerformance(Model):
             on :attr:`source`, this is returned directly. Otherwise, it is calculated
             using :meth:`Flight.segment_true_airspeed`.
         """
+        tas = self.source.get("true_airspeed")
+        fill_with_groundspeed = self.params["fill_low_altitude_with_zero_wind"]
+
+        if tas is not None:
+            if not fill_with_groundspeed:
+                return tas
+            cond = np.isnan(tas)
+            tas[cond] = self.source.segment_groundspeed()[cond]
+            return tas
+
+        met_incomplete = (
+            self.met is None or "eastward_wind" not in self.met or "northward_wind" not in self.met
+        )
+        if met_incomplete:
+            if fill_with_groundspeed:
+                tas = self.source.segment_groundspeed()
+                self.source["true_airspeed"] = tas
+                return tas
+            msg = (
+                "Cannot compute 'true_airspeed' without 'eastward_wind' and 'northward_wind' "
+                "met data. Either include met data in the model constructor, define "
+                "'true_airspeed' data on the flight, or set "
+                "'fill_low_altitude_with_zero_wind' to True."
+            )
+            raise ValueError(msg)
 
-        try:
-            return self.source["true_airspeed"]
-        except KeyError:
-            pass
-
-        if not isinstance(self.source, Flight):
-            raise TypeError("Model source must be a Flight to calculate true airspeed.")
-
-        # Two step fallback: try to find u_wind and v_wind.
-        try:
-            u = interpolate_met(self.met, self.source, "eastward_wind", **self.interp_kwargs)
-            v = interpolate_met(self.met, self.source, "northward_wind", **self.interp_kwargs)
+        u = interpolate_met(self.met, self.source, "eastward_wind", **self.interp_kwargs)
+        v = interpolate_met(self.met, self.source, "northward_wind", **self.interp_kwargs)
 
-        except (ValueError, KeyError) as exc:
-            raise ValueError(
-                "Variable 'true_airspeed' not found. Include 'eastward_wind' and"
-                " 'northward_wind' variables on 'met' in model constructor, or define"
-                " 'true_airspeed' data on flight. This can be achieved by calling the"
-                " 'Flight.segment_true_airspeed' method."
-            ) from exc
+        if fill_with_groundspeed:
+            met_level_max = self.met.data["level"][-1].item()  # type: ignore[union-attr]
+            cond = self.source.level > met_level_max
+            # We DON'T overwrite the original u and v arrays already attached to the source
+            u = np.where(cond, 0.0, u)
+            v = np.where(cond, 0.0, v)
 
         out = self.source.segment_true_airspeed(u, v)
         self.source["true_airspeed"] = out
@@ -543,3 +588,54 @@ class AircraftPerformanceGridData(Generic[ArrayOrFloat]):
 
     #: Engine efficiency, [:math:`0-1`]
     engine_efficiency: ArrayOrFloat
+
+
+def _fill_low_altitude_with_isa_temperature(vector: GeoVectorDataset, met_level_max: float) -> None:
+    """Fill low-altitude NaN values in ``air_temperature`` with ISA values.
+
+    The ``air_temperature`` param is assumed to have been computed by
+    interpolating against a gridded air temperature field that did not
+    necessarily extend to the surface. This function fills points below the
+    lowest altitude in the gridded data with ISA temperature values.
+
+    This function operates in-place and modifies the ``air_temperature`` field.
+
+    Parameters
+    ----------
+    vector : GeoVectorDataset
+        GeoVectorDataset instance associated with the ``air_temperature`` data.
+    met_level_max : float
+        The maximum level in the met data, [:math:`hPa`].
+    """
+    air_temperature = vector["air_temperature"]
+    is_nan = np.isnan(air_temperature)
+    low_alt = vector.level > met_level_max
+    cond = is_nan & low_alt
+
+    t_isa = vector.T_isa()
+    air_temperature[cond] = t_isa[cond]
+
+
+def _fill_low_altitude_tas_with_true_groundspeed(fl: Flight, met_level_max: float) -> None:
+    """Fill low-altitude NaN values in ``true_airspeed`` with ground speed.
+
+    The ``true_airspeed`` param is assumed to have been computed by
+    interpolating against a gridded wind field that did not necessarily
+    extend to the surface. This function fills points below the lowest
+    altitude in the gridded data with ground speed values.
+
+    This function operates in-place and modifies the ``true_airspeed`` field.
+
+    Parameters
+    ----------
+    fl : Flight
+        Flight instance associated with the ``true_airspeed`` data.
+    met_level_max : float
+        The maximum level in the met data, [:math:`hPa`].
+    """
+    tas = fl["true_airspeed"]
+    is_nan = np.isnan(tas)
+    low_alt = fl.level > met_level_max
+    cond = is_nan & low_alt
+
+    tas[cond] = fl.segment_groundspeed()[cond]

pycontrails/core/coordinates.py

@@ -59,27 +59,27 @@ def slice_domain(
     >>> # Call with request as np.array
     >>> request = np.linspace(-20, 20, 100)
     >>> slice_domain(domain, request)
-    slice(640, 801, None)
+    slice(np.int64(640), np.int64(801), None)
 
     >>> # Call with request as tuple
     >>> request = -20, 20
     >>> slice_domain(domain, request)
-    slice(640, 801, None)
+    slice(np.int64(640), np.int64(801), None)
 
     >>> # Call with a buffer
     >>> request = -16, 13
     >>> buffer = 4, 7
     >>> slice_domain(domain, request, buffer)
-    slice(640, 801, None)
+    slice(np.int64(640), np.int64(801), None)
 
     >>> # Call with request as a single number
     >>> request = -20
     >>> slice_domain(domain, request)
-    slice(640, 641, None)
+    slice(np.int64(640), np.int64(641), None)
 
     >>> request = -19.9
     >>> slice_domain(domain, request)
-    slice(640, 642, None)
+    slice(np.int64(640), np.int64(642), None)
 
     """
     # if the length of domain coordinates is <= 2, return the whole domain

pycontrails/core/fleet.py

@@ -226,28 +226,29 @@ class Fleet(Flight):
         return len(self.fl_attrs)
 
     def to_flight_list(self, copy: bool = True) -> list[Flight]:
-        """De-concatenate merged waypoints into a list of Flight instances.
+        """De-concatenate merged waypoints into a list of :class:`Flight` instances.
 
         Any global :attr:`attrs` are lost.
 
         Parameters
         ----------
         copy : bool, optional
-            If True, make copy of each flight instance in `seq`.
+            If True, make copy of each :class:`Flight` instance.
 
         Returns
         -------
         list[Flight]
-            List of Flights in the same order as was passed into the `Fleet` instance.
+            List of Flights in the same order as was passed into the ``Fleet`` instance.
         """
-
-        # Avoid self.dataframe to purposely drop global attrs
-        tmp = pd.DataFrame(self.data, copy=copy)
-        grouped = tmp.groupby("flight_id", sort=False)
-
+        indices = self.dataframe.groupby("flight_id", sort=False).indices
         return [
-            Flight(df, attrs=self.fl_attrs[flight_id], fuel=self.fuel, copy=copy)
-            for flight_id, df in grouped
+            Flight(
+                data=VectorDataDict({k: v[idx] for k, v in self.data.items()}),
+                attrs=self.fl_attrs[flight_id],
+                copy=copy,
+                fuel=self.fuel,
+            )
+            for flight_id, idx in indices.items()
         ]
 
     ###################################

pycontrails/core/flight.py

@@ -384,7 +384,7 @@ class Flight(GeoVectorDataset):
         ...     time=pd.date_range('2021-01-01T12', '2021-01-01T14', periods=200),
         ... )
         >>> fl.max_distance_gap
-        7391.27...
+        np.float64(7391.27...)
         """
         if self.attrs["crs"] != "EPSG:4326":
             raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
@@ -415,7 +415,7 @@ class Flight(GeoVectorDataset):
         ...     time=pd.date_range('2021-01-01T12', '2021-01-01T14', periods=200),
         ... )
         >>> fl.length
-        1436924.67...
+        np.float64(1436924.67...)
         """
         if self.attrs["crs"] != "EPSG:4326":
             raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
@@ -954,28 +954,13 @@ class Flight(GeoVectorDataset):
         # STEP 3: Set the time index, and sort it
         df = df.set_index("time", verify_integrity=True).sort_index()
 
-        # STEP 4: Some adhoc code for dealing with antimeridian.
-        # Idea: A flight likely crosses the antimeridian if
-        #   `min_pos > 90` and `max_neg < -90`
-        # This is not foolproof: it assumes the full trajectory will not
-        # span more than 180 longitude degrees. There could be flights that
-        # violate this near the poles (but this would be very rare -- flights
-        # would instead wrap the other way). For this flights spanning the
-        # antimeridian, we translate them to a common "chart" away from the
-        # antimeridian (see variable `shift`), then apply the interpolation,
-        # then shift back to their original position.
-        lon = df["longitude"].to_numpy()
-        sign_ = np.sign(lon)
-        min_pos = np.min(lon[sign_ == 1.0], initial=np.inf)
-        max_neg = np.max(lon[sign_ == -1.0], initial=-np.inf)
-
-        if (180.0 - min_pos) + (180.0 + max_neg) < 180.0 and min_pos < np.inf and max_neg > -np.inf:
-            # In this case, we believe the flight crosses the antimeridian
-            shift = min_pos
-            # So we shift the longitude "chart"
+        # STEP 4: handle antimeridian crossings
+        # For flights spanning the antimeridian, we translate them to a
+        # common "chart" away from the antimeridian (see variable `shift`),
+        # then apply the interpolation, then shift back to their original position.
+        shift = self._antimeridian_shift()
+        if shift is not None:
             df["longitude"] = (df["longitude"] - shift) % 360.0
-        else:
-            shift = None
 
         # STEP 5: Resample flight to freq
         # Save altitudes to copy over - these just get rounded down in time.
@@ -1189,19 +1174,12 @@ class Flight(GeoVectorDataset):
         """
 
         # Check if flight crosses antimeridian line
+        # If it does, shift longitude chart to remove jump
         lon_ = self["longitude"]
         lat_ = self["latitude"]
-        sign_ = np.sign(lon_)
-        min_pos = np.min(lon_[sign_ == 1.0], initial=np.inf)
-        max_neg = np.max(lon_[sign_ == -1.0], initial=-np.inf)
-
-        if (180.0 - min_pos) + (180.0 + max_neg) < 180.0 and min_pos < np.inf and max_neg > -np.inf:
-            # In this case, we believe the flight crosses the antimeridian
-            shift = min_pos
-            # So we shift the longitude "chart"
+        shift = self._antimeridian_shift()
+        if shift is not None:
             lon_ = (lon_ - shift) % 360.0
-        else:
-            shift = None
 
         # Make a fake flight that flies at constant height so distance is just
         # distance traveled across groud
@@ -1262,6 +1240,55 @@ class Flight(GeoVectorDataset):
 
         return lat, lon, seg_idx
 
+    def _antimeridian_shift(self) -> float | None:
+        """Determine shift required for resampling trajectories that cross antimeridian.
+
+        Because flights sometimes span more than 180 degree longitude (for example,
+        when flight-level winds favor travel in a specific direction, typically eastward),
+        antimeridian crossings cannot reliably be detected by looking only at minimum
+        and maximum longitudes.
+
+        Instead, this function checks each flight segment for an antimeridian crossing,
+        and if it finds one returns the coordinate of a meridian that is not crossed by
+        the flight.
+
+        Returns
+        -------
+        float | None
+            Longitude shift for handling antimeridian crossings, or None if the
+            flight does not cross the antimeridian.
+        """
+
+        # logic for detecting crossings is consistent with _antimeridian_crossing,
+        # but implementation is separate to keep performance costs as low as possible
+        lon = self["longitude"]
+        if np.any(np.isnan(lon)):
+            warnings.warn("Anti-meridian crossings can't be reliably detected with nan longitudes")
+
+        s1 = (lon >= -180) & (lon <= -90)
+        s2 = (lon <= 180) & (lon >= 90)
+        jump12 = s1[:-1] & s2[1:]  # westward
+        jump21 = s2[:-1] & s1[1:]  # eastward
+        if not np.any(jump12 | jump21):
+            return None
+
+        # separate flight into segments that are east and west of crossings
+        net_westward = np.insert(np.cumsum(jump12.astype(int) - jump21.astype(int)), 0, 0)
+        max_westward = net_westward.max()
+        if max_westward - net_westward.min() > 1:
+            msg = "Cannot handle consecutive antimeridian crossings in the same direction"
+            raise ValueError(msg)
+        east = (net_westward == 0) if max_westward == 1 else (net_westward == -1)
+
+        # shift must be between maximum longitude east of crossings
+        # and minimum longitude west of crossings
+        shift_min = np.nanmax(lon[east])
+        shift_max = np.nanmin(lon[~east])
+        if shift_min >= shift_max:
+            msg = "Cannot handle flight that spans more than 360 degrees longitude"
+            raise ValueError(msg)
+        return (shift_min + shift_max) / 2
+
     def _geodesic_interpolation(self, geodesic_threshold: float) -> pd.DataFrame | None:
         """Geodesic interpolate between large gaps between waypoints.
 
@@ -1506,25 +1533,25 @@ class Flight(GeoVectorDataset):
 
         >>> # Build flight
         >>> df = pd.DataFrame()
-        >>> df['time'] = pd.date_range('2022-03-01T00', '2022-03-01T03', periods=11)
-        >>> df['longitude'] = np.linspace(-20, 20, 11)
-        >>> df['latitude'] = np.linspace(-20, 20, 11)
-        >>> df['altitude'] = np.linspace(9500, 10000, 11)
-        >>> fl = Flight(df).resample_and_fill('10s')
+        >>> df["time"] = pd.date_range("2022-03-01T00", "2022-03-01T03", periods=11)
+        >>> df["longitude"] = np.linspace(-20, 20, 11)
+        >>> df["latitude"] = np.linspace(-20, 20, 11)
+        >>> df["altitude"] = np.linspace(9500, 10000, 11)
+        >>> fl = Flight(df).resample_and_fill("10s")
 
         >>> # Intersect and attach
-        >>> fl["air_temperature"] = fl.intersect_met(met['air_temperature'])
+        >>> fl["air_temperature"] = fl.intersect_met(met["air_temperature"])
         >>> fl["air_temperature"]
-        array([235.94657007, 235.95766965, 235.96873412, ..., 234.59917962,
+        array([235.94657007, 235.55745645, 235.56709768, ..., 234.59917962,
                234.60387402, 234.60845312])
 
         >>> # Length (in meters) of waypoints whose temperature exceeds 236K
         >>> fl.length_met("air_temperature", threshold=236)
-        4132178.159...
+        np.float64(3589705.998...)
 
         >>> # Proportion (with respect to distance) of waypoints whose temperature exceeds 236K
         >>> fl.proportion_met("air_temperature", threshold=236)
-        0.663552...
+        np.float64(0.576...)
         """
         if key not in self.data:
             raise KeyError(f"Column {key} does not exist in data.")
@@ -1591,10 +1618,30 @@ class Flight(GeoVectorDataset):
         :class:`matplotlib.axes.Axes`
             Plot
         """
-        ax = self.dataframe.plot(x="longitude", y="latitude", legend=False, **kwargs)
+        kwargs.setdefault("legend", False)
+        ax = self.dataframe.plot(x="longitude", y="latitude", **kwargs)
         ax.set(xlabel="longitude", ylabel="latitude")
         return ax
 
+    def plot_profile(self, **kwargs: Any) -> matplotlib.axes.Axes:
+        """Plot flight trajectory time-altitude values.
+
+        Parameters
+        ----------
+        **kwargs : Any
+            Additional plot properties to passed to `pd.DataFrame.plot`
+
+        Returns
+        -------
+        :class:`matplotlib.axes.Axes`
+            Plot
+        """
+        kwargs.setdefault("legend", False)
+        df = self.dataframe.assign(altitude_ft=self.altitude_ft)
+        ax = df.plot(x="time", y="altitude_ft", **kwargs)
+        ax.set(xlabel="time", ylabel="altitude_ft")
+        return ax
+
 
 def _return_linestring(data: dict[str, npt.NDArray[np.float64]]) -> list[list[float]]:
     """Return list of coordinates for geojson constructions.
@@ -1631,18 +1678,14 @@ def _antimeridian_index(longitude: pd.Series, crs: str = "EPSG:4326") -> list[in
 
     Returns
     -------
-    int
-        Index after jump or -1
+    list[int]
+        Indices after jump, or empty list of flight does not cross antimeridian.
 
     Raises
     ------
     ValueError
         CRS is not supported.
-        Flight crosses antimeridian several times.
     """
-    # FIXME: This logic here is somewhat outdated - the _interpolate_altitude
-    # method handles this somewhat more reliably
-    # This function should get updated to follow the logic there.
     # WGS84
     if crs in ["EPSG:4326"]:
         l1 = (-180.0, -90.0)
@@ -1878,7 +1921,7 @@ def _altitude_interpolation_climb_descend_middle(
     s = pd.Series(altitude)
 
     # Check to see if we have gaps greater than two hours
-    step_threshold = 120.0 * freq / np.timedelta64(1, "m")
+    step_threshold = np.timedelta64(2, "h") / freq
     step_groups = na_group_size > step_threshold
     if np.any(step_groups):
         # If there are gaps greater than two hours, step through one by one
@@ -2214,16 +2257,14 @@ def segment_rocd(
     if air_temperature is None:
         return out
 
-    else:
-        altitude_m = units.ft_to_m(altitude_ft)
-        T_isa = units.m_to_T_isa(altitude_m)
+    altitude_m = units.ft_to_m(altitude_ft)
+    T_isa = units.m_to_T_isa(altitude_m)
 
-        T_correction = np.empty_like(altitude_ft)
-        T_correction[:-1] = (0.5 * (air_temperature[:-1] + air_temperature[1:])) / (
-            0.5 * (T_isa[:-1] + T_isa[1:])
-        )
-        T_correction[-1] = np.nan
-        return T_correction * out
+    T_correction = np.empty_like(altitude_ft)
+    T_correction[:-1] = (air_temperature[:-1] + air_temperature[1:]) / (T_isa[:-1] + T_isa[1:])
+    T_correction[-1] = np.nan
+
+    return T_correction * out
 
 
 def _resample_to_freq(df: pd.DataFrame, freq: str) -> tuple[pd.DataFrame, pd.DatetimeIndex]:

pycontrails/core/interpolation.py

@@ -621,11 +621,11 @@ class EmissionsProfileInterpolator:
     >>> epi = EmissionsProfileInterpolator(xp, fp)
     >>> # Interpolate a single value
     >>> epi.interp(5)
-    0.150000...
+    np.float64(0.150000...)
 
     >>> # Interpolate a single value on a logarithmic scale
     >>> epi.log_interp(5)
-    1.105171...
+    np.float64(1.105171...)
 
     >>> # Demonstrate speed up compared with xarray.DataArray interpolation
     >>> import time, xarray as xr

pycontrails/core/met.py

@@ -1375,9 +1375,10 @@ class MetDataArray(MetBase):
 
         # try to create DataArray out of input data and **kwargs
         if not isinstance(data, xr.DataArray):
-            DeprecationWarning(
+            warnings.warn(
                 "Input 'data' must be an xarray DataArray. "
-                "Passing arbitrary kwargs will be removed in future versions."
+                "Passing arbitrary kwargs will be removed in future versions.",
+                DeprecationWarning,
             )
             data = xr.DataArray(data, **kwargs)
 
@@ -2609,13 +2610,14 @@ def _load(hash: str, cachestore: CacheStore, chunks: dict[str, int]) -> xr.Datas
 
 
 def _add_vertical_coords(data: XArrayType) -> XArrayType:
-    """Add "air_pressure" and "altitude" coordinates to data."""
+    """Add "air_pressure" and "altitude" coordinates to data.
 
-    data["level"].attrs.update(units="hPa", long_name="Pressure", positive="down")
+    .. versionchanged:: 0.52.1
+        Ensure that the ``dtype`` of the additional vertical coordinates agree
+        with the ``dtype`` of the underlying gridded data.
+    """
 
-    coords = data.coords
-    if "air_pressure" in coords and "altitude" in coords:
-        return data
+    data["level"].attrs.update(units="hPa", long_name="Pressure", positive="down")
 
     # XXX: use the dtype of the data to determine the precision of these coordinates
     # There are two competing conventions here:
@@ -2625,25 +2627,32 @@ def _add_vertical_coords(data: XArrayType) -> XArrayType:
     # It is more important for air_pressure and altitude to be grid-aligned than to be
     # coordinate-aligned, so we use the dtype of the data to determine the precision of
     # these coordinates
-    if isinstance(data, xr.Dataset):
-        dtype = np.result_type(*data.data_vars.values(), np.float32)
-    else:
-        dtype = data.dtype
-    level = data["level"].values.astype(dtype, copy=False)
+    dtype = (
+        np.result_type(*data.data_vars.values(), np.float32)
+        if isinstance(data, xr.Dataset)
+        else data.dtype
+    )
 
-    if "air_pressure" not in coords:
+    level = data["level"].values
+
+    if "air_pressure" not in data.coords:
         data = data.assign_coords(air_pressure=("level", level * 100.0))
         data.coords["air_pressure"].attrs.update(
             standard_name=AirPressure.standard_name,
             long_name=AirPressure.long_name,
             units=AirPressure.units,
         )
-    if "altitude" not in coords:
+    if data.coords["air_pressure"].dtype != dtype:
+        data.coords["air_pressure"] = data.coords["air_pressure"].astype(dtype, copy=False)
+
+    if "altitude" not in data.coords:
         data = data.assign_coords(altitude=("level", units.pl_to_m(level)))
         data.coords["altitude"].attrs.update(
             standard_name=Altitude.standard_name,
             long_name=Altitude.long_name,
             units=Altitude.units,
         )
+    if data.coords["altitude"].dtype != dtype:
+        data.coords["altitude"] = data.coords["altitude"].astype(dtype, copy=False)
 
     return data

pycontrails/core/models.py

@@ -362,6 +362,8 @@ class Model(ABC):
     def interp_kwargs(self) -> dict[str, Any]:
         """Shortcut to create interpolation arguments from :attr:`params`.
 
+        The output of this is useful for passing to :func:`interpolate_met`.
+
         Returns
         -------
         dict[str, Any]
@@ -376,13 +378,14 @@ class Model(ABC):
 
             as determined by :attr:`params`.
         """
+        params = self.params
         return {
-            "method": self.params["interpolation_method"],
-            "bounds_error": self.params["interpolation_bounds_error"],
-            "fill_value": self.params["interpolation_fill_value"],
-            "localize": self.params["interpolation_localize"],
-            "use_indices": self.params["interpolation_use_indices"],
-            "q_method": self.params["interpolation_q_method"],
+            "method": params["interpolation_method"],
+            "bounds_error": params["interpolation_bounds_error"],
+            "fill_value": params["interpolation_fill_value"],
+            "localize": params["interpolation_localize"],
+            "use_indices": params["interpolation_use_indices"],
+            "q_method": params["interpolation_q_method"],
         }
 
     def require_met(self) -> MetDataset:
@@ -585,16 +588,7 @@ class Model(ABC):
         KeyError
             Variable not found in :attr:`source` or :attr:`met`.
         """
-        variables: Sequence[MetVariable | tuple[MetVariable, ...]]
-        if variable is None:
-            if optional:
-                variables = (*self.met_variables, *self.optional_met_variables)
-            else:
-                variables = self.met_variables
-        elif isinstance(variable, MetVariable):
-            variables = (variable,)
-        else:
-            variables = variable
+        variables = self._determine_relevant_variables(optional, variable)
 
         q_method = self.params["interpolation_q_method"]
 
@@ -640,6 +634,20 @@ class Model(ABC):
                     met_key, da, self.source, self.params, q_method
                 )
 
+    def _determine_relevant_variables(
+        self,
+        optional: bool,
+        variable: MetVariable | Sequence[MetVariable] | None,
+    ) -> Sequence[MetVariable | tuple[MetVariable, ...]]:
+        """Determine the relevant variables used in :meth:`set_source_met`."""
+        if variable is None:
+            if optional:
+                return (*self.met_variables, *self.optional_met_variables)
+            return self.met_variables
+        if isinstance(variable, MetVariable):
+            return (variable,)
+        return variable
+
     # Following python implementation
     # https://github.com/python/cpython/blob/618b7a8260bb40290d6551f24885931077309590/Lib/collections/__init__.py#L231
     __marker = object()
@@ -814,6 +822,7 @@ def interpolate_met(
     vector: GeoVectorDataset,
     met_key: str,
     vector_key: str | None = None,
+    *,
     q_method: str | None = None,
     **interp_kwargs: Any,
 ) -> npt.NDArray[np.float64]:

pycontrails/core/polygon.py

@@ -536,7 +536,7 @@ def multipolygon_to_geojson(
             else:
                 shape = len(ring.coords), 3
                 coords = np.empty(shape)
-                coords[:, :2] = ring.coords
+                coords[:, :2] = np.asarray(ring.coords)
                 coords[:, 2] = altitude
 
             poly_coords.append(coords.tolist())

pycontrails/core/vector.py

@@ -657,7 +657,7 @@ class VectorDataset:
         8  15  18
 
         """
-        vectors = [v for v in vectors if v]  # remove empty vectors
+        vectors = [v for v in vectors if v is not None]  # remove None values
 
         if not vectors:
             return cls()
@@ -707,36 +707,33 @@ class VectorDataset:
         bool
             True if both instances have identical :attr:`data` and :attr:`attrs`.
         """
-        if isinstance(other, VectorDataset):
-            # assert attrs equal
-            for key in self.attrs:
-                if isinstance(self.attrs[key], np.ndarray):
-                    # equal_nan not supported for non-numeric data
-                    equal_nan = not np.issubdtype(self.attrs[key].dtype, "O")
-                    try:
-                        eq = np.array_equal(self.attrs[key], other.attrs[key], equal_nan=equal_nan)
-                    except KeyError:
-                        return False
-                else:
-                    eq = self.attrs[key] == other.attrs[key]
-
-                if not eq:
-                    return False
+        if not isinstance(other, VectorDataset):
+            return False
 
-            # assert data equal
-            for key in self:
-                # equal_nan not supported for non-numeric data (e.g. strings)
-                equal_nan = not np.issubdtype(self[key].dtype, "O")
-                try:
-                    eq = np.array_equal(self[key], other[key], equal_nan=equal_nan)
-                except KeyError:
-                    return False
+        # Check attrs
+        if self.attrs.keys() != other.attrs.keys():
+            return False
 
-                if not eq:
+        for key, val in self.attrs.items():
+            if isinstance(val, np.ndarray):
+                # equal_nan not supported for non-numeric data
+                equal_nan = not np.issubdtype(val.dtype, "O")
+                if not np.array_equal(val, other.attrs[key], equal_nan=equal_nan):
                     return False
+            elif val != other.attrs[key]:
+                return False
+
+        # Check data
+        if self.data.keys() != other.data.keys():
+            return False
 
-            return True
-        return False
+        for key, val in self.data.items():
+            # equal_nan not supported for non-numeric data (e.g. strings)
+            equal_nan = not np.issubdtype(val.dtype, "O")
+            if not np.array_equal(val, other[key], equal_nan=equal_nan):
+                return False
+
+        return True
 
     @property
     def size(self) -> int:
@@ -986,7 +983,7 @@ class VectorDataset:
         numeric_attrs = (
             attr
             for attr, val in self.attrs.items()
-            if (isinstance(val, (int, float)) and attr not in ignore_keys)
+            if (isinstance(val, (int, float, np.number)) and attr not in ignore_keys)
         )
         self.broadcast_attrs(numeric_attrs, overwrite)
 
@@ -2057,7 +2054,7 @@ def vector_to_lon_lat_grid(
            [2.97, 0.12, 1.33, ..., 3.54, 0.74, 2.59]])
 
     >>> da.sum().item() == vector["foo"].sum()
-    True
+    np.True_
 
     """
     df = vector.select(("longitude", "latitude", *agg), copy=False).dataframe

pycontrails/datalib/_met_utils/metsource.py

@@ -35,9 +35,6 @@ DEFAULT_CHUNKS: dict[str, int] = {"time": 1}
 #: Whether to open multi-file datasets in parallel
 OPEN_IN_PARALLEL: bool = False
 
-#: Whether to use file locking when opening multi-file datasets
-OPEN_WITH_LOCK: bool = False
-
 
 def parse_timesteps(time: TimeInput | None, freq: str | None = "1h") -> list[datetime]:
     """Parse time input into set of time steps.
@@ -741,5 +738,4 @@ class MetDataSource(abc.ABC):
         xr_kwargs.setdefault("engine", NETCDF_ENGINE)
         xr_kwargs.setdefault("chunks", DEFAULT_CHUNKS)
         xr_kwargs.setdefault("parallel", OPEN_IN_PARALLEL)
-        xr_kwargs.setdefault("lock", OPEN_WITH_LOCK)
         return xr.open_mfdataset(disk_paths, **xr_kwargs)

pycontrails/datalib/goes.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 
 import datetime
 import enum
-import io
+import tempfile
 from collections.abc import Iterable
 
 import numpy as np
@@ -535,7 +535,7 @@ class GOES:
             da_dict = {}
             for rpath, init_bytes in data.items():
                 channel = _extract_channel_from_rpath(rpath)
-                ds = xr.open_dataset(io.BytesIO(init_bytes), engine="h5netcdf")
+                ds = _load_via_tempfile(init_bytes)
 
                 da = ds["CMI"]
                 da = da.expand_dims(band_id=ds["band_id"].values)
@@ -551,7 +551,7 @@ class GOES:
                 da = xr.concat(da_dict.values(), dim="band_id")
 
         else:
-            ds = xr.open_dataset(io.BytesIO(data), engine="h5netcdf")
+            ds = _load_via_tempfile(data)
             da = ds["CMI"]
             da = da.expand_dims(band_id=ds["band_id"].values)
 
@@ -564,6 +564,13 @@ class GOES:
         return da
 
 
+def _load_via_tempfile(data: bytes) -> xr.Dataset:
+    """Load xarray dataset via temporary file."""
+    with tempfile.NamedTemporaryFile(buffering=0) as tmp:
+        tmp.write(data)
+        return xr.load_dataset(tmp.name)
+
+
 def _concat_c02(ds1: XArrayType, ds2: XArrayType) -> XArrayType:
     """Concatenate two datasets with C01 and C02 data."""
     # Average the C02 data to the C01 resolution

pycontrails/models/cocip/cocip.py

@@ -1166,49 +1166,43 @@ class Cocip(Model):
         # ---
         # Create contrail dataframe (self.contrail)
         # ---
-        dfs = [contrail.dataframe for contrail in self.contrail_list]
-        dfs = [df.assign(timestep=t_idx) for t_idx, df in enumerate(dfs)]
-        self.contrail = pd.concat(dfs)
+        self.contrail = GeoVectorDataset.sum(self.contrail_list).dataframe
+        self.contrail["timestep"] = np.concatenate(
+            [np.full(c.size, i) for i, c in enumerate(self.contrail_list)]
+        )
 
         # add age in hours to the contrail waypoint outputs
         age_hours = np.empty_like(self.contrail["ef"])
         np.divide(self.contrail["age"], np.timedelta64(1, "h"), out=age_hours)
         self.contrail["age_hours"] = age_hours
 
-        if self.params["verbose_outputs"]:
+        verbose_outputs = self.params["verbose_outputs"]
+        if verbose_outputs:
             # Compute dt_integration -- logic is somewhat complicated, but
             # we're simply addressing that the first dt_integration
             # is different from the rest
 
-            # We call reset_index twice. The first call introduces an `index`
-            # column, and the second introduces a `level_0` column. This `level_0`
-            # is a RangeIndex, which we use in the `groupby` to identify the
+            # We call reset_index to introduces an `index` RangeIndex column,
+            # Which we use in the `groupby` to identify the
             # index of the first evolution step at each waypoint.
-            # The `level_0` is used to insert back into the `seq_index` dataframe,
-            # then it is dropped in replace of the original `index`.
-            seq_index = self.contrail.reset_index().reset_index()
-            cols = ["formation_time", "time", "level_0"]
-            first_form_time = seq_index.groupby("waypoint")[cols].first()
+            tmp = self.contrail.reset_index()
+            cols = ["formation_time", "time", "index"]
+            first_form_time = tmp.groupby("waypoint")[cols].first()
             first_dt = first_form_time["time"] - first_form_time["formation_time"]
-            first_dt.index = first_form_time["level_0"]
-
-            seq_index = seq_index.set_index("level_0")
-            seq_index["dt_integration"] = first_dt
-            seq_index.fillna({"dt_integration": self.params["dt_integration"]}, inplace=True)
+            first_dt = first_dt.set_axis(first_form_time["index"])
 
-            self.contrail = seq_index.set_index("index")
+            self.contrail = tmp.set_index("index")
+            self.contrail["dt_integration"] = first_dt
+            self.contrail.fillna({"dt_integration": self.params["dt_integration"]}, inplace=True)
 
             # ---
             # Create contrail xr.Dataset (self.contrail_dataset)
             # ---
             if isinstance(self.source, Fleet):
-                self.contrail_dataset = xr.Dataset.from_dataframe(
-                    self.contrail.set_index(["flight_id", "timestep", "waypoint"])
-                )
+                keys = ["flight_id", "timestep", "waypoint"]
             else:
-                self.contrail_dataset = xr.Dataset.from_dataframe(
-                    self.contrail.set_index(["timestep", "waypoint"])
-                )
+                keys = ["timestep", "waypoint"]
+            self.contrail_dataset = xr.Dataset.from_dataframe(self.contrail.set_index(keys))
 
         # ---
         # Create output Flight / Fleet (self.source)
@@ -1229,7 +1223,7 @@ class Cocip(Model):
         ]
 
         # add additional columns
-        if self.params["verbose_outputs"]:
+        if verbose_outputs:
             sac_cols += ["dT_dz", "ds_dz", "dz_max"]
 
         downwash_cols = ["rho_air_1", "iwc_1", "n_ice_per_m_1"]
@@ -1253,7 +1247,7 @@ class Cocip(Model):
 
         rad_keys = ["sdr", "rsr", "olr", "rf_sw", "rf_lw", "rf_net"]
         for key in rad_keys:
-            if self.params["verbose_outputs"]:
+            if verbose_outputs:
                 agg_dict[key] = ["mean", "min", "max"]
             else:
                 agg_dict[key] = ["mean"]

pycontrails/models/cocip/cocip_uncertainty.py

@@ -92,12 +92,12 @@ class CocipUncertaintyParams(CocipParams):
     >>> distr = scipy.stats.uniform(loc=0.4, scale=0.2)
     >>> params = CocipUncertaintyParams(seed=123, initial_wake_vortex_depth_uncertainty=distr)
     >>> params.initial_wake_vortex_depth
-    0.41076420
+    np.float64(0.41076420...)
 
     >>> # Once seeded, calling the class again gives a new value
     >>> params = CocipUncertaintyParams(initial_wake_vortex_depth=distr)
     >>> params.initial_wake_vortex_depth
-    0.43526372
+    np.float64(0.43526372...)
 
     >>> # To retain the default value, set the uncertainty to None
     >>> params = CocipUncertaintyParams(rf_lw_enhancement_factor_uncertainty=None)
@@ -212,7 +212,7 @@ class CocipUncertaintyParams(CocipParams):
 
         return out
 
-    def rvs(self, size: None | int = None) -> dict[str, float | npt.NDArray[np.float64]]:
+    def rvs(self, size: None | int = None) -> dict[str, np.float64 | npt.NDArray[np.float64]]:
         """Call each distribution's `rvs` method to generate random parameters.
 
         Seed calls to `rvs` with class variable `rng`.
@@ -247,12 +247,12 @@ class CocipUncertaintyParams(CocipParams):
                [7.9063961e-04, 3.0336906e-03, 7.7571563e-04, 2.0577813e-02,
                 9.4205803e-01, 4.3379897e-03, 3.6786550e-03, 2.4747452e-02]],
               dtype=float32),
-         'initial_wake_vortex_depth': 0.39805019708566847,
-         'nvpm_ei_n_enhancement_factor': 0.9371878437312526,
-         'rf_lw_enhancement_factor': 1.1017491252832377,
-         'rf_sw_enhancement_factor': 0.99721639115012,
-         'sedimentation_impact_factor': 0.5071779847244678,
-         'wind_shear_enhancement_exponent': 0.34100931239701004}
+         'initial_wake_vortex_depth': np.float64(0.39805019708566847),
+         'nvpm_ei_n_enhancement_factor': np.float64(0.9371878437312526),
+         'rf_lw_enhancement_factor': np.float64(1.1017491252832377),
+         'rf_sw_enhancement_factor': np.float64(0.99721639115012),
+         'sedimentation_impact_factor': np.float64(0.5071779847244678),
+         'wind_shear_enhancement_exponent': np.float64(0.34100931239701004)}
         """
         return {
             param: distr.rvs(size=size, random_state=self.rng)

pycontrails/models/cocip/output_formats.py

@@ -32,7 +32,6 @@ import xarray as xr
 
 from pycontrails.core.met import MetDataArray, MetDataset
 from pycontrails.core.vector import GeoVectorDataset, vector_to_lon_lat_grid
-from pycontrails.datalib.goes import GOES, extract_goes_visualization
 from pycontrails.models.cocip.contrail_properties import contrail_edges, plume_mass_per_distance
 from pycontrails.models.cocip.radiative_forcing import albedo
 from pycontrails.models.humidity_scaling import HumidityScaling
@@ -217,7 +216,7 @@ def contrail_flight_summary_statistics(flight_waypoints: GeoVectorDataset) -> pd
     )
 
     flight_waypoints["persistent_contrail_length"] = np.where(
-        np.isnan(flight_waypoints["ef"]), 0.0, flight_waypoints["segment_length"]
+        np.nan_to_num(flight_waypoints["ef"]) == 0.0, 0.0, flight_waypoints["segment_length"]
     )
 
     # Calculate contrail statistics for each flight
@@ -1192,6 +1191,7 @@ def meteorological_time_slice_statistics(
     # ISSR: Volume of airspace with RHi > 100% between FL300 and FL450
     met = humidity_scaling.eval(met)
     rhi = met["rhi"].data.sel(level=slice(150, 300))
+    rhi = rhi.interp(time=time)
     is_issr = rhi > 1
 
     # Cirrus in a longitude-latitude grid
@@ -1246,9 +1246,15 @@ def radiation_time_slice_statistics(
     surface_area = geo.grid_surface_area(rad["longitude"].values, rad["latitude"].values)
     weights = surface_area.values / np.nansum(surface_area)
     stats = {
-        "mean_sdr_domain": np.nansum(rad["sdr"].data.sel(level=-1, time=time).values * weights),
-        "mean_rsr_domain": np.nansum(rad["rsr"].data.sel(level=-1, time=time).values * weights),
-        "mean_olr_domain": np.nansum(rad["olr"].data.sel(level=-1, time=time).values * weights),
+        "mean_sdr_domain": np.nansum(
+            np.squeeze(rad["sdr"].data.interp(time=time).values) * weights
+        ),
+        "mean_rsr_domain": np.nansum(
+            np.squeeze(rad["rsr"].data.interp(time=time).values) * weights
+        ),
+        "mean_olr_domain": np.nansum(
+            np.squeeze(rad["olr"].data.interp(time=time).values) * weights
+        ),
     }
     return pd.Series(stats)
 
@@ -1599,7 +1605,7 @@ def contrails_to_hi_res_grid(
             module_not_found_error=exc,
         )
 
-    for i in tqdm(heads_t.index[:2000]):
+    for i in tqdm(heads_t.index):
         contrail_segment = GeoVectorDataset(
             pd.concat([heads_t[cols_req].loc[i], tails_t[cols_req].loc[i]], axis=1).T, copy=True
         )
@@ -2125,6 +2131,8 @@ def compare_cocip_with_goes(
         File path of saved CoCiP-GOES image if ``path_write_img`` is provided.
     """
 
+    from pycontrails.datalib.goes import GOES, extract_goes_visualization
+
     try:
         import cartopy.crs as ccrs
         from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter

pycontrails/models/emissions/static/edb-gaseous-v29b-engines.csv

@@ -561,7 +561,7 @@ UID No,Manufacturer,Engine Identification,Combustor Description,Eng Type,B/P Rat
 1TL002,Textron Lycoming,ALF 502R-3,,TF,5.7,11.4,29.8,0.3476,0.288,0.1027,0.0432,11.2,9.94,6.15,3.3,0.433,0.5,8.43,44.67,0.056,0.053,0.287,6.51,12.63,12,5.47,2.133,13,101.3,102.4,288,293,0.0088,0.0108
 1TL003,Textron Lycoming,ALF 502R-5,,TF,5.6,12,31,0.3581,0.2955,0.1034,0.0408,13.35,10.56,6.6,3.78,0.3,0.25,7.1,40.93,0.06,0.053,0.217,5.39,13.5,12.7,5.7,2.3,15.4,101.3,102.4,288,293,0.0088,0.0108
 1TL004,Textron Lycoming,"LF507-1F, -1H",,TF,5.1,13,31,0.3578,0.2961,0.1083,0.0453,14.52,12.02,6.39,3.28,0.2,0.3,4.43,37.83,0.01,0.01,0.12,4.72,10.3,10.2,6.9,6.8,10.6,101.3,102.4,276,280,0.0023,0.0038
-1ZM001,IVCHENKO PROGRESS ZMBK,D-36,,TF,5,19.9,63.765,0.634,0.533,0.211,,26,22,9,5.5,0.5,0.4,2.7,20.7,0,0,0,5.4,14.8,,,,14.8,99.9,101.5,268,295,0.0017,0.0083
+1ZM001,IVCHENKO PROGRESS ZMBK,D-36,,TF,5,19.9,63.765,0.634,0.533,0.211,0.092,26,22,9,5.5,0.5,0.4,2.7,20.7,0,0,0,5.4,14.8,,,,14.8,99.9,101.5,268,295,0.0017,0.0083
 13ZM002,IVCHENKO PROGRESS ZMBK,D-36 ser. 4A,,TF,5,19.9,63.77,0.634,0.533,0.211,0.092,26,22,9,5.5,0.5,0.4,2.7,20.7,0,0,0,5.4,14.8,,,,14.8,99.9,101.5,268,295,0.0017,0.0083
 13ZM003,IVCHENKO PROGRESS ZMBK,D-436-148 F1,,TF,4.9,19.8,64.43,0.548,0.468,0.218,0.093,18.93,16,7.26,3.64,0.54,0.54,2.99,23.46,0.1,0.04,0.07,2.26,6.7,,,,6.7,99.02,102.66,266,301,0.00248,0.01624
 13ZM004,IVCHENKO PROGRESS ZMBK,D-436-148 F2,,TF,4.9,20.73,68.72,0.581,0.493,0.225,0.099,19.76,16.64,7.31,3.78,0.48,0.4,2.71,19.56,0.09,0.05,0.08,1.39,6.7,,,,6.9,99.02,102.66,266,301,0.00248,0.01624

pycontrails/physics/geo.py

@@ -886,7 +886,7 @@ def spatial_bounding_box(
     >>> lon = rng.uniform(-180, 180, size=30)
     >>> lat = rng.uniform(-90, 90, size=30)
     >>> spatial_bounding_box(lon, lat)
-    (-168.0, -77.0, 155.0, 82.0)
+    (np.float64(-168.0), np.float64(-77.0), np.float64(155.0), np.float64(82.0))
     """
     lon_min = max(np.floor(np.min(longitude) - buffer), -180.0)
     lon_max = min(np.ceil(np.max(longitude) + buffer), 179.99)

{pycontrails-0.52.0.dist-info → pycontrails-0.52.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.52.0
+Version: 0.52.2
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: dask >=2022.3
-Requires-Dist: numpy <2.0.0,>=1.22
+Requires-Dist: numpy >=1.22
 Requires-Dist: overrides >=6.1
 Requires-Dist: pandas >=2.2
 Requires-Dist: scipy >=1.10
@@ -36,7 +36,7 @@ Requires-Dist: xarray >=2022.3
 Provides-Extra: complete
 Requires-Dist: pycontrails[ecmwf,gcp,gfs,jupyter,pyproj,sat,vis,zarr] ; extra == 'complete'
 Provides-Extra: dev
-Requires-Dist: black[jupyter] ==24.4.1 ; extra == 'dev'
+Requires-Dist: black[jupyter] ==24.4.2 ; extra == 'dev'
 Requires-Dist: dep-license ; extra == 'dev'
 Requires-Dist: fastparquet >=0.8 ; extra == 'dev'
 Requires-Dist: ipdb >=0.13 ; extra == 'dev'
@@ -50,7 +50,7 @@ Requires-Dist: pyarrow >=5.0 ; extra == 'dev'
 Requires-Dist: pytest >=8.2 ; extra == 'dev'
 Requires-Dist: pytest-cov >=2.11 ; extra == 'dev'
 Requires-Dist: requests >=2.25 ; extra == 'dev'
-Requires-Dist: ruff ==0.4.1 ; extra == 'dev'
+Requires-Dist: ruff ==0.5.3 ; extra == 'dev'
 Requires-Dist: setuptools ; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: doc8 >=1.1 ; extra == 'docs'
@@ -70,7 +70,7 @@ Requires-Dist: cdsapi >=0.4 ; extra == 'ecmwf'
 Requires-Dist: cfgrib >=0.9 ; extra == 'ecmwf'
 Requires-Dist: eccodes >=1.4 ; extra == 'ecmwf'
 Requires-Dist: ecmwf-api-client >=1.6 ; extra == 'ecmwf'
-Requires-Dist: netcdf4 <1.7.0,>=1.6.1 ; extra == 'ecmwf'
+Requires-Dist: netcdf4 >=1.6.1 ; extra == 'ecmwf'
 Requires-Dist: platformdirs >=3.0 ; extra == 'ecmwf'
 Requires-Dist: requests >=2.25 ; extra == 'ecmwf'
 Requires-Dist: lxml >=5.1.0 ; extra == 'ecmwf'
@@ -98,7 +98,6 @@ Requires-Dist: gcsfs >=2022.3 ; extra == 'sat'
 Requires-Dist: geojson >=3.1 ; extra == 'sat'
 Requires-Dist: google-cloud-bigquery >=3.23 ; extra == 'sat'
 Requires-Dist: google-cloud-bigquery-storage >=2.25 ; extra == 'sat'
-Requires-Dist: h5netcdf >=1.2 ; extra == 'sat'
 Requires-Dist: pillow >=10.3 ; extra == 'sat'
 Requires-Dist: pyproj >=3.5 ; extra == 'sat'
 Requires-Dist: rasterio >=1.3 ; extra == 'sat'
@@ -121,9 +120,9 @@ Requires-Dist: zarr >=2.12 ; extra == 'zarr'
 
 |               |                                                                   |
 |---------------|-------------------------------------------------------------------|
-| **Version**   | [![PyPI version](https://img.shields.io/pypi/v/pycontrails.svg)](https://pypi.python.org/pypi/pycontrails) [![Supported python versions](https://img.shields.io/pypi/pyversions/pycontrails.svg)](https://pypi.python.org/pypi/pycontrails) |
+| **Version**   | [![PyPI version](https://img.shields.io/pypi/v/pycontrails.svg)](https://pypi.python.org/pypi/pycontrails)  [![conda-forge version](https://anaconda.org/conda-forge/pycontrails/badges/version.svg)](https://anaconda.org/conda-forge/pycontrails) [![Supported python versions](https://img.shields.io/pypi/pyversions/pycontrails.svg)](https://pypi.python.org/pypi/pycontrails) |
 | **Citation**  | [![DOI](https://zenodo.org/badge/617248930.svg)](https://zenodo.org/badge/latestdoi/617248930) |
-| **Tests**     | [![Unit test](https://github.com/contrailcirrus/pycontrails/actions/workflows/test.yaml/badge.svg)](https://github.com/contrailcirrus/pycontrails/actions/workflows/test.yaml) [![Docs](https://github.com/contrailcirrus/pycontrails/actions/workflows/docs.yaml/badge.svg)](https://github.com/contrailcirrus/pycontrails/actions/workflows/docs.yaml) [![Release](https://github.com/contrailcirrus/pycontrails/actions/workflows/release.yaml/badge.svg)](https://github.com/contrailcirrus/pycontrails/actions/workflows/release.yaml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/contrailcirrus/pycontrails/badge)](https://securityscorecards.dev/viewer?uri=github.com/contrailcirrus/pycontrails)|
+| **Tests**     | [![Unit test](https://github.com/contrailcirrus/pycontrails/actions/workflows/test.yaml/badge.svg)](https://github.com/contrailcirrus/pycontrails/actions/workflows/test.yaml) [![Docs](https://github.com/contrailcirrus/pycontrails/actions/workflows/docs.yaml/badge.svg?event=push)](https://github.com/contrailcirrus/pycontrails/actions/workflows/docs.yaml) [![Release](https://github.com/contrailcirrus/pycontrails/actions/workflows/release.yaml/badge.svg)](https://github.com/contrailcirrus/pycontrails/actions/workflows/release.yaml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/contrailcirrus/pycontrails/badge)](https://securityscorecards.dev/viewer?uri=github.com/contrailcirrus/pycontrails)|
 | **License**   | [![Apache License 2.0](https://img.shields.io/pypi/l/pycontrails.svg)](https://github.com/contrailcirrus/pycontrails/blob/main/LICENSE) |
 | **Community** | [![Github Discussions](https://img.shields.io/github/discussions/contrailcirrus/pycontrails)](https://github.com/contrailcirrus/pycontrails/discussions) [![Github Issues](https://img.shields.io/github/issues/contrailcirrus/pycontrails)](https://github.com/contrailcirrus/pycontrails/issues) [![Github PRs](https://img.shields.io/github/issues-pr/contrailcirrus/pycontrails)](https://github.com/contrailcirrus/pycontrails/pulls) |
 
@@ -140,7 +139,9 @@ Documentation and examples available at [py.contrails.org](https://py.contrails.
 
 ## Install
 
-Requires Python (3.9 or later)
+### Install with pip
+
+You can install pycontrails from PyPI with `pip` (Python 3.9 or later required):
 
 ```bash
 $ pip install pycontrails
@@ -155,7 +156,17 @@ Install the latest development version directly from GitHub:
 pip install git+https://github.com/contrailcirrus/pycontrails.git
 ```
 
-See more options in the [install documentation](https://py.contrails.org/install).
+### Install with conda
+
+You can install pycontrails from the [conda-forge](https://conda-forge.org/) channel with `conda` (or other `conda`-like package managers such as `mamba`):
+
+```bash
+conda install -c conda-forge pycontrails
+```
+
+The conda-forge package includes all optional runtime dependencies.
+
+See more installation options in the [install documentation](https://py.contrails.org/install).
 
 ## Get Involved
 

{pycontrails-0.52.0.dist-info → pycontrails-0.52.2.dist-info}/RECORD

@@ -1,34 +1,34 @@
-pycontrails-0.52.0.dist-info/RECORD,,
-pycontrails-0.52.0.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.52.0.dist-info/WHEEL,sha256=E2L8cNry8_qENFWMb8KxRWLe-RhZW94hLc32Xo3HiTg,110
-pycontrails-0.52.0.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
-pycontrails-0.52.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.52.0.dist-info/METADATA,sha256=q757wdU7ow-WkMWeLtjLZ3Mo8h28yfWfx0F-EtfLfbI,8831
-pycontrails/_version.py,sha256=HchZIBAQcFK44NnsWNeG0x1TGXt4xcgLicOAT4yevSE,413
+pycontrails-0.52.2.dist-info/RECORD,,
+pycontrails-0.52.2.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.52.2.dist-info/WHEEL,sha256=jPrF5oWulsOxop3iQfMuD22j-CtnUOYm5n_3r9ZbENY,109
+pycontrails-0.52.2.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
+pycontrails-0.52.2.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.52.2.dist-info/METADATA,sha256=_6cclDjRduE1ZmJm15bLAx4BibdxxfKd2ElNj8CwyNY,9307
+pycontrails/_version.py,sha256=7hRRz1Yg5iw29YoTywrkjgawiL8eg5Gzlc-mhwWCdtM,413
 pycontrails/__init__.py,sha256=O2T9kXCMhcELcMZz7HEnwiBhh4Gfcj-yG1HtrotOKHQ,2001
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=P61Rv1M040A1SRHmdWVR_RfXcWa6faM330n-9499ilI,71722
-pycontrails/core/models.py,sha256=sipUAH_r0A1TxQ0yBjaPj8WC33Piw34ABHyrmRePfhg,39003
-pycontrails/core/interpolation.py,sha256=FFYdUnTzGnkjoGs-FKsK3Y3nSK5lQI-mpq5HPALZ-y4,25495
-pycontrails/core/fleet.py,sha256=84oTb8RJ3-bPVvZn3O2ljMEZLwJ9Q-E455ZzQJ4QaQU,16075
-pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=97XwF4jFJ6des5R36ybseepHyiD7UXc9zZCsKHUxbok,310832
-pycontrails/core/flight.py,sha256=BOnbGZuYNpHO0zJu75u27djoVbttnEPMTtNZjagAd4Q,83599
+pycontrails/core/vector.py,sha256=ZvI-hQylANy6X8cSBMPa51FnMkmkjASsPyKLflZQJOg,71571
+pycontrails/core/models.py,sha256=z06ggBjtWJyDXUexGtoaUgHJA6e7jajqPvZvMXvlSwk,39310
+pycontrails/core/interpolation.py,sha256=beTKgJKQDu07rqwfkAJFOZu83jQTKm1mOEC23EDiLdA,25519
+pycontrails/core/fleet.py,sha256=wqYY_2xD9X-Og0_oxU8ZPqTHYDau9TOPLQcmEnB1kiQ,16140
+pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=aSxW1q0rXzh9Ma3gCgUJxui806x_JCiZBn1CLZ1gTiM,310832
+pycontrails/core/flight.py,sha256=EdB8_P8BELSyXx01CXw_js0zgv-bdsqj3_mt28lhKMU,85144
 pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
-pycontrails/core/polygon.py,sha256=NhoK91oVE2pse1kw2mkkhxxQpJrvBld8ofTMCwNH_h8,18016
+pycontrails/core/polygon.py,sha256=gosyZBX1XBKD2EcHycIZb7uM-xGs8rCfdpiSZlhc2Hc,18028
 pycontrails/core/cache.py,sha256=9TaHyLtCpDazgN5zEt0aa4xNgvNcMc4oO_6nEz0XhYE,27971
 pycontrails/core/__init__.py,sha256=x1z6x8w3sYmEqYcNWyWHuNkS9lPUPbHUoYJZs1K0q98,856
 pycontrails/core/flightplan.py,sha256=s7tHbjMFbHAJkSWV6hPkghuW6jDb1n5UhWAo9XbJ9z0,7349
-pycontrails/core/met.py,sha256=HORTWNre9rSyOgNnVnVaW0A6jDjU5W5A5s2L89KIZyM,93602
-pycontrails/core/aircraft_performance.py,sha256=4yNGfArt741HNFjxpWvEu86BTzie9LaPjC4KH3dXYts,21966
+pycontrails/core/met.py,sha256=tUoo0RT9FBhUWp_IavbyUm-uze1GuWnms0XrYZtZ8Ds,93967
+pycontrails/core/aircraft_performance.py,sha256=4KnLj0zK-mk8Oo3As1CXUkQWBQGMeDdrKi5TeOhOmUA,26107
 pycontrails/core/airports.py,sha256=aeyAXVkioIRomrP79UtNrxindL4f1DJyXFaojZCuBBw,6758
 pycontrails/core/met_var.py,sha256=EhrLGdrCAp8cKb-3Whd_ttLMZn4_zLMhE-QyFinESqo,9197
-pycontrails/core/coordinates.py,sha256=vVITA90x0Jx-UQG2XMm3JAKKsIrFUcU861xV-L9czTI,5291
-pycontrails/datalib/goes.py,sha256=CDCwNWv35MGm20s0AS5Xxy0hGyiUhtX9S9cc8cI_bKI,26357
+pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
+pycontrails/datalib/goes.py,sha256=Muh_pqAXSqUlM4ssStUT9QmPxGPEKK21LHFroaqTq7k,26533
 pycontrails/datalib/landsat.py,sha256=jV6E9TMmo3x_EEb-4BnD3L7nB5C3NCLT7FaXoMxXP64,19645
 pycontrails/datalib/spire.py,sha256=66SnMdA8KOS69USjKmqrJmTKPK08Ehih9tnlsCt-AJw,25331
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=Rzsp5Hv6Rh3XVEfvFeofmClId4Eq2KhdYiEhIqFPE3U,17222
-pycontrails/datalib/_met_utils/metsource.py,sha256=lAMkvbwix1ziqWGZuHvsu69p3etwOjmAtYiriaEz7Hg,23991
+pycontrails/datalib/_met_utils/metsource.py,sha256=mh7nWfpnP5l7unuQHDSYjar4hN7k9iSDNd6cYZcwwWM,23844
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=YuoPmPlP9TpZ6qhUPLbb30y3D3dTNDasTLZqP5MAWtw,18624
 pycontrails/datalib/ecmwf/era5.py,sha256=TMX9bJHvALvSbxFI0BpwI9l3yMoxI1ecc2ROfvPaNIE,18242
 pycontrails/datalib/ecmwf/era5_model_level.py,sha256=0R96ATNVp1UB63M_ER6aEqdY60dfkj_0SNVjyD6a8fE,18945
@@ -69,7 +69,7 @@ pycontrails/models/emissions/ffm2.py,sha256=h_bmB4pxxvC1ptqz5jB_rpf9QgaAv9J7Lu-6
 pycontrails/models/emissions/emissions.py,sha256=MSyCMHdB-OXf9__CTHtAi85sCflqvifk4HT_1Qp_q4A,47564
 pycontrails/models/emissions/black_carbon.py,sha256=F2SCUiV39zg2mUxbWsct6vvr_JgHdyB59DVWkw40eX0,20234
 pycontrails/models/emissions/static/edb-nvpm-v29b-engines.csv,sha256=NatpVI1D2tTDLK7uVvlanm9DhfFB44nmFA4aocUcXco,77318
-pycontrails/models/emissions/static/edb-gaseous-v29b-engines.csv,sha256=Oub-FkyR4cPlTEPo9wDPAn4i4CpGpKH2tet30MNitI0,127518
+pycontrails/models/emissions/static/edb-gaseous-v29b-engines.csv,sha256=jCjt7cP6sqLdbDp5NUoaqllVkZNE7NJtSnbB3rX_zQI,127523
 pycontrails/models/emissions/static/default-engine-uids.csv,sha256=3blb0aqtM8YRsyT1WDo0UYTBtv1h4BwXRIC_Ll9fhnI,6217
 pycontrails/models/apcemm/__init__.py,sha256=M-hrJklbSgBckclm526MiBAhpKPLHgJbB58ArbJuGIk,175
 pycontrails/models/apcemm/inputs.py,sha256=88GylkiaymEW_XZeFxLsICI9wV6kl8wVYsuyTe8zIQ8,6585
@@ -82,12 +82,12 @@ pycontrails/models/humidity_scaling/quantiles/era5-pressure-level-quantiles.pq,s
 pycontrails/models/humidity_scaling/quantiles/era5-model-level-quantiles.pq,sha256=pShCvNUo0NYtAHhT9IBRuj38X9jejdlKfv-ZoOKmtKI,35943
 pycontrails/models/cocip/radiative_forcing.py,sha256=ERuFcYMo0_1iiOricnZ8D4ext23bMnTCeZwg9vd6Vzs,44944
 pycontrails/models/cocip/wind_shear.py,sha256=p8d3iaNzxPA3MoxFEM1ZDKt0aticoD6U9cv0QmbuBzs,3860
-pycontrails/models/cocip/cocip.py,sha256=0ILMcjbgsM00rCXAeo9UkSnUsmvq1XvORhNPI-ReNcM,97591
-pycontrails/models/cocip/output_formats.py,sha256=e3K-23EvEE2z9PuHNr2OQhwvN8_PYmNmR7Li-dsYZq8,83229
+pycontrails/models/cocip/cocip.py,sha256=1ReioOLubxyRjXAAZYwer2g144312wZQc72XhmUEVNA,97188
+pycontrails/models/cocip/output_formats.py,sha256=bmQKyyuwbn92W1IvdJI3NY4WfEpN6dT8HbxU38B_nnM,83352
 pycontrails/models/cocip/__init__.py,sha256=jd-9Tq20s1kwQBlxsYfZLi3hlT5MnWOY2XsPazq1fgE,962
 pycontrails/models/cocip/cocip_params.py,sha256=R4bewge3xLgWYbBbGwd8e8r0NlaFx2IaQPZEfiqJZRI,11392
 pycontrails/models/cocip/wake_vortex.py,sha256=i_OF193KK5BCMdVCgK0_4Aqn55f6rnL4WDWEac8um-w,14421
-pycontrails/models/cocip/cocip_uncertainty.py,sha256=4JtlCVFpLBnPRlvyEp9QFpRfHFK9joSTnxe0NJdONG4,11784
+pycontrails/models/cocip/cocip_uncertainty.py,sha256=-3ICEbrhB6eQiYIqpEahzhf12AwV7ge-yvj_NaOqW3g,11891
 pycontrails/models/cocip/radiative_heating.py,sha256=YRpwfXgFnf89iuJiIM96q-jbdcMAwlX8QLsADTKMABE,18848
 pycontrails/models/cocip/contrail_properties.py,sha256=tycCxKf8j9GvVYDQBPxjtp6xLll-r00C0XW-w1jGbMI,55594
 pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=kDxFpAIkcqqhGmwXoxv3_cSESj1Ur45GbLJF56IACJs,14573
@@ -101,7 +101,7 @@ pycontrails/models/ps_model/static/ps-aircraft-params-20240524.csv,sha256=3eNhSw
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=l4vBPrOKCJDz5Y1uMjmOGVyUcSWgfZtFWbjW968OPz8,5875
 pycontrails/models/cocipgrid/__init__.py,sha256=ar6bF_8Pusbb-myujz_q5ntFylQTNH8yiM8fxP7Zk30,262
 pycontrails/models/cocipgrid/cocip_grid.py,sha256=MLsh3rZb-6Q7vnad6YYTfZs83-kSJEbhjfWTS9oooXI,94333
-pycontrails/physics/geo.py,sha256=lqEpTLhex2r-o-6EHSSEiPC8xqZ-NlwwCBob9-cJA_w,30240
+pycontrails/physics/geo.py,sha256=9ZWIXyEEgrBNqsoeBBlYLTA-8GUTgyc-jgeVgchxXa8,30288
 pycontrails/physics/units.py,sha256=j-G5AC9eWIvv2MTOq9lUOoOQKFNJJuHzWLanHRji2tE,12272
 pycontrails/physics/constants.py,sha256=pHQQmccMUwuNnY4hFtm3L8G2rnUQcfJnroyQr8HAVeM,3146
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44

{pycontrails-0.52.0.dist-info → pycontrails-0.52.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_11_0_arm64