pycontrails 0.54.10__cp310-cp310-macosx_10_9_x86_64.whl → 0.54.11__cp310-cp310-macosx_10_9_x86_64.whl

pycontrails/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.54.10'
-__version_tuple__ = version_tuple = (0, 54, 10)
+__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

@@ -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

@@ -453,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.
@@ -488,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):
@@ -285,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)
 
 

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.10.dist-info → pycontrails-0.54.11.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.54.10
+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.10.dist-info → pycontrails-0.54.11.dist-info}/RECORD

@@ -1,39 +1,39 @@
-pycontrails-0.54.10.dist-info/RECORD,,
-pycontrails-0.54.10.dist-info/WHEEL,sha256=qH_kg4MnX1wluqo84iraegKghClSlFh1bPB7xG-XGTg,137
-pycontrails-0.54.10.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
-pycontrails-0.54.10.dist-info/METADATA,sha256=6_jv8g-Jc_JE5J9qHUY3iv9S2ZrggE_4zOg-7nbtJ98,9132
-pycontrails-0.54.10.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.54.10.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
-pycontrails/_version.py,sha256=XWNQstht0_G88RBCuMbHwa-c0eQNLQAijV1bVbgzzW8,515
+pycontrails-0.54.11.dist-info/RECORD,,
+pycontrails-0.54.11.dist-info/WHEEL,sha256=aNQV8Up4rZuRmZ4dQF1gRf2_E64p7eyxNGuFzXK-F6k,137
+pycontrails-0.54.11.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
+pycontrails-0.54.11.dist-info/METADATA,sha256=ji2DnLEhspmnd-F0I7pEKUpBkTmmz4hd8-03MkLXvu4,9037
+pycontrails-0.54.11.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.54.11.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
+pycontrails/_version.py,sha256=29bQvK7ihNGFDKGpvLyBBYr5UGAm2ZLeme6yi4GyFoM,515
 pycontrails/__init__.py,sha256=9ypSB2fKZlKghTvSrjWo6OHm5qfASwiTIvlMew3Olu4,2037
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=N-3VhPaUEyFSJWjplMKFcv9GLvEqAibKn1zqJWuNZQU,73601
-pycontrails/core/models.py,sha256=gpG0hnXZox5caojierunxKkgFLQt-6nHRhzQZJKNrzo,43845
+pycontrails/core/vector.py,sha256=X_g8lzY6plJ6oeUHigSjt9qcPv34a3m1DeK1pqocrDw,73627
+pycontrails/core/models.py,sha256=3mDTqp1V5aae9akuYwbMGIUEkESKSYTjZeyu2IiMW7s,43915
 pycontrails/core/interpolation.py,sha256=wovjj3TAf3xonVxjarclpvZLyLq6N7wZQQXsI9hT3YA,25713
 pycontrails/core/fleet.py,sha256=0hi_N4R93St-7iD29SE0EnadpBEl_p9lSGtDwpWvGkk,16704
-pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=Qcxg0yYffDUtbzYgM-6zc3CVnj_5p9w_ELlI6xgzzh4,292688
-pycontrails/core/flight.py,sha256=QZTGeZVnZ14UUWHSqgCSU49g_EGQZel-hzKwm_9dcFY,80653
+pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=md3YEaY22uTKTvvv0_2_dJUhH88T15c__IcwXe5Wriw,293496
+pycontrails/core/flight.py,sha256=kQ78YdvjPZI6v2Bj_2Fr1MgNmrrtIN6j21l4fwcRW4E,81380
 pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
-pycontrails/core/polygon.py,sha256=EmfHPj0e58whsHvR-3YvDgMWkvMFgp_BgwaoG8IZ4n0,18044
+pycontrails/core/polygon.py,sha256=g7YqWzUbOHWT65XrLqLUZLrQXYcx_x1NcJ041-Cj7UY,18070
 pycontrails/core/cache.py,sha256=IIyx726zN7JzNSKV0JJDksMI9OhCLdnJShmBVStRqzI,28154
 pycontrails/core/__init__.py,sha256=p0O09HxdeXU0X5Z3zrHMlTfXa92YumT3fJ8wJBI5ido,856
-pycontrails/core/flightplan.py,sha256=xgyYLi36OlNKtIFuOHaifcDM6XMBYTyMQlXAtfd-6Js,7519
-pycontrails/core/met.py,sha256=4XQAJrKWBN0SZQSeBpMUnkLn87vYpn2VMiY3dQyFRIw,103992
+pycontrails/core/flightplan.py,sha256=0mvA3IO19Sap-7gwpmEIV35_mg6ChvajwhurvjZZt_U,7521
+pycontrails/core/met.py,sha256=O9W6RaEwUsg7ZERR47Q-6fYjg13BzOZtcQdw92444xg,103987
 pycontrails/core/aircraft_performance.py,sha256=Kk_Rb61jDOWPmCQHwn2jR5vMPmB8b3aq1iTWfiUMj9U,28232
 pycontrails/core/airports.py,sha256=ubYo-WvxKPd_dUcADx6yew9Tqh1a4VJDgX7aFqLYwB8,6775
 pycontrails/core/met_var.py,sha256=lAbp3cko_rzMk_u0kq-F27sUXUxUKikUvCNycwp9ILY,12020
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
-pycontrails/datalib/goes.py,sha256=4bKtu1l3IVsjKv7mLAWhStRzOVaY9Wi_cZxvL_g-V3w,34081
+pycontrails/datalib/goes.py,sha256=2FqpepeNb1w-nwhlDAOQZdWT7hJmpMwiJFrEkJ_9CAM,34286
 pycontrails/datalib/landsat.py,sha256=r6366rEF7fOA7mT5KySCPGJplgGE5LvBw5fMqk-U1oM,19697
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=hYSxIlQnyJHqtHWlKn73HOK_1pm-_IbGebmkHnh4UcA,17172
-pycontrails/datalib/_met_utils/metsource.py,sha256=omgrBrAap11G5hV8a9qS3umJVuwoX_Mca6QctRa6xn8,24116
+pycontrails/datalib/_met_utils/metsource.py,sha256=B4Gd9gkfMMlXe-xc_xcNNZAJ0gOeRelvrBsFyk6tEs4,24151
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=7HXQU5S02PzX9Ew2ZrDKSp0tDEG1eeVAvbP3decmm20,12437
 pycontrails/datalib/ecmwf/era5.py,sha256=4ULNdDlUN0kP6Tbp8D_-Bc12nAsLf0iNfZaDoj_AoZU,18952
 pycontrails/datalib/ecmwf/era5_model_level.py,sha256=AO7ePIGZtavx5nQSPYP4p07RNZeg3bbzmoZC7RUC4Gg,19354
-pycontrails/datalib/ecmwf/hres.py,sha256=9QHYxMLK7zyQEOFpbVrZfIht9WqVXnhhyOd7YKEgAe0,28381
+pycontrails/datalib/ecmwf/hres.py,sha256=6DZc8gKhnKMXHYHxppRpJ3So5ZpjfncAqX1u_Rhj3d4,29679
 pycontrails/datalib/ecmwf/variables.py,sha256=lU3BNe265XVhCXvdMwZqfkWQwtsetZxVRLSfPqHFKAE,9913
-pycontrails/datalib/ecmwf/hres_model_level.py,sha256=EjBDYbbPZotTsveFlEiAAWJhhPYiao1DQrLyS4kVCrA,17657
+pycontrails/datalib/ecmwf/hres_model_level.py,sha256=CcxMKiFJyLvM9njmBVywAXJxyWE7atsgHXBubKJQqHM,17779
 pycontrails/datalib/ecmwf/__init__.py,sha256=wdfhplEaW2UKTItIoshTtVEjbPyfDYoprTJNxbKZuvA,2021
 pycontrails/datalib/ecmwf/common.py,sha256=qRMSzDQikGMi3uqvz-Y57e3biHPzSoVMfUwOu9iTxHc,4024
 pycontrails/datalib/ecmwf/model_levels.py,sha256=_kgpnogaS6MlfvTX9dB5ASTHFUlZuQ_DRb-VADwEa0k,16996
@@ -63,8 +63,8 @@ pycontrails/models/tau_cirrus.py,sha256=2Z4egt-QFprkyITRgtarA5alOTTQRQbjzgmSqE49
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
 pycontrails/models/issr.py,sha256=AYLYLHxtG8je5UG6x1zLV0ul89MJPqe5Xk0oWIyZ7b0,7378
 pycontrails/models/sac.py,sha256=lV1Or0AaLxuS1Zo5V8h5c1fkSKC-hKEgiFm7bmmusWw,15946
-pycontrails/models/accf.py,sha256=egdBa4_G3BUaoUQYWvVlTlAIWpLEuNdtCxlK3eckLOc,13599
-pycontrails/models/dry_advection.py,sha256=BlOQeap3rXKRhRlvhFfpOLIX3bFgYE_bJg2LlPRHIas,19424
+pycontrails/models/accf.py,sha256=_tunWpw1sYW8ES8RvpdhNahXwaf4LwdHMEdXhv7-cCI,13566
+pycontrails/models/dry_advection.py,sha256=8vkHesYx3rM858LrIpXCZ9xQ6GmL3tZeOhj5MJh42Q0,20483
 pycontrails/models/pcr.py,sha256=ZzbEuTOuDdUmmL5T3Wk3HL-O8XzX3HMnn98WcPbASaU,5348
 pycontrails/models/emissions/__init__.py,sha256=CZB2zIkLUI3NGNmq2ddvRYjEtiboY6PWJjiEiXj_zII,478
 pycontrails/models/emissions/ffm2.py,sha256=mAvBHnp-p3hIn2fjKGq50eaMHi0jcb5hA5uXbJGeE9I,12068
@@ -85,7 +85,7 @@ pycontrails/models/humidity_scaling/quantiles/era5-model-level-quantiles.pq,sha2
 pycontrails/models/cocip/radiative_forcing.py,sha256=A-k3V7Cb9tXvCpne3CsQpWIKDR9ZD4k8Jf3z6FfSkA0,44650
 pycontrails/models/cocip/wind_shear.py,sha256=m6ZlWjORfI-lI-D74Z_dIMOHnK4FDYmkb0S6vSpKTO8,3868
 pycontrails/models/cocip/cocip.py,sha256=uSorvK_AgAceTaeN8AqSiT4jqZO1lsqmewuLW2U02K4,104095
-pycontrails/models/cocip/output_formats.py,sha256=cvuliaxhUBRZKBGkGkVOeV4-CN7IVAeZ2tIwXqHmUKw,83948
+pycontrails/models/cocip/output_formats.py,sha256=dBT5-1yJsX_T_EoVhuja8ow4u-WlJRJ-7DihCgkyl7U,83980
 pycontrails/models/cocip/__init__.py,sha256=CWrkNd6S3ZJq04pjTc2W22sVAJeJD3bJJRy_zLW8Kkc,962
 pycontrails/models/cocip/cocip_params.py,sha256=34_F7mXyJpSfek7iRhLVj6JaZeSoFmfcxx2WmmZN42Q,12534
 pycontrails/models/cocip/wake_vortex.py,sha256=YmOuv_oWJ9-fmTx9PVHr6gsXwex0qzLhvoZIJNB9rsk,14515
@@ -102,9 +102,9 @@ pycontrails/models/ps_model/static/ps-aircraft-params-20250328.csv,sha256=LUYuWo
 pycontrails/models/ps_model/static/ps-synonym-list-20250328.csv,sha256=phtrf0m-UYQ7gjoKtIIwINzftTSNd-Bwe9CPen_Gvc8,1048
 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=di6LDHCPqOzuTAK0xB_Re8NLLd8HK-c1sFSIW9MSKFk,91387
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=OTltSP9wWNEZbi0Pcr19sDeBlbRWssmJy085X5TZ-lo,91401
 pycontrails/physics/geo.py,sha256=5THIXgpaHBQdSYWLgtK4mV_8e1hWW9XeTsSHOShFMeA,36323
-pycontrails/physics/units.py,sha256=BC0e0l_pDeijqN179tXl8eX_Qpw8d17MVujBu1SV3IE,12293
+pycontrails/physics/units.py,sha256=p-6PzFLpVCMpvmfrhXVh3Hs-nMJw9Y1x-hvgnL9Lo9c,12281
 pycontrails/physics/constants.py,sha256=xWy7OkDOJNM6umq5dYiuzwG0aTEl5aECLxEpg3Z2SBQ,3202
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44
 pycontrails/physics/thermo.py,sha256=sWGpKa12daSpqZYNgyXd8Ii5nfA_1Mm5mMbnM5GsW-E,12787

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

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_10_9_x86_64
 Generator: delocate 0.13.0