pycontrails 0.54.9__cp312-cp312-win_amd64.whl → 0.54.11__cp312-cp312-win_amd64.whl

pycontrails/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.54.9'
-__version_tuple__ = version_tuple = (0, 54, 9)
+__version__ = version = '0.54.11'
+__version_tuple__ = version_tuple = (0, 54, 11)

pycontrails/core/flight.py

@@ -806,19 +806,24 @@ class Flight(GeoVectorDataset):
         nominal_rocd: float = constants.nominal_rocd,
         drop: bool = True,
         keep_original_index: bool = False,
+        time: npt.NDArray[np.datetime64] | None = None,
     ) -> Self:
         """Resample and fill flight trajectory with geodesics and linear interpolation.
 
-        Waypoints are resampled according to the frequency ``freq``. Values for :attr:`data`
-        columns ``longitude``, ``latitude``, and ``altitude`` are interpolated.
+        Waypoints are resampled according to the frequency ``freq`` or to the times in ``time``.
+        Values for :attr:`data` columns ``longitude``, ``latitude``, and ``altitude``
+        are interpolated.
 
-        Resampled waypoints will include all multiples of ``freq`` between the flight
-        start and end time. For example, when resampling to a frequency of 1 minute,
-        a flight that starts at 2020/1/1 00:00:59 and ends at 2020/1/1 00:01:01
+        When resampled based on ``freq``, waypoints will include all multiples of ``freq``
+        between the flight start and end time. For example, when resampling to a frequency of
+        1 minute, a flight that starts at 2020/1/1 00:00:59 and ends at 2020/1/1 00:01:01
         will return a single waypoint at 2020/1/1 00:01:00, whereas a flight that
         starts at 2020/1/1 00:01:01 and ends at 2020/1/1 00:01:59 will return an empty
         flight.
 
+        When resampled based on ``time``, waypoints will include all times between the
+        flight start and end time.
+
         Parameters
         ----------
         freq : str, optional
@@ -844,6 +849,9 @@ class Flight(GeoVectorDataset):
             Keep the original index of the :class:`Flight` in addition to the new
             resampled index. Defaults to ``False``.
             .. versionadded:: 0.45.2
+        time : npt.NDArray[np.datetime64], optional
+            Times to resample to. Will override ``freq`` if provided.
+            .. versionadded:: 0.54.11
 
         Returns
         -------
@@ -930,10 +938,10 @@ class Flight(GeoVectorDataset):
         if shift is not None:
             df["longitude"] = (df["longitude"] - shift) % 360.0
 
-        # STEP 5: Resample flight to freq
+        # STEP 5: Resample flight
         # Save altitudes to copy over - these just get rounded down in time.
         # Also get target sample indices
-        df, t = _resample_to_freq(df, freq)
+        df, t = _resample_to_freq_or_time(df, freq, time)
 
         if shift is not None:
             # We need to translate back to the original chart here
@@ -2129,13 +2137,14 @@ def segment_rocd(
     return T_correction * out  # type: ignore[return-value]
 
 
-def _resample_to_freq(df: pd.DataFrame, freq: str) -> tuple[pd.DataFrame, pd.DatetimeIndex]:
+def _resample_to_freq_or_time(
+    df: pd.DataFrame, freq: str, time: npt.NDArray[np.datetime64] | None
+) -> tuple[pd.DataFrame, pd.DatetimeIndex]:
     """Resample a DataFrame to a given frequency.
 
-    This function is used to resample a DataFrame to a given frequency. The new
-    index will include all the original index values and the new resampled-to-freq
-    index values. The "longitude" and "latitude" columns will be linearly interpolated
-    to the new index values.
+    This function is used to resample a DataFrame to a given frequency or a specified set of times.
+    The new index will include all the original index values and the new resampled index values.
+    The "longitude" and "latitude" columns will be linearly interpolated to the new index values.
 
     Parameters
     ----------
@@ -2145,6 +2154,8 @@ def _resample_to_freq(df: pd.DataFrame, freq: str) -> tuple[pd.DataFrame, pd.Dat
     freq : str
         Frequency to resample to. See :func:`pd.DataFrame.resample` for
         valid frequency strings.
+    time : pd.DatetimeIndex | None
+        Times to resample to. Overrides ``freq`` if not ``None``.
 
     Returns
     -------
@@ -2153,10 +2164,14 @@ def _resample_to_freq(df: pd.DataFrame, freq: str) -> tuple[pd.DataFrame, pd.Dat
     """
 
     # Manually create a new index that includes all the original index values
-    # and the resampled-to-freq index values.
-    t0 = df.index[0].ceil(freq)
-    t1 = df.index[-1]
-    t = pd.date_range(t0, t1, freq=freq, name="time")
+    # and the resampled index values
+    if time is None:
+        t0 = df.index[0].ceil(freq)
+        t1 = df.index[-1]
+        t = pd.date_range(t0, t1, freq=freq, name="time")
+    else:
+        mask = (time >= df.index[0]) & (time <= df.index[-1])
+        t = pd.DatetimeIndex(time[mask], name="time")
 
     concat_arr = np.concatenate([df.index, t])
     concat_arr = np.unique(concat_arr)

pycontrails/core/flightplan.py

@@ -97,8 +97,8 @@ def parse_atc_plan(atc_plan: str) -> dict[str, str]:
     --------
     :func:`to_atc_plan`
     """
-    atc_plan = atc_plan.replace("\r", "")
-    atc_plan = atc_plan.replace("\n", "")
+    atc_plan = atc_plan.replace("\r", " ")
+    atc_plan = atc_plan.replace("\n", " ")
     atc_plan = atc_plan.upper()
     atc_plan = atc_plan.strip()
 

pycontrails/core/met.py

@@ -522,7 +522,7 @@ class MetBase(ABC, Generic[XArrayType]):
         return self.data.__len__()
 
     @property
-    def attrs(self) -> dict[Hashable, Any]:
+    def attrs(self) -> dict[str, Any]:
         """Pass through to :attr:`self.data.attrs`."""
         return self.data.attrs
 

pycontrails/core/models.py

@@ -543,7 +543,7 @@ class Model(ABC):
 
         See Also
         --------
-        - :meth:`eval`
+        eval
         """
         self.source = self._get_source(source)
 
@@ -744,8 +744,8 @@ class Model(ABC):
 
         See Also
         --------
-        - get_source_param
-        - GeoVectorDataset.get_data_or_attr
+        get_source_param
+        pycontrails.core.vector.GeoVectorDataset.get_data_or_attr
         """
         marker = self.__marker
 
@@ -805,8 +805,8 @@ class Model(ABC):
 
         See Also
         --------
-        - get_data_param
-        - GeoVectorDataset.get_data_or_attr
+        get_data_param
+        pycontrails.core.vector.GeoVectorDataset.get_data_or_attr
         """
         return self.get_data_param(self.source, key, default, set_attr=set_attr)
 
@@ -1311,7 +1311,11 @@ def update_param_dict(param_dict: dict[str, Any], new_params: dict[str, Any]) ->
             raise KeyError(msg) from None
 
         # Convenience: convert timedelta64-like params
-        if isinstance(old_value, np.timedelta64) and not isinstance(value, np.timedelta64):
+        if (
+            isinstance(old_value, np.timedelta64)
+            and not isinstance(value, np.timedelta64)
+            and value is not None
+        ):
             value = pd.to_timedelta(value).to_numpy()
 
         param_dict[param] = value

pycontrails/core/polygon.py

@@ -238,7 +238,7 @@ def _contours_to_polygons(
                 latitude=latitude,
                 precision=precision,
                 buffer=buffer,
-                i=child_i,
+                i=child_i,  # type: ignore[arg-type]
             )
 
             candidate = shapely.Polygon(polygon.exterior, [h.exterior for h in holes])

pycontrails/core/vector.py

@@ -242,7 +242,7 @@ def _empty_vector_dict(keys: Iterable[str]) -> dict[str, np.ndarray]:
     return data
 
 
-class VectorDataset:
+class VectorDataset:  # noqa: PLW1641
     """Base class to hold 1D arrays of consistent size.
 
     Parameters
@@ -304,9 +304,9 @@ class VectorDataset:
                 self.data = VectorDataDict({k: v.to_numpy(copy=copy) for k, v in data.items()})
             else:
                 time = _handle_time_column(time)
-                data = {k: v.to_numpy(copy=copy) for k, v in data.items() if k != "time"}
-                data["time"] = time.to_numpy(copy=copy)
-                self.data = VectorDataDict(data)
+                data_np = {k: v.to_numpy(copy=copy) for k, v in data.items() if k != "time"}
+                data_np["time"] = time.to_numpy(copy=copy)
+                self.data = VectorDataDict(data_np)
 
         # For anything else, we assume it is a dictionary of array-like and attach it
         else:
@@ -564,7 +564,7 @@ class VectorDataset:
         _repr = f"{class_name} [{n_keys} keys x {self.size} length, {n_attrs} attributes]"
 
         keys = list(self)
-        keys = keys[0:5] + ["..."] + keys[-1:] if len(keys) > 5 else keys
+        keys = [*keys[0:5], "...", *keys[-1:]] if len(keys) > 5 else keys
         _repr += f"\n\tKeys: {', '.join(keys)}"
 
         attrs = self._display_attrs()

pycontrails/datalib/_met_utils/metsource.py

@@ -320,7 +320,7 @@ def parse_grid(grid: float, supported: Sequence[float]) -> float:
 
 
 def round_hour(time: datetime, hour: int) -> datetime:
-    """Round time to the nearest whole hour before input time.
+    """Floor time to the nearest whole hour before input time.
 
     Parameters
     ----------
@@ -337,7 +337,7 @@ def round_hour(time: datetime, hour: int) -> datetime:
     Raises
     ------
     ValueError
-        Description
+        If ``hour`` isn't one of 1, 2, 3, ..., 22, 23.
     """
     if hour not in range(1, 24):
         msg = f"hour must be between [1, 23], got {hour}"

pycontrails/datalib/ecmwf/hres.py

@@ -17,7 +17,6 @@ else:
 
 LOG = logging.getLogger(__name__)
 
-import numpy as np
 import pandas as pd
 import xarray as xr
 
@@ -120,6 +119,8 @@ class HRES(ECMWFAPI):
         }
 
     Credentials can also be provided directly ``url`` ``key``, and ``email`` keyword args.
+    A third option is to set the environment variables ``ECMWF_API_URL``, ``ECMWF_API_KEY``,
+    and ``ECMWF_API_EMAIL``.
 
     See `ecmwf-api-client <https://github.com/ecmwf/ecmwf-api-client>`_ documentation
     for more information.
@@ -131,7 +132,7 @@ class HRES(ECMWFAPI):
         Input must be a datetime-like or tuple of datetime-like
         (datetime, :class:`pandas.Timestamp`, :class:`numpy.datetime64`)
         specifying the (start, end) of the date range, inclusive.
-        If ``forecast_time`` is unspecified, the forecast time will
+        If ``forecast_time`` is unspecified, the forecast reference time will
         be assumed to be the nearest synoptic hour: 00, 06, 12, 18.
         All subsequent times will be downloaded for relative to :attr:`forecast_time`.
         If None, ``paths`` must be defined and all time coordinates will be loaded from files.
@@ -150,14 +151,20 @@ class HRES(ECMWFAPI):
         Specify latitude/longitude grid spacing in data.
         Defaults to 0.25.
     stream : str, optional
-        "oper" = atmospheric model/HRES, "enfo" = ensemble forecast.
-        Defaults to "oper" (HRES),
+        - "oper" = high resolution forecast, atmospheric fields, run at hours 00Z and 12Z
+        - "scda" = short cut-off high resolution forecast, atmospheric fields,
+          run at hours 06Z and 18Z
+        - "enfo" = ensemble forecast, atmospheric fields, run at hours 00Z, 06Z, 12Z, and 18Z
+        Defaults to "oper" (HRES).
+        If the stream is incompatible with a provided forecast_time, a ``ValueError`` is raised.
+        See the `ECMWF documentation <https://confluence.ecmwf.int/display/DAC/ECMWF+open+data%3A+real-time+forecasts+from+IFS+and+AIFS>`_
+        for additional information.
     field_type : str, optional
         Field type can be e.g. forecast (fc), perturbed forecast (pf),
         control forecast (cf), analysis (an).
         Defaults to "fc".
     forecast_time : DatetimeLike, optional
-        Specify forecast run by runtime.
+        Specify forecast reference time (the time at which the forecast was initialized).
         Defaults to None.
     cachestore : cache.CacheStore | None, optional
         Cache data store for staging data files.
@@ -230,7 +237,7 @@ class HRES(ECMWFAPI):
 
     __slots__ = ("email", "field_type", "forecast_time", "key", "server", "stream", "url")
 
-    #: stream type, "oper" = atmospheric model/HRES, "enfo" = ensemble forecast.
+    #: stream type, "oper" or "scda" for atmospheric model/HRES, "enfo" for ensemble forecast.
     stream: str
 
     #: Field type, forecast ("fc"), perturbed forecast ("pf"),
@@ -251,7 +258,6 @@ class HRES(ECMWFAPI):
         variables: metsource.VariableInput,
         pressure_levels: metsource.PressureLevelInput = -1,
         paths: str | list[str] | pathlib.Path | list[pathlib.Path] | None = None,
-        cachepath: str | list[str] | pathlib.Path | list[pathlib.Path] | None = None,
         grid: float = 0.25,
         stream: str = "oper",
         field_type: str = "fc",
@@ -276,9 +282,7 @@ class HRES(ECMWFAPI):
         self.server = ECMWFService("mars", url=url, key=key, email=email)
         self.paths = paths
 
-        if cachestore is self.__marker:
-            cachestore = cache.DiskCacheStore()
-        self.cachestore = cachestore
+        self.cachestore = cache.DiskCacheStore() if cachestore is self.__marker else cachestore
 
         if time is None and paths is None:
             raise ValueError("Time input is required when paths is None")
@@ -291,14 +295,6 @@ class HRES(ECMWFAPI):
 
         self.grid = metsource.parse_grid(grid, [0.1, 0.25, 0.5, 1])  # lat/lon degree resolution
 
-        # "enfo" = ensemble forecast
-        # "oper" = atmospheric model/HRES
-        if stream not in ("oper", "enfo"):
-            msg = "Parameter stream must be 'oper' or 'enfo'"
-            raise ValueError(msg)
-
-        self.stream = stream
-
         # "fc" = forecast
         # "pf" = perturbed forecast
         # "cf" = control forecast
@@ -322,7 +318,29 @@ class HRES(ECMWFAPI):
             # round first element to the nearest 6 hour time (00, 06, 12, 18 UTC) for forecast_time
             self.forecast_time = metsource.round_hour(self.timesteps[0], 6)
 
-        # when no forecast_time or time input, forecast_time is defined in _open_and_cache
+        # NOTE: when no forecast_time or time input, forecast_time is defined in _open_and_cache
+        # This could occur when only the paths parameter is provided
+
+        # "enfo" = ensemble forecast
+        # "oper" = atmospheric model/HRES for 00 and 12 model runs
+        # "scda" = atmospheric model/HRES for 06 and 18 model runs
+        available_streams = ("oper", "enfo", "scda")
+        if stream not in available_streams:
+            msg = f"Parameter stream must be one of {available_streams}"
+            raise ValueError(msg)
+
+        if self.forecast_time.hour in (0, 12) and stream == "scda":
+            raise ValueError(
+                f"Stream {stream} is not compatible with forecast_time {self.forecast_time}. "
+                "Set stream='oper' for 00 and 12 UTC forecast times."
+            )
+
+        if self.forecast_time.hour in (6, 18) and stream == "oper":
+            raise ValueError(
+                f"Stream {stream} is not compatible with forecast_time {self.forecast_time}. "
+                "Set stream='scda' for 06 and 18 UTC forecast times."
+            )
+        self.stream = stream
 
     def __repr__(self) -> str:
         base = super().__repr__()
@@ -351,16 +369,14 @@ class HRES(ECMWFAPI):
         list[tuple[pd.Timestamp, pd.Timestamp]]
             List of tuple time bounds that can be used as inputs to :class:`HRES(time=...)`
         """
-        time_ranges = np.unique(
-            [pd.Timestamp(t.year, t.month, t.day, 12 * (t.hour // 12)) for t in timesteps]
-        )
+        time_ranges = sorted({t.floor("12h") for t in timesteps})
 
         if len(time_ranges) == 1:
-            time_ranges = [(timesteps[0], timesteps[-1])]
-        else:
-            time_ranges[0] = (timesteps[0], time_ranges[1] - pd.Timedelta(hours=1))
-            time_ranges[1:-1] = [(t, t + pd.Timedelta(hours=11)) for t in time_ranges[1:-1]]
-            time_ranges[-1] = (time_ranges[-1], timesteps[-1])
+            return [(timesteps[0], timesteps[-1])]
+
+        time_ranges[0] = (timesteps[0], time_ranges[1] - pd.Timedelta(hours=1))
+        time_ranges[1:-1] = [(t, t + pd.Timedelta(hours=11)) for t in time_ranges[1:-1]]
+        time_ranges[-1] = (time_ranges[-1], timesteps[-1])
 
         return time_ranges
 
@@ -642,7 +658,7 @@ class HRES(ECMWFAPI):
 
     @override
     def set_metadata(self, ds: xr.Dataset | MetDataset) -> None:
-        if self.stream == "oper":
+        if self.stream in ("oper", "scda"):
             product = "forecast"
         elif self.stream == "enfo":
             product = "ensemble"
@@ -689,8 +705,8 @@ class HRES(ECMWFAPI):
         xr_kwargs.setdefault("parallel", False)
         ds = self.open_dataset(self.paths, **xr_kwargs)
 
-        # set forecast time if its not already defined
-        if not getattr(self, "forecast_time", None):
+        # set forecast time if it's not defined (this occurs when only the paths param is provided)
+        if not hasattr(self, "forecast_time"):
             self.forecast_time = ds["time"].values.astype("datetime64[s]").tolist()  # type: ignore[assignment]
 
         # check that forecast_time is correct if defined

pycontrails/datalib/ecmwf/hres_model_level.py

@@ -66,6 +66,8 @@ class HRESModelLevel(ECMWFAPI):
         }
 
     Credentials can also be provided directly in ``url``, ``key``, and ``email`` keyword args.
+    A third option is to set the environment variables ``ECMWF_API_URL``, ``ECMWF_API_KEY``,
+    and ``ECMWF_API_EMAIL``.
 
     See `ecmwf-api-client <https://github.com/ecmwf/ecmwf-api-client>`_ documentation
     for more information.

pycontrails/datalib/goes.py

@@ -59,6 +59,22 @@ DEFAULT_CHANNELS = "C11", "C14", "C15"
 #: See `GOES ABI scan information <https://www.goes-r.gov/users/abiScanModeInfo.html>`_.
 GOES_SCAN_MODE_CHANGE = datetime.datetime(2019, 4, 2, 16)
 
+#: The date at which GOES-19 data started being available. This is used to
+#: determine the source (GOES-16 or GOES-19) of requested. In particular,
+#: Mesoscale images are only available for GOES-East from GOES-19 after this date.
+#: See the `NOAA press release <https://www.noaa.gov/news-release/noaas-goes-19-satellite-now-operational-providing-critical-new-data-to-forecasters>`_.
+GOES_16_19_SWITCH_DATE = datetime.datetime(2025, 4, 4)
+
+#: The GCS bucket for GOES-East data before ``GOES_16_19_SWITCH_DATE``.
+GOES_16_BUCKET = "gcp-public-data-goes-16"
+
+#: The GCS bucket for GOES-West data. Note that GOES-17 has degraded data quality
+#: and is not recommended for use. This bucket isn't used by the ``GOES`` handler by default.
+GOES_18_BUCKET = "gcp-public-data-goes-18"
+
+#: The GCS bucket for GOES-East data after ``GOES_16_19_SWITCH_DATE``.
+GOES_19_BUCKET = "gcp-public-data-goes-19"
+
 
 class GOESRegion(enum.Enum):
     """GOES Region of interest.
@@ -187,7 +203,7 @@ def gcs_goes_path(
     time: datetime.datetime,
     region: GOESRegion,
     channels: str | Iterable[str] | None = None,
-    bucket: str = "gcp-public-data-goes-16",
+    bucket: str | None = None,
     fs: gcsfs.GCSFileSystem | None = None,
 ) -> list[str]:
     """Return GCS paths to GOES data at the given time for the given region and channels.
@@ -208,6 +224,12 @@ def gcs_goes_path(
         set ``channels=("C11", "C14", "C15")``. For the true color scheme,
         set ``channels=("C01", "C02", "C03")``. By default, the channels
         required by the SEVIRI ash color scheme are used.
+    bucket : str | None
+        GCS bucket for GOES data. If None, the bucket is automatically
+        set to ``GOES_16_BUCKET`` if ``time`` is before
+        ``GOES_16_19_SWITCH_DATE`` and ``GOES_19_BUCKET`` otherwise.
+    fs : gcsfs.GCSFileSystem | None
+        GCS file system instance. If None, a default anonymous instance is created.
 
     Returns
     -------
@@ -236,6 +258,11 @@ def gcs_goes_path(
     >>> pprint(paths)
     ['gcp-public-data-goes-16/ABI-L2-CMIPM/2023/093/02/OR_ABI-L2-CMIPM1-M6C01_G16_s20230930211249_e20230930211309_c20230930211386.nc']
 
+    >>> t = datetime.datetime(2025, 5, 4, 3, 2)
+    >>> paths = gcs_goes_path(t, GOESRegion.M2, channels="C01")
+    >>> pprint(paths)
+    ['gcp-public-data-goes-19/ABI-L2-CMIPM/2025/124/03/OR_ABI-L2-CMIPM2-M6C01_G19_s20251240302557_e20251240303014_c20251240303092.nc']
+
     """
     time = _check_time_resolution(time, region)
     year = time.strftime("%Y")
@@ -247,7 +274,10 @@ def gcs_goes_path(
     product_name = "CMIP"  # Cloud and Moisture Imagery
     product = f"{sensor}-{level}-{product_name}{region.name[0]}"
 
-    bucket = bucket.removeprefix("gs://")
+    if bucket is None:
+        bucket = GOES_16_BUCKET if time < GOES_16_19_SWITCH_DATE else GOES_19_BUCKET
+    else:
+        bucket = bucket.removeprefix("gs://")
 
     path_prefix = f"gs://{bucket}/{product}/{year}/{yday}/{hour}/"
 
@@ -267,7 +297,13 @@ def gcs_goes_path(
             time_str = f"{time_str[:-1]}6"
 
     name_prefix = f"OR_{product[:-1]}{region.name}-{mode}"
-    name_suffix = f"_G16_s{time_str}*"
+
+    try:
+        satellite_number = int(bucket[-2:])  # 16 or 18 or 19 -- this may fail for custom buckets
+    except (ValueError, IndexError) as exc:
+        msg = f"Bucket name {bucket} does not end with a valid satellite number."
+        raise ValueError(msg) from exc
+    name_suffix = f"_G{satellite_number}_s{time_str}*"
 
     channels = _parse_channels(channels)
 
@@ -323,8 +359,12 @@ class GOES:
     cachestore : cache.CacheStore | None
         Cache store for GOES data. If None, data is downloaded directly into
         memory. By default, a :class:`cache.DiskCacheStore` is used.
-    goes_bucket : str = "gcp-public-data-goes-16"
-        GCP bucket for GOES data. AWS access is not supported.
+    goes_bucket : str | None = None
+        GCP bucket for GOES data. If None, the bucket is automatically
+        set to ``GOES_16_BUCKET`` if the requested time is before
+        ``GOES_16_19_SWITCH_DATE`` and ``GOES_19_BUCKET`` otherwise.
+        The satellite number used for filename construction is derived from the
+        last two characters of this bucket name.
 
     See Also
     --------
@@ -396,7 +436,7 @@ class GOES:
         region: GOESRegion | str = GOESRegion.F,
         channels: str | Iterable[str] | None = None,
         cachestore: cache.CacheStore | None = __marker,  # type: ignore[assignment]
-        goes_bucket: str = "gcp-public-data-goes-16",
+        goes_bucket: str | None = None,
     ) -> None:
         self.region = _parse_region(region)
         self.channels = _parse_channels(channels)
@@ -413,7 +453,10 @@ class GOES:
 
     def __repr__(self) -> str:
         """Return string representation."""
-        return f"GOES(region='{self.region}', channels={sorted(self.channels)})"
+        return (
+            f"GOES(region={self.region}, channels={sorted(self.channels)}, "
+            f"goes_bucket={self.goes_bucket})"
+        )
 
     def gcs_goes_path(self, time: datetime.datetime, channels: set[str] | None = None) -> list[str]:
         """Return GCS paths to GOES data at given time.
@@ -435,7 +478,7 @@ class GOES:
             List of GCS paths to GOES data.
         """
         channels = channels or self.channels
-        return gcs_goes_path(time, self.region, channels, self.goes_bucket)
+        return gcs_goes_path(time, self.region, channels, bucket=self.goes_bucket, fs=self.fs)
 
     def _lpaths(self, time: datetime.datetime) -> dict[str, str]:
         """Construct names for local netcdf files using the :attr:`cachestore`.
@@ -448,7 +491,11 @@ class GOES:
 
         out = {}
         for c in self.channels:
-            name = f"{self.region.name}_{t_str}_{c}.nc"
+            if self.goes_bucket:
+                name = f"{self.goes_bucket}_{self.region.name}_{t_str}_{c}.nc"
+            else:
+                name = f"{self.region.name}_{t_str}_{c}.nc"
+
             lpath = self.cachestore.path(name)
             out[c] = lpath
 

pycontrails/models/accf.py

@@ -22,7 +22,6 @@ from pycontrails.core.met_var import (
 from pycontrails.core.models import Model, ModelParams
 from pycontrails.core.vector import GeoVectorDataset
 from pycontrails.datalib import ecmwf
-from pycontrails.utils import dependencies
 
 
 def wide_body_jets() -> set[str]:
@@ -224,12 +223,11 @@ class ACCF(Model):
         try:
             from climaccf.accf import GeTaCCFs
         except ModuleNotFoundError as e:
-            dependencies.raise_module_not_found_error(
-                name="ACCF.eval method",
-                package_name="climaccf",
-                module_not_found_error=e,
-                pycontrails_optional_package="accf",
+            msg = (
+                "ACCF.eval method requires the 'climaccf' package. This can be installed "
+                "with 'pip install git+https://github.com/dlr-pa/climaccf.git'."
             )
+            raise ModuleNotFoundError(msg) from e
 
         self.update_params(params)
         self.set_source(source)

pycontrails/models/cocip/output_formats.py

@@ -2138,7 +2138,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
+    # We'll get a nice error message if dependencies are not installed
+    from pycontrails.datalib import goes
 
     try:
         import cartopy.crs as ccrs
@@ -2213,9 +2214,8 @@ def compare_cocip_with_goes(
     _contrail = _contrail.filter(is_in_domain)
 
     # Download GOES image at `time`
-    goes = GOES(region=region)
-    da = goes.get(time)
-    rgb, transform, extent = extract_goes_visualization(da)
+    da = goes.GOES(region=region).get(time)
+    rgb, transform, extent = goes.extract_goes_visualization(da)
     bbox = spatial_bbox[0], spatial_bbox[2], spatial_bbox[1], spatial_bbox[3]
 
     # Calculate optimal figure dimensions

pycontrails/models/cocipgrid/cocip_grid.py

@@ -2198,11 +2198,11 @@ def result_merge_source(
     """Merge ``results`` and ``verbose_dict`` onto ``source``."""
 
     # Initialize the main output arrays to all zeros
-    dtype = result["age"].dtype if result else "timedelta64[ns]"
-    contrail_age = np.zeros(source.size, dtype=dtype)
+    age_dtype = result["age"].dtype if result else "timedelta64[ns]"
+    contrail_age = np.zeros(source.size, dtype=age_dtype)
 
-    dtype = result["ef"].dtype if result else np.float32
-    ef_per_m = np.zeros(source.size, dtype=dtype)
+    ef_dtype = result["ef"].dtype if result else np.float32
+    ef_per_m = np.zeros(source.size, dtype=ef_dtype)
 
     # If there are results, merge them in
     if result:

pycontrails/models/dry_advection.py

@@ -37,8 +37,14 @@ class DryAdvectionParams(models.AdvectionBuffers):
     #: are interpolated against met data once each ``dt_integration``.
     dt_integration: np.timedelta64 = np.timedelta64(30, "m")
 
-    #: Max age of plume evolution.
-    max_age: np.timedelta64 = np.timedelta64(20, "h")
+    #: Max age of plume evolution. If set to ``None``, ``timesteps`` must not be None
+    #: and advection will continue until the final timestep for all plumes.
+    max_age: np.timedelta64 | None = np.timedelta64(20, "h")
+
+    #: Advection timesteps. If provided, ``dt_integration`` will be ignored.
+    #:
+    #: .. versionadded:: 0.54.11
+    timesteps: npt.NDArray[np.datetime64] | None = None
 
     #: Rate of change of pressure due to sedimentation [:math:`Pa/s`]
     sedimentation_rate: float = 0.0
@@ -147,6 +153,13 @@ class DryAdvection(models.Model):
             Advected points.
         """
         self.update_params(params)
+
+        max_age = self.params["max_age"]
+        timesteps = self.params["timesteps"]
+        if max_age is None and timesteps is None:
+            msg = "Timesteps must be set using the timesteps parameter when max_age is None"
+            raise ValueError(msg)
+
         self.set_source(source)
         self.source = self.require_source_type(GeoVectorDataset)
         self.downselect_met()
@@ -159,24 +172,33 @@ class DryAdvection(models.Model):
         interp_kwargs = self.interp_kwargs
 
         dt_integration = self.params["dt_integration"]
-        max_age = self.params["max_age"]
         sedimentation_rate = self.params["sedimentation_rate"]
         dz_m = self.params["dz_m"]
         max_depth = self.params["max_depth"]
         verbose_outputs = self.params["verbose_outputs"]
-
         source_time = self.source["time"]
-        t0 = pd.Timestamp(source_time.min()).floor(pd.Timedelta(dt_integration)).to_numpy()
-        t1 = source_time.max()
-        timesteps = np.arange(t0 + dt_integration, t1 + dt_integration + max_age, dt_integration)
+
+        if timesteps is None:
+            t0 = pd.Timestamp(source_time.min()).floor(pd.Timedelta(dt_integration)).to_numpy()
+            t1 = source_time.max()
+            timesteps = np.arange(
+                t0 + dt_integration, t1 + dt_integration + max_age, dt_integration
+            )
 
         vector2 = GeoVectorDataset()
         met = None
 
         evolved = []
+        tmin = source_time.min()
         for t in timesteps:
-            filt = (source_time < t) & (source_time >= t - dt_integration)
+            filt = (source_time < t) & (source_time >= tmin)
+            tmin = t
+
             vector1 = vector2 + self.source.filter(filt, copy=False)
+            if vector1.size == 0:
+                vector2 = GeoVectorDataset()
+                continue
+            evolved.append(vector1)  # NOTE: vector1 is mutated below (geometry and weather added)
 
             t0 = vector1["time"].min()
             t1 = vector1["time"].max()
@@ -192,9 +214,10 @@ class DryAdvection(models.Model):
                 verbose_outputs=verbose_outputs,
                 **interp_kwargs,
             )
-            evolved.append(vector1)
 
-            filt = (vector2["age"] <= max_age) & vector2.coords_intersect_met(self.met)
+            filt = vector2.coords_intersect_met(self.met)
+            if max_age is not None:
+                filt &= vector2["age"] <= max_age
             vector2 = vector2.filter(filt)
 
             if not vector2 and np.all(source_time < t):
@@ -217,6 +240,8 @@ class DryAdvection(models.Model):
         - ``age``: Age of plume.
         - ``waypoint``: Identifier for each waypoint.
 
+        If ``flight_id`` is present in :attr:`source`, it is retained.
+
         If `"azimuth"` is present in :attr:`source`, `source.attrs`, or :attr:`params`,
         the following variables will also be added:
 
@@ -236,6 +261,9 @@ class DryAdvection(models.Model):
         self.source.setdefault("waypoint", np.arange(self.source.size))
 
         columns = ["longitude", "latitude", "level", "time", "age", "waypoint"]
+        if "flight_id" in self.source:
+            columns.append("flight_id")
+
         azimuth = self.get_source_param("azimuth", set_attr=False)
         if azimuth is None:
             # Early exit for pointwise only simulation
@@ -280,7 +308,14 @@ class DryAdvection(models.Model):
             f"{coord}_buffer": self.params[f"met_{coord}_buffer"]
             for coord in ("longitude", "latitude", "level")
         }
-        buffers["time_buffer"] = (np.timedelta64(0, "ns"), self.params["max_age"])
+
+        max_age = self.params["max_age"]
+        if max_age is None:
+            max_age = max(
+                np.timedelta64(0), self.params["timesteps"].max() - self.source["time"].max()
+            )
+        buffers["time_buffer"] = (np.timedelta64(0, "ns"), max_age)
+
         self.met = self.source.downselect_met(self.met, **buffers)
 
 
@@ -541,6 +576,10 @@ def _evolve_one_step(
         }
     )
 
+    flight_id = vector.get("flight_id")
+    if flight_id is not None:
+        out["flight_id"] = flight_id
+
     azimuth = vector.get("azimuth")
     if azimuth is None:
         # Early exit for "pointwise only" simulation

pycontrails/physics/units.py

@@ -107,7 +107,7 @@ def m_to_T_isa(h: ArrayScalarLike) -> ArrayScalarLike:
 
 
 def _low_altitude_m_to_pl(h: npt.NDArray[np.floating]) -> npt.NDArray[np.floating]:
-    T_isa: np.ndarray = m_to_T_isa(h)
+    T_isa = m_to_T_isa(h)
     power_term = -constants.g / (constants.T_lapse_rate * constants.R_d)
     return (constants.p_surface * (T_isa / constants.T_msl) ** power_term) / 100.0
 

{pycontrails-0.54.9.dist-info → pycontrails-0.54.11.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.54.9
+Version: 0.54.11
 Summary: Python library for modeling aviation climate impacts
 Author-email: "Contrails.org" <py@contrails.org>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Changelog, https://py.contrails.org/changelog.html
 Project-URL: Documentation, https://py.contrails.org
 Project-URL: Issues, https://github.com/contrailcirrus/pycontrails/issues
@@ -11,7 +11,6 @@ Project-URL: Repository, https://github.com/contrailcirrus/pycontrails
 Keywords: contrails,climate,aviation,geospatial
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -36,7 +35,6 @@ 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: dep_license; extra == "dev"
 Requires-Dist: fastparquet>=0.8; extra == "dev"
 Requires-Dist: ipdb>=0.13; extra == "dev"
 Requires-Dist: memory_profiler; extra == "dev"

{pycontrails-0.54.9.dist-info → pycontrails-0.54.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pycontrails/__init__.py,sha256=mKNmGUS5wW1n1PukeaOkmLwQVN24i1__mk0odjBzwEE,2107
-pycontrails/_version.py,sha256=577cE47qIYB88v4CDza3alm_spIkYihWh6u-GZrOEyY,534
+pycontrails/_version.py,sha256=3ZYGWQZfQ5wgpP3lg8ortMs3pMchQHAI8UBrkGV34P8,536
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/__init__.py,sha256=kOAehIZBbvksSW3MuU2DfzsyeE4PaFnOTpYMeq2ZDPE,886
 pycontrails/core/aircraft_performance.py,sha256=dasanaqfm5eP9XUDhgoKGj-eQHTWwMZ_mN6_ZdFulT0,28911
@@ -7,31 +7,31 @@ pycontrails/core/airports.py,sha256=ELTH5P7SXs-LGxGfDPFCZnH7bs8GQ9SNbdLpLt7t6zk,
 pycontrails/core/cache.py,sha256=aWNlj8cXAcXW9oHuaGZgqxOO7YK0AtYrj5tO1pp-Wmw,29043
 pycontrails/core/coordinates.py,sha256=J5qjGuXgbLUw_U9_qREdgOaHl0ngK6Hbbjj3uw7FwNE,5565
 pycontrails/core/fleet.py,sha256=ddujPC79K975gWVk8NDskE79OZaUam8tPR9rONaT918,17192
-pycontrails/core/flight.py,sha256=jWGmeDDCZx6zjl5Xy-uLcKGeoIrLwcJ-nmYCSklbVLM,82824
-pycontrails/core/flightplan.py,sha256=WOd5lm1D5uqxYJmANiMGgx3j4Tc6mVbBfmAw6iG1NXM,7747
+pycontrails/core/flight.py,sha256=AIkTPh58t-zAowcs_46YjPHV-y6_a649YODXxrkwucM,83566
+pycontrails/core/flightplan.py,sha256=9_o_kGQm-yG7MibCgfDCJK8mym2BYgENrizIKl1zzgM,7749
 pycontrails/core/fuel.py,sha256=06YUDhvC8Rx6KbUXRB9qLTsJX2V7tLbzjwAfDH0R6l8,4472
 pycontrails/core/interpolation.py,sha256=-GC3T6yh3nMtt7JCawoYeCUnDNRY9GHhxhkRhhnntxE,26437
-pycontrails/core/met.py,sha256=a6BHxO6Thlj85uFB5F7zrZkEupStU1FL9tc_m-Ipobg,106903
+pycontrails/core/met.py,sha256=NBboBTRKNt5WFSnKUdm2R_9N68EQTYii4P5A_hs79YQ,106898
 pycontrails/core/met_var.py,sha256=bFpBFpQnN6osVAuxNNhG6vG_NMThEIhDcL2B9VpXgww,12407
-pycontrails/core/models.py,sha256=S-smQKIyl0HWrpcOfDAigKa80OdLXmjoRCflq6JP_PY,45132
-pycontrails/core/polygon.py,sha256=NZ4YBhdALidXYOPsSX1cwGQ022j-AXgbWIQg7LA-f-I,18593
-pycontrails/core/rgi_cython.cp312-win_amd64.pyd,sha256=uDjEP6-DjEeOv2DrSAZVerOixMiO8spV_I-Te7Jn_uY,263680
-pycontrails/core/vector.py,sha256=sMhBfCmwmIcexIBe-aJc5sSbzbSOL1dzvbwwiiz7Rdw,75857
+pycontrails/core/models.py,sha256=MRDNYVr8WMTF5EJrwZ8zxPHKKMcU09apBcqycimCWwk,45236
+pycontrails/core/polygon.py,sha256=3_vYmlQoP3x3lmgwFyqQVgl9ziAQ5e160MCm2fwFou0,18619
+pycontrails/core/rgi_cython.cp312-win_amd64.pyd,sha256=OfJB__HdRggOtAvFPo2u87X-Ada_aQ61s7MNhvByQkI,243200
+pycontrails/core/vector.py,sha256=n9b_HxQSWOUbxvut7mNaK523JlISi3-TLd5YwrmeOwM,75883
 pycontrails/datalib/__init__.py,sha256=Q2RrnjwtFzfsmJ2tEojDCzDMkd8R0MYw4mQz3YwUsqI,381
-pycontrails/datalib/goes.py,sha256=v8fYi6LPp-40jm2TTGDkja77FZIj-th39KNI88p5OYE,32835
+pycontrails/datalib/goes.py,sha256=llpiUakz2Jo9B86rafS6yrBIDn53mqWdTojplZdp3AU,35249
 pycontrails/datalib/landsat.py,sha256=YrDpngF5HtvWFVwxN0FLFxCfZIEmeBMiifdkbH7fQTk,20263
 pycontrails/datalib/sentinel.py,sha256=ukzdSeHKC1UBWEYzehS2LqtKoCpKpaPobLfbZDGy6KU,17679
 pycontrails/datalib/_leo_utils/search.py,sha256=8JzT56ps3SH1W-5rwL8BWuxLLljwxa_5fjLAuZdL_Vg,8937
 pycontrails/datalib/_leo_utils/vis.py,sha256=0UDVcqMRqHmAORDV4Xyk-HVnTAjbOCf7KCpWm2ilTLE,1861
 pycontrails/datalib/_leo_utils/static/bq_roi_query.sql,sha256=r_gVjpoEvCcAJP56QlXaXzgfWPZdf-kYo3D316glJLU,266
-pycontrails/datalib/_met_utils/metsource.py,sha256=7QGqAt3FXmXnU7AfN-w6wkXzZKgpCS1WYfoTg5uhtZA,24865
+pycontrails/datalib/_met_utils/metsource.py,sha256=fCObXHCKo1--v22SRayZDzWlnz0lxTMdGVNhhUyywlM,24900
 pycontrails/datalib/ecmwf/__init__.py,sha256=9EkfWlGki8LYt7ySKf87gS8RzZjAOxK2w87_Sok3CCo,2094
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=PojAfT0N12SLcgiecZtHiN96sbRWwFx3PThrXIwSX5M,12782
 pycontrails/datalib/ecmwf/common.py,sha256=6fcZC_-3FvWJ3vtlZX89PiiS7-DSQhAOgxrLjwU4iW4,4138
 pycontrails/datalib/ecmwf/era5.py,sha256=TbZlOqn3fPmfvCUR1XrVBWxNgIBpSXgRx0S4M49TSeY,19506
 pycontrails/datalib/ecmwf/era5_model_level.py,sha256=NVquyG_3SzdmfoQl25Wvp4oB_pOe7K_AQOfNv7no14E,19844
-pycontrails/datalib/ecmwf/hres.py,sha256=k7VK1KUOopzTd0TrO5FYwFSSagArKq4q8oAyK3hNPso,29168
-pycontrails/datalib/ecmwf/hres_model_level.py,sha256=ghrN-z5bjV-ztv6L5KlGiCLlGR9ABbAe5k38CaARmLU,18121
+pycontrails/datalib/ecmwf/hres.py,sha256=JLLxv0O8UD8STT9gnlGPkjxAMdhAXzMV1O8bnmLEs9k,30482
+pycontrails/datalib/ecmwf/hres_model_level.py,sha256=EfKbCLyib2aMfeeTFuop4dutB7FiVFhX7UWW_hKtESE,18245
 pycontrails/datalib/ecmwf/ifs.py,sha256=a5QmXuihBNGx1eNN7EJGjR5dL9dO142nqkDSkPYGGlc,11048
 pycontrails/datalib/ecmwf/model_levels.py,sha256=noLSx45AHZ0rFPiUh3aK3iaEueHgsg6mG_AplHqHeU8,17431
 pycontrails/datalib/ecmwf/variables.py,sha256=49uzpkk9YV5OGBnq-Po5e3ig2JXi2i1ZtsOOEC-AQFI,10181
@@ -47,8 +47,8 @@ pycontrails/ext/cirium.py,sha256=zRPVBBWwocZKkX3XhonSBf54x7P_xnjRcA7psI0Kqnw,429
 pycontrails/ext/empirical_grid.py,sha256=mveQltokaGeQcxxbdMSLQ6wQ14oh3XX5dfzjWaFpxbk,4503
 pycontrails/ext/synthetic_flight.py,sha256=dEWm9vrg6SAWieh6GLAE0m1orTrApav8HHP42-4bIHg,17233
 pycontrails/models/__init__.py,sha256=TKhrXe1Pu1-mV1gctx8cUAMrVxCCAtBkbZi9olfWq8s,34
-pycontrails/models/accf.py,sha256=llpEtvEqrA0N2iefEpj8wbObHPhWkuoMpfln0wu7fBc,14026
-pycontrails/models/dry_advection.py,sha256=vDPjNrECefMvRVnfkhWCWbYQPpB2YYhGUvLiIuW10TM,19727
+pycontrails/models/accf.py,sha256=rbEn6oTqXsgDPA3Ky0y-bADHWTxGXixa8OwpHH_pXag,13991
+pycontrails/models/dry_advection.py,sha256=4oOCMhUkmHJiQDdkLJGoODw0ebE4avoMpMDoF-6L59M,21085
 pycontrails/models/issr.py,sha256=J6mh4pze31XpD2_zD9ujzYPXsZFrmSwNcRORCcLoOVI,7588
 pycontrails/models/pcc.py,sha256=7k8kICqDeZ99O2n2Zpnu7EFNGjEpPka_9cu9nrmP44s,11394
 pycontrails/models/pcr.py,sha256=G_0yR5PsCMeJBP6tZFi3M7A6Wcq8s71UvosdA7ozUkI,5502
@@ -64,14 +64,14 @@ pycontrails/models/cocip/cocip.py,sha256=zMJ-sDMO4mTAt6Qgc5uDvc-zJxZxO-Y_pbYvYD7
 pycontrails/models/cocip/cocip_params.py,sha256=pk0fimh_Wz8g8Q75BIrsOlmeH85rbpHKttjp6rkcFGY,12833
 pycontrails/models/cocip/cocip_uncertainty.py,sha256=fKQVAg-HyviegwNauxLgX9wdA0cRpK8XAOCNjZZIRWI,12528
 pycontrails/models/cocip/contrail_properties.py,sha256=JUngbMCw3SUCYkNdOWsp66J4v1kK4KtrWh9QajXwH-s,57583
-pycontrails/models/cocip/output_formats.py,sha256=TVQOzTcGAZUW_r8ZWTuOVUTPkY8Yb5e3P-CMu-FPopY,86218
+pycontrails/models/cocip/output_formats.py,sha256=pffbcl9-7HpcJRWDCABHg7yGxjjX_-90uVyt3rIpLHc,86250
 pycontrails/models/cocip/radiative_forcing.py,sha256=qs5pEAPec0DAhqqCKJXJbRRH5hMIz4xwUQqZjCoJIyg,45910
 pycontrails/models/cocip/radiative_heating.py,sha256=PcOEkqRtQJNq7bxOoz1baBbVV2ku1UQRMrrQXXsRBwc,19504
 pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=0TE1gK2p0b7RQjBGRGgfg7BmzmdxbJLPJ-9sdlak1gQ,19444
 pycontrails/models/cocip/wake_vortex.py,sha256=i6P1UDxde_WPP8SAliPdiaVCdeFMRxCFR7_zKaoNlno,14911
 pycontrails/models/cocip/wind_shear.py,sha256=qhmP3RJ9SEjd-qnXcgRiYis9-apKGF-1d78z6N__tq8,3988
 pycontrails/models/cocipgrid/__init__.py,sha256=OYSdZ1Htbr_IP7N_HuOAj1Pa_KLHtdEeJfXP-cN-gnU,271
-pycontrails/models/cocipgrid/cocip_grid.py,sha256=-wJi_iABZwo8KPwz3N2EQ5GusIYKlc12cQb_vYh9LsA,93911
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=2EzfbYhHrGfb6jfVuxNDW06PSvyJ2FGJqyRK_1gyH_g,93925
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=ZpN00VEmeRYaeZhvSfVjnEjrgn6XdClf1eqJC8Ytcuw,6013
 pycontrails/models/emissions/__init__.py,sha256=phai3wH5VuUyfyVpu5vHOFI0jXSyoYSWvLTknS78xs0,499
 pycontrails/models/emissions/black_carbon.py,sha256=o8mVfDZLnNlfnvsqk8O-ljXrMn4Y_ApFuPROAQWHaQY,21294
@@ -96,7 +96,7 @@ pycontrails/physics/constants.py,sha256=_MVuhk6GxxZhj5RL_ci6IAgSe4oJyxLZwBvpMuGc
 pycontrails/physics/geo.py,sha256=WyZKLj-63yGCfjePEhiwxLp26be44VCdEiisu9tXtzE,37461
 pycontrails/physics/jet.py,sha256=nUJY-TVowCPYlhrTkEncDocoVKCeN2IAhvP-6vWP2dQ,31326
 pycontrails/physics/thermo.py,sha256=HAcg2wmNXW-vJbOF2kOXBoUyJiAosPY0nRWeM37otdY,13238
-pycontrails/physics/units.py,sha256=P6j9v2-29TDoy2JE_FQlcXH-2mlihVulSP1wBLqZY44,12765
+pycontrails/physics/units.py,sha256=r6ncLqhFi9Roi73SfGvfjuB_jpwtsjJ39L3yxr8ndIc,12753
 pycontrails/physics/static/iata-cargo-load-factors-20250221.csv,sha256=ePGCUak5noyY63aL1a8T7EJf8sWzIpeY95-sbaYKF5w,3915
 pycontrails/physics/static/iata-passenger-load-factors-20250221.csv,sha256=sK9caPg9MvRYBHm_HVvXGA90x4j4OVIxkxFHF1HOKnA,3909
 pycontrails/utils/__init__.py,sha256=VmklFC-5I5lGFQEzuomlPk_bM6CoM9XDljfjCovG3vw,33
@@ -105,9 +105,9 @@ pycontrails/utils/iteration.py,sha256=En2YY4NiNwCNtAVO8HL6tv9byBGKs8MKSI7R8P-gZy
 pycontrails/utils/json.py,sha256=Pqashwoupuf_GfrrSfHclwug9Hg-kYQ4WNxEqay_0Rc,6083
 pycontrails/utils/temp.py,sha256=5XXqQoEfWjz1OrhoOBZD5vkkCFeuq9LpZkyhc38gIeY,1159
 pycontrails/utils/types.py,sha256=hPqUwaeRLgga69nj7LVbPojPg1k7pUSvYzFlGAiPKIM,5154
-pycontrails-0.54.9.dist-info/licenses/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
-pycontrails-0.54.9.dist-info/licenses/NOTICE,sha256=VIhzKNYi4lQx6fpZyqiY6eMHpLuwp-_G0JQkmYYa7h0,2005
-pycontrails-0.54.9.dist-info/METADATA,sha256=Bm45DhhjF9mTc3c2r-aeMqGv0f5BToLFFyTHz7hoVaY,9311
-pycontrails-0.54.9.dist-info/WHEEL,sha256=VryZucl_XSB78oskhQFN0jfmderyetLlP0R6bZqf7Ys,101
-pycontrails-0.54.9.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.54.9.dist-info/RECORD,,
+pycontrails-0.54.11.dist-info/licenses/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
+pycontrails-0.54.11.dist-info/licenses/NOTICE,sha256=VIhzKNYi4lQx6fpZyqiY6eMHpLuwp-_G0JQkmYYa7h0,2005
+pycontrails-0.54.11.dist-info/METADATA,sha256=ATxrKUPw9Q-7nbMQ7r3CFgRfgM3wuEn7OUSUWEUO2CM,9215
+pycontrails-0.54.11.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+pycontrails-0.54.11.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.54.11.dist-info/RECORD,,

{pycontrails-0.54.9.dist-info → pycontrails-0.54.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-win_amd64