pycontrails 0.54.6__cp310-cp310-macosx_11_0_arm64.whl → 0.54.7__cp310-cp310-macosx_11_0_arm64.whl

pycontrails/models/cocip/cocip_params.py

@@ -103,6 +103,8 @@ class CocipParams(AdvectionBuffers):
     #:   Cocip output with ``preprocess_lowmem=True`` is only guaranteed to match output
     #:   with ``preprocess_lowmem=False`` when run with ``interpolation_bounds_error=True``
     #:   to ensure no out-of-bounds interpolation occurs.
+    #:
+    #: .. versionadded:: 0.52.3
     preprocess_lowmem: bool = False
 
     # --------------
@@ -114,6 +116,8 @@ class CocipParams(AdvectionBuffers):
     #: ``"auto"``, ``"tau_cirrus"`` will be computed during model initialization
     #: iff the met data is dask-backed. Otherwise, it will be computed during model
     #: evaluation after the met data is downselected.
+    #:
+    #: .. versionadded:: 0.47.1
     compute_tau_cirrus_in_model_init: bool | str = "auto"
 
     # ---------
@@ -152,10 +156,14 @@ class CocipParams(AdvectionBuffers):
     #: These are not standard CoCiP outputs but based on the derivation used
     #: in the first supplement to :cite:`yinPredictingClimateImpact2023`. ATR20 is defined
     #: as the average temperature response over a 20 year horizon.
+    #:
+    #: .. versionadded:: 0.50.0
     compute_atr20: bool = False
 
     #: Constant factor used to convert global- and year-mean RF, [:math:`W m^{-2}`],
     #: to ATR20, [:math:`K`], given by :cite:`yinPredictingClimateImpact2023`.
+    #:
+    #: .. versionadded:: 0.50.0
     global_rf_to_atr20_factor: float = 0.0151
 
     # ----------------
@@ -197,12 +205,13 @@ class CocipParams(AdvectionBuffers):
     max_depth: float = 1500.0
 
     #: Experimental. Improved ice crystal number survival fraction in the wake vortex phase.
-    #: Implement :cite:`unterstrasserPropertiesYoungContrails2016`, who developed a
+    #: Implement :cite:`lottermoserHighResolutionEarlyContrails2025`, who developed a
     #: parametric model that estimates the survival fraction of the contrail ice crystal
     #: number after the wake vortex phase based on the results from large eddy simulations.
     #: This replicates Fig. 4 of :cite:`karcherFormationRadiativeForcing2018`.
     #:
     #:  .. versionadded:: 0.50.1
+    #:  .. versionchanged:: 0.54.7
     unterstrasser_ice_survival_fraction: bool = False
 
     #: Experimental. Radiative heating effects on contrail cirrus properties.

pycontrails/models/cocip/unterstrasser_wake_vortex.py

@@ -1,11 +1,16 @@
-"""Wave-vortex downwash functions from Unterstrasser (2016).
+"""Wave-vortex downwash functions from Lottermoser & Unterstrasser (2025).
 
 Notes
 -----
 :cite:`unterstrasserPropertiesYoungContrails2016` provides a parameterized model of the
 survival fraction of the contrail ice crystal number ``f_surv`` during the  wake-vortex phase.
-The model was developed based on output from large eddy simulations, and improves agreement with
-LES outputs relative to the default survival fraction parameterization used in CoCiP.
+The model has since been updated in :cite:`lottermoserHighResolutionEarlyContrails2025`. This update
+improves the goodness-of-fit between the parameterised model and LES, and expands the parameter
+space and can now be used for very low and very high soot inputs, different fuel types (where the
+EI H2Os are different), and higher ambient temperatures (up to 235 K) to accomodate for contrails
+formed by liquid hydrogen aircraft. The model was developed based on output from large eddy
+simulations, and improves agreement with LES outputs relative to the default survival fraction
+parameterization used in CoCiP.
 
 For comparison, CoCiP assumes that ``f_surv`` is equal to the change in the contrail ice water
 content (by mass) before and after the wake vortex phase. However, for larger (smaller) ice
@@ -14,6 +19,9 @@ by mass. This is particularly important in the "soot-poor" scenario, for example
 lean-burn engines where their soot emissions can be 3-4 orders of magnitude lower than conventional
 RQL engines.
 
+ADD CITATION TO BIBTEX: :cite:`lottermoserHighResolutionEarlyContrails2025`
+Lottermoser, A. and Unterstraßer, S.: High-resolution modelling of early contrail evolution from
+hydrogen-powered aircraft, EGUsphere [preprint], https://doi.org/10.5194/egusphere-2024-3859, 2025.
 """
 
 from __future__ import annotations
@@ -34,6 +42,8 @@ def ice_particle_number_survival_fraction(
     fuel_flow: npt.NDArray[np.floating],
     aei_n: npt.NDArray[np.floating],
     z_desc: npt.NDArray[np.floating],
+    *,
+    analytical_solution: bool = True,
 ) -> npt.NDArray[np.floating]:
     r"""
     Calculate fraction of ice particle number surviving the wake vortex phase and required inputs.
@@ -61,6 +71,8 @@ def ice_particle_number_survival_fraction(
     z_desc : npt.NDArray[np.floating]
         Final vertical displacement of the wake vortex, ``dz_max`` in :mod:`wake_vortex.py`,
         [:math:`m`].
+    analytical_solution : bool
+        Use analytical solution to calculate ``z_atm`` and ``z_emit`` instead of numerical solution.
 
     Returns
     -------
@@ -70,57 +82,114 @@ def ice_particle_number_survival_fraction(
     References
     ----------
     - :cite:`unterstrasserPropertiesYoungContrails2016`
+    - :cite:`lottermoserHighResolutionEarlyContrails2025`
 
     Notes
     -----
-    - See eq. (3), (9), and (10) in :cite:`unterstrasserPropertiesYoungContrails2016`.
     - For consistency in CoCiP, ``z_desc`` should be calculated using :func:`dz_max` instead of
       using :func:`z_desc_length_scale`.
     """
-    # Length scales
-    z_atm = z_atm_length_scale(air_temperature, rhi_0)
     rho_emit = emitted_water_vapour_concentration(ei_h2o, wingspan, true_airspeed, fuel_flow)
-    z_emit = z_emit_length_scale(rho_emit, air_temperature)
-    z_total = z_total_length_scale(aei_n, z_atm, z_emit, z_desc)
+
+    # Length scales
+    if analytical_solution:
+        z_atm = z_atm_length_scale_analytical(air_temperature, rhi_0)
+        z_emit = z_emit_length_scale_analytical(rho_emit, air_temperature)
+
+    else:
+        z_atm = z_atm_length_scale_numerical(air_temperature, rhi_0)
+        z_emit = z_emit_length_scale_numerical(rho_emit, air_temperature)
+
+    z_total = z_total_length_scale(z_atm, z_emit, z_desc, true_airspeed, fuel_flow, aei_n, wingspan)
     return _survival_fraction_from_length_scale(z_total)
 
 
 def z_total_length_scale(
-    aei_n: npt.NDArray[np.floating],
     z_atm: npt.NDArray[np.floating],
     z_emit: npt.NDArray[np.floating],
     z_desc: npt.NDArray[np.floating],
+    true_airspeed: npt.NDArray[np.floating],
+    fuel_flow: npt.NDArray[np.floating],
+    aei_n: npt.NDArray[np.floating],
+    wingspan: npt.NDArray[np.floating] | float,
 ) -> npt.NDArray[np.floating]:
     """
     Calculate the total length-scale effect of the wake vortex downwash.
 
     Parameters
     ----------
-    aei_n : npt.NDArray[np.floating]
-        Apparent ice crystal number emissions index at contrail formation, [:math:`kg^{-1}`]
     z_atm : npt.NDArray[np.floating]
         Length-scale effect of ambient supersaturation on the ice crystal mass budget, [:math:`m`]
     z_emit : npt.NDArray[np.floating]
         Length-scale effect of water vapour emissions on the ice crystal mass budget, [:math:`m`]
     z_desc : npt.NDArray[np.floating]
         Final vertical displacement of the wake vortex, `dz_max` in `wake_vortex.py`, [:math:`m`]
+    true_airspeed : npt.NDArray[np.floating]
+        true airspeed for each waypoint, [:math:`m s^{-1}`]
+    fuel_flow : npt.NDArray[np.floating]
+        Fuel mass flow rate, [:math:`kg s^{-1}`]
+    aei_n : npt.NDArray[np.floating]
+        Apparent ice crystal number emissions index at contrail formation, [:math:`kg^{-1}`]
+    wingspan : npt.NDArray[np.floating] | float
+        aircraft wingspan, [:math:`m`]
 
     Returns
     -------
     npt.NDArray[np.floating]
         Total length-scale effect of the wake vortex downwash, [:math:`m`]
+
+    Notes
+    -----
+    - For `psi`, see Appendix A1 in :cite:`lottermoserHighResolutionEarlyContrails2025`.
+    - For `z_total`, see Eq. (9) and (10) in :cite:`lottermoserHighResolutionEarlyContrails2025`.
+    """
+    # Calculate psi term
+    fuel_dist = fuel_flow / true_airspeed  # Units: [:math:`kg m^{-1}`]
+    n_ice_dist = fuel_dist * aei_n  # Units: [:math:`m^{-1}`]
+
+    n_ice_per_vol = n_ice_dist / plume_area(wingspan)  # Units: [:math:`m^{-3}`]
+    n_ice_per_vol_ref = 3.38e12 / plume_area(60.3)
+
+    psi = (n_ice_per_vol_ref / n_ice_per_vol) ** 0.16
+
+    # Calculate total length-scale effect
+    return psi * (1.27 * z_atm + 0.42 * z_emit) - 0.49 * z_desc
+
+
+def z_atm_length_scale_analytical(
+    air_temperature: npt.NDArray[np.floating],
+    rhi_0: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
+    """Calculate the length-scale effect of ambient supersaturation on the ice crystal mass budget.
+
+    Parameters
+    ----------
+    air_temperature : npt.NDArray[np.floating]
+        Ambient temperature for each waypoint, [:math:`K`].
+    rhi_0 : npt.NDArray[np.floating]
+        Relative humidity with respect to ice at the flight waypoint.
+
+    Returns
+    -------
+    npt.NDArray[np.floating]
+        The effect of the ambient supersaturation on the ice crystal mass budget,
+        provided as a length scale equivalent, estimated with analytical fit [:math:`m`].
+
+    Notes
+    -----
+    - See Eq. (A2) in :cite:`lottermoserHighResolutionEarlyContrails2025`.
     """
-    alpha_base = (aei_n / 2.8e14) ** (-0.18)
-    alpha_atm = 1.7 * alpha_base
-    alpha_emit = 1.15 * alpha_base
+    z_atm = np.zeros_like(rhi_0)
 
-    z_total = alpha_atm * z_atm + alpha_emit * z_emit - 0.6 * z_desc
+    # Only perform operation when the ambient condition is supersaturated w.r.t. ice
+    issr = rhi_0 > 1.0
 
-    z_total.clip(min=0.0, out=z_total)
-    return z_total
+    s_i = rhi_0 - 1.0
+    z_atm[issr] = 607.46 * s_i[issr] ** 0.897 * (air_temperature[issr] / 205.0) ** 2.225
+    return z_atm
 
 
-def z_atm_length_scale(
+def z_atm_length_scale_numerical(
     air_temperature: npt.NDArray[np.floating],
     rhi_0: npt.NDArray[np.floating],
     *,
@@ -141,11 +210,11 @@ def z_atm_length_scale(
     -------
     npt.NDArray[np.floating]
         The effect of the ambient supersaturation on the ice crystal mass budget,
-        provided as a length scale equivalent, [:math:`m`].
+        provided as a length scale equivalent, estimated with numerical methods [:math:`m`].
 
     Notes
     -----
-    - See eq. (5) in :cite:`unterstrasserPropertiesYoungContrails2016`.
+    - See Eq. (6) in :cite:`lottermoserHighResolutionEarlyContrails2025`.
     """
     # Only perform operation when the ambient condition is supersaturated w.r.t. ice
     issr = rhi_0 > 1.0
@@ -157,14 +226,14 @@ def z_atm_length_scale(
     # Did not use scipy functions because it is unstable when dealing with np.arrays
     z_1 = np.zeros_like(rhi_issr)
     z_2 = np.full_like(rhi_issr, 1000.0)
-    lhs = rhi_issr * thermo.e_sat_ice(air_temperature_issr) / air_temperature_issr
+    lhs = rhi_issr * thermo.e_sat_ice(air_temperature_issr) / (air_temperature_issr**3.5)
 
     dry_adiabatic_lapse_rate = constants.g / constants.c_pd
     for _ in range(n_iter):
         z_est = 0.5 * (z_1 + z_2)
         rhs = (thermo.e_sat_ice(air_temperature_issr + dry_adiabatic_lapse_rate * z_est)) / (
             air_temperature_issr + dry_adiabatic_lapse_rate * z_est
-        )
+        ) ** 3.5
         z_1[lhs > rhs] = z_est[lhs > rhs]
         z_2[lhs < rhs] = z_est[lhs < rhs]
 
@@ -207,7 +276,38 @@ def emitted_water_vapour_concentration(
     return h2o_per_dist / area_p
 
 
-def z_emit_length_scale(
+def z_emit_length_scale_analytical(
+    rho_emit: npt.NDArray[np.floating],
+    air_temperature: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
+    """Calculate the length-scale effect of water vapour emissions on the ice crystal mass budget.
+
+    Parameters
+    ----------
+    rho_emit : npt.NDArray[np.floating] | float
+        Aircraft-emitted water vapour concentration in the plume, [:math:`kg m^{-3}`]
+    air_temperature : npt.NDArray[np.floating]
+        ambient temperature for each waypoint, [:math:`K`]
+
+    Returns
+    -------
+    npt.NDArray[np.floating]
+        The effect of the aircraft water vapour emission on the ice crystal mass budget,
+        provided as a length scale equivalent, estimated with analytical fit [:math:`m`]
+
+    Notes
+    -----
+    - See Eq. (A3) in :cite:`lottermoserHighResolutionEarlyContrails2025`.
+    """
+    t_205 = air_temperature - 205.0
+    return (
+        1106.6
+        * ((rho_emit * 1e5) ** (0.678 + 0.0116 * t_205))
+        * np.exp(-(0.0807 + 0.000428 * t_205) * t_205)
+    )
+
+
+def z_emit_length_scale_numerical(
     rho_emit: npt.NDArray[np.floating],
     air_temperature: npt.NDArray[np.floating],
     *,
@@ -228,24 +328,26 @@ def z_emit_length_scale(
     -------
     npt.NDArray[np.floating]
         The effect of the aircraft water vapour emission on the ice crystal mass budget,
-        provided as a length scale equivalent, [:math:`m`]
+        provided as a length scale equivalent, estimated with numerical methods [:math:`m`]
 
     Notes
     -----
-    - See eq. (7) in :cite:`unterstrasserPropertiesYoungContrails2016`.
+    - See Eq. (7) in :cite:`lottermoserHighResolutionEarlyContrails2025`.
     """
     # Solve non-linear equation numerically using the bisection method
     # Did not use scipy functions because it is unstable when dealing with np.arrays
     z_1 = np.zeros_like(rho_emit)
     z_2 = np.full_like(rho_emit, 1000.0)
 
-    lhs = (thermo.e_sat_ice(air_temperature) / (constants.R_v * air_temperature)) + rho_emit
+    lhs = (thermo.e_sat_ice(air_temperature) / (constants.R_v * air_temperature**3.5)) + (
+        rho_emit / (air_temperature**2.5)
+    )
 
     dry_adiabatic_lapse_rate = constants.g / constants.c_pd
     for _ in range(n_iter):
         z_est = 0.5 * (z_1 + z_2)
         rhs = thermo.e_sat_ice(air_temperature + dry_adiabatic_lapse_rate * z_est) / (
-            constants.R_v * (air_temperature + dry_adiabatic_lapse_rate * z_est)
+            constants.R_v * (air_temperature + dry_adiabatic_lapse_rate * z_est) ** 3.5
         )
         z_1[lhs > rhs] = z_est[lhs > rhs]
         z_2[lhs < rhs] = z_est[lhs < rhs]
@@ -268,10 +370,10 @@ def plume_area(wingspan: npt.NDArray[np.floating] | float) -> npt.NDArray[np.flo
 
     Notes
     -----
-    - See eq. (A6) and (A7) in :cite:`unterstrasserPropertiesYoungContrails2016`.
+    - See Appendix A2 in eq. (A6) and (A7) in :cite:`lottermoserHighResolutionEarlyContrails2025`.
     """
     r_plume = 1.5 + 0.314 * wingspan
-    return 2.0 * 2.0 * np.pi * r_plume**2
+    return 2.0 * np.pi * r_plume**2
 
 
 def z_desc_length_scale(
@@ -368,7 +470,7 @@ def _survival_fraction_from_length_scale(
     npt.NDArray[np.floating]
         Fraction of ice particle number surviving the wake vortex phase
     """
-    f_surv = 0.45 + (1.19 / np.pi) * np.arctan(-1.35 + (z_total / 100.0))
+    f_surv = 0.42 + (1.31 / np.pi) * np.arctan(-1.00 + (z_total / 100.0))
     np.clip(f_surv, 0.0, 1.0, out=f_surv)
     return f_surv
 

pycontrails/models/cocipgrid/cocip_grid.py

@@ -88,6 +88,9 @@ class CocipGrid(models.Model):
     met_variables = cocip.Cocip.met_variables
     rad_variables = cocip.Cocip.rad_variables
     processed_met_variables = cocip.Cocip.processed_met_variables
+    generic_rad_variables = cocip.Cocip.generic_rad_variables
+    ecmwf_rad_variables = cocip.Cocip.ecmwf_rad_variables
+    gfs_rad_variables = cocip.Cocip.gfs_rad_variables
 
     #: Met data is not optional
     met: MetDataset

pycontrails/models/emissions/black_carbon.py

@@ -98,7 +98,7 @@ def flame_temperature(t_3: ArrayScalarLike) -> ArrayScalarLike:
     ArrayScalarLike
         Flame temperature at the combustion chamber, [:math:`K`]
     """
-    return 0.9 * t_3 + 2120
+    return 0.9 * t_3 + 2120.0
 
 
 def bc_mass_concentration_fox(
@@ -125,7 +125,11 @@ def bc_mass_concentration_fox(
     npt.NDArray[np.floating]:
         Black carbon mass concentration for ground conditions, [:math:`mg m^{-3}`]
     """
-    return fuel_flow * (356 * np.exp(-6390 / t_fl) - 608 * afr * np.exp(-19778 / t_fl))
+    # avoid float32 -> float64 promotion
+    coeff = 356.0 * np.exp(np.float32(-6390.0) / t_fl) - 608.0 * afr * np.exp(
+        np.float32(-19778.0) / t_fl
+    )
+    return fuel_flow * coeff
 
 
 def bc_mass_concentration_cruise_fox(
@@ -209,7 +213,7 @@ def dopelheuer_lecht_scaling_factor(
     ----------
     - :cite:`dopelheuerInfluenceEnginePerformance1998`
     """
-    exp_term = np.exp(20000 / t_fl_cru) / np.exp(20000 / t_fl_ref)
+    exp_term = np.exp(20000.0 / t_fl_cru - 20000.0 / t_fl_ref)
     return (afr_ref / afr_cru) ** 2.5 * (p_3_cru / p_3_ref) ** 1.35 * exp_term
 
 
@@ -295,7 +299,7 @@ def turbine_inlet_temperature_imfox(afr: npt.NDArray[np.floating]) -> npt.NDArra
     ----------
     - :cite:`abrahamsonPredictiveModelDevelopment2016`
     """
-    return 490 + 42266 / afr
+    return 490.0 + 42266.0 / afr
 
 
 def bc_mass_concentration_imfox(
@@ -325,9 +329,10 @@ def bc_mass_concentration_imfox(
     npt.NDArray[np.floating]
         Black carbon mass concentration, [:math:`mg m^{-3}`]
     """
-    exp_term = np.exp(13.6 - fuel_hydrogen)
-    formation_term = 295 * np.exp(-6390 / t_4)
-    oxidation_term = 608 * afr * np.exp(-19778 / t_4)
+    # avoid float32 -> float64 promotion
+    exp_term = np.exp(np.float32(13.6) - fuel_hydrogen)
+    formation_term = 295.0 * np.exp(np.float32(-6390.0) / t_4)
+    oxidation_term = 608.0 * afr * np.exp(np.float32(-19778.0) / t_4)
     return fuel_flow_per_engine * exp_term * (formation_term - oxidation_term)
 
 
@@ -453,11 +458,11 @@ def number_emissions_index_fractal_aggregates(
     nvpm_ei_m: npt.NDArray[np.floating],
     gmd: npt.NDArray[np.floating],
     *,
-    gsd: float | npt.NDArray[np.floating] = 1.80,
-    rho_bc: float = 1770,
-    k_tem: float = 1.621e-5,
-    d_tem: float = 0.39,
-    d_fm: float = 2.76,
+    gsd: float | np.floating | npt.NDArray[np.floating] = np.float32(1.80),  # avoid promotion
+    rho_bc: float | np.floating = np.float32(1770.0),
+    k_tem: float | np.floating = np.float32(1.621e-5),
+    d_tem: float | np.floating = np.float32(0.39),
+    d_fm: float | np.floating = np.float32(2.76),
 ) -> npt.NDArray[np.floating]:
     """
     Estimate the black carbon number emission index using the fractal aggregates (FA) model.
@@ -494,9 +499,9 @@ def number_emissions_index_fractal_aggregates(
     - ``rho_bc``: :cite:`parkMeasurementInherentMaterial2004`
     - ``k_tem``, ``d_tem``: :cite:`dastanpourObservationsCorrelationPrimary2014`
     """
-    phi = 3 * d_tem + (1 - d_tem) * d_fm
+    phi = 3.0 * d_tem + (1.0 - d_tem) * d_fm
     exponential_term = np.exp(0.5 * phi**2 * np.log(gsd) ** 2)
-    denom = rho_bc * (np.pi / 6) * k_tem ** (3 - d_fm) * gmd**phi * exponential_term
+    denom = rho_bc * (np.pi / 6.0) * k_tem ** (3.0 - d_fm) * gmd**phi * exponential_term
     return nvpm_ei_m / denom
 
 

pycontrails/models/emissions/emissions.py

@@ -169,7 +169,7 @@ class Emissions(Model):
             )
 
         if "n_engine" not in self.source.attrs:
-            aircraft_type = self.source.attrs.get("aircraft_type")
+            aircraft_type = self.source.get_constant("aircraft_type", None)
             self.source.attrs["n_engine"] = self.default_engines.at[aircraft_type, "n_engine"]
 
         try:
@@ -192,7 +192,7 @@ class Emissions(Model):
             try:
                 edb_gaseous = self.edb_engine_gaseous[engine_uid]  # type: ignore[index]
             except KeyError:
-                self.source["thrust_setting"] = np.full(shape=len(self.source), fill_value=np.nan)
+                self.source["thrust_setting"] = np.full(len(self.source), np.nan, dtype=np.float32)
             else:
                 self.source["thrust_setting"] = get_thrust_setting(
                     edb_gaseous,
@@ -297,9 +297,9 @@ class Emissions(Model):
         """
         self.source.attrs["gaseous_data_source"] = "Constant"
 
-        nox_ei = np.full(shape=len(self.source), fill_value=15.14)
-        co_ei = np.full(shape=len(self.source), fill_value=3.61)
-        hc_ei = np.full(shape=len(self.source), fill_value=0.520)
+        nox_ei = np.full(shape=len(self.source), fill_value=15.14, dtype=np.float32)
+        co_ei = np.full(shape=len(self.source), fill_value=3.61, dtype=np.float32)
+        hc_ei = np.full(shape=len(self.source), fill_value=0.520, dtype=np.float32)
 
         self.source["nox_ei"] = nox_ei * 1e-3  # g-NOx/kg-fuel to kg-NOx/kg-fuel
         self.source["co_ei"] = co_ei * 1e-3  # g-CO/kg-fuel to kg-CO/kg-fuel
@@ -493,8 +493,8 @@ class Emissions(Model):
         - :cite:`schumannDehydrationEffectsContrails2015`
         """
         nvpm_data_source = "Constant"
-        nvpm_ei_m = np.full(shape=len(self.source), fill_value=(0.088 * 1e-3))  # g to kg
-        nvpm_ei_n = np.full(shape=len(self.source), fill_value=self.params["default_nvpm_ei_n"])
+        nvpm_ei_m = np.full(len(self.source), 0.088 * 1e-3, dtype=np.float32)  # g to kg
+        nvpm_ei_n = np.full(len(self.source), self.params["default_nvpm_ei_n"], dtype=np.float32)
         return nvpm_data_source, nvpm_ei_m, nvpm_ei_n
 
     def _total_pollutant_emissions(self) -> None:
@@ -916,7 +916,7 @@ def get_thrust_setting(
     )
 
     thrust_setting = fuel_flow_per_engine / edb_gaseous.ff_100
-    thrust_setting.clip(0.03, 1, out=thrust_setting)  # clip in place
+    thrust_setting.clip(0.03, 1.0, out=thrust_setting)  # clip in place
     return thrust_setting
 
 

pycontrails/models/ps_model/ps_model.py

@@ -121,7 +121,7 @@ class PSFlight(AircraftPerformance):
     def eval_flight(self, fl: Flight) -> Flight:
         # Ensure aircraft type is available
         try:
-            aircraft_type = fl.attrs["aircraft_type"]
+            aircraft_type = fl.get_constant("aircraft_type")
         except KeyError as exc:
             msg = "`aircraft_type` required on flight attrs"
             raise KeyError(msg) from exc

pycontrails/physics/constants.py

@@ -112,5 +112,6 @@ c_r: float = 0.9
 # Flight
 # ------
 
-#: Nominal rate of climb/descent of aircraft [:math:`m \ s^{-1}``]
+#: Nominal rate of climb/descent of aircraft [:math:`m \ s^{-1}`].
+#: Note [:math:`12.7 m \ s^{-1} = 2500 ft \ min^{-1}`].
 nominal_rocd: float = 12.7

{pycontrails-0.54.6.dist-info → pycontrails-0.54.7.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: pycontrails
-Version: 0.54.6
+Version: 0.54.7
 Summary: Python library for modeling aviation climate impacts
-Author-email: Breakthrough Energy <py@contrails.org>
+Author-email: "Contrails.org" <py@contrails.org>
 License: Apache-2.0
 Project-URL: Changelog, https://py.contrails.org/changelog.html
 Project-URL: Documentation, https://py.contrails.org
@@ -29,7 +29,7 @@ License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: dask>=2022.3
 Requires-Dist: numpy>=1.22
-Requires-Dist: pandas>=2.2
+Requires-Dist: pandas>=2.0
 Requires-Dist: scipy>=1.10
 Requires-Dist: typing-extensions>=4.5; python_version < "3.12"
 Requires-Dist: xarray>=2022.3

{pycontrails-0.54.6.dist-info → pycontrails-0.54.7.dist-info}/NOTICE

@@ -1,4 +1,4 @@
-Copyright (c) 2021-present Breakthrough Energy
+Copyright (c) 2021-present Contrails.org and the Breakthrough Energy Foundation
 
 
 Attribution

{pycontrails-0.54.6.dist-info → pycontrails-0.54.7.dist-info}/RECORD

@@ -1,31 +1,30 @@
-pycontrails-0.54.6.dist-info/RECORD,,
-pycontrails-0.54.6.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.54.6.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
-pycontrails-0.54.6.dist-info/NOTICE,sha256=TeY5lUhEbf5ouzABkrRUsUDJzS5v9jDEYADpwku4mgA,1929
-pycontrails-0.54.6.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.54.6.dist-info/METADATA,sha256=M7bIMAsry7V5uDqs2GHOi2g-gN3Q0L-24BywhVyTAeM,9113
-pycontrails/_version.py,sha256=3tdcrURWC_cFIzJJ0AUbLpq4j7N9WBPvv2IFchdGJSw,413
-pycontrails/__init__.py,sha256=vomSUHQ1d7ru2-3LgnmczzuPJw0kHmBSaCSVOpqvEtQ,2004
+pycontrails-0.54.7.dist-info/RECORD,,
+pycontrails-0.54.7.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.54.7.dist-info/WHEEL,sha256=ezfKMaDztqf77C8lvQ0NCnZxkTaOaKLprqJ8q932MhU,109
+pycontrails-0.54.7.dist-info/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
+pycontrails-0.54.7.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.54.7.dist-info/METADATA,sha256=DFXvJSrBL-pJrxfU5pLgCxGr0B4dCPNll7OmAZWjbuY,9109
+pycontrails/_version.py,sha256=xFXeQmKQBcVm0YCwIVk_9_pSpczqhMiPo8kIlvHU_lI,413
+pycontrails/__init__.py,sha256=9ypSB2fKZlKghTvSrjWo6OHm5qfASwiTIvlMew3Olu4,2037
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=N-B-VSNX5bz-FwzSRBdbO3fZ1A8Xh3odbTs_6rnZty4,71263
-pycontrails/core/models.py,sha256=5ppjLNbxWvS3OfiWfhfVDWjbjw5YhOPqFMedOpV4tBk,39808
+pycontrails/core/vector.py,sha256=IO7Xq63JdxbjH4h7RMJkepOi7-E568ZuxM8DeYvtnL4,73240
+pycontrails/core/models.py,sha256=iuGy9pQU-OI-AqPQyROxshSn2LbLcKNjXQcMEZw2IzA,42340
 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=uP9oUFVqvmdnb7gVDDqmiytOshTG7yRIfvBllrSUZ9w,310832
-pycontrails/core/flight.py,sha256=Eba7XmfjGEoFSdWJfSnOmWknAU0c0PPNZtTYrb3u_m4,80659
+pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=BQIOMfcT50pSkkC1lZ_IAMqPo45gkYE2QEZTGFd7q4c,310832
+pycontrails/core/flight.py,sha256=QZTGeZVnZ14UUWHSqgCSU49g_EGQZel-hzKwm_9dcFY,80653
 pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
 pycontrails/core/polygon.py,sha256=EmfHPj0e58whsHvR-3YvDgMWkvMFgp_BgwaoG8IZ4n0,18044
 pycontrails/core/cache.py,sha256=XG_RCIemv1xatDBmaVyxnoYdi8gD2gkUvjfvRi9RsJA,28068
 pycontrails/core/__init__.py,sha256=p0O09HxdeXU0X5Z3zrHMlTfXa92YumT3fJ8wJBI5ido,856
 pycontrails/core/flightplan.py,sha256=_7j4puAMiSe2aqHXcENR58c-N8crjUp4nbi3O2u7Adg,7335
-pycontrails/core/met.py,sha256=5b2K4PQWcAO5X8Mb3LLJ224_06WDyDEGUIeE3_EB3zA,103599
-pycontrails/core/aircraft_performance.py,sha256=quODa49uv0DVwl-qEYQ2ePLeapOD0GjyNBO3HoSD3M0,28004
-pycontrails/core/airports.py,sha256=3IGP337nqzXAXktT7Ju95i0I8GDVwHMlCaCv2bs4Kkk,6738
-pycontrails/core/met_var.py,sha256=U3q5Ddc1wN5EtT7a5Iy5lixCT3Mmv75C9wScY9MLnc8,11544
+pycontrails/core/met.py,sha256=l2ORveZxCMGsV2Db74xbn_QIuXKMdh5WpFtCZcDtWzY,103734
+pycontrails/core/aircraft_performance.py,sha256=ww5YBZkCPiUxRZERI5bUmxBeiF6rIrS2AsZyv8mVjvE,27400
+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=mCEuDYdt1GIBA-sbDq5LdC6ZRvWJ28uaaBTnsXE4syc,26555
 pycontrails/datalib/landsat.py,sha256=r6366rEF7fOA7mT5KySCPGJplgGE5LvBw5fMqk-U1oM,19697
-pycontrails/datalib/spire.py,sha256=66SnMdA8KOS69USjKmqrJmTKPK08Ehih9tnlsCt-AJw,25331
 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
@@ -46,6 +45,9 @@ pycontrails/datalib/_leo_utils/static/bq_roi_query.sql,sha256=xq6-tJyz0-bUwW0KjQ
 pycontrails/datalib/gfs/gfs.py,sha256=3tFiR7IObHcFmhGOdb-SJ7QQJSk6tF_6qkyi-pLrIdE,22393
 pycontrails/datalib/gfs/variables.py,sha256=4ALR4zhYW8tQVlNVHrd0CK8oRNSe_2OkW3ELeaImtAI,3135
 pycontrails/datalib/gfs/__init__.py,sha256=pXNjb9cJC6ngpuCnoHnmVZ2RHzbHZ0AlsyGvgcdcl2E,684
+pycontrails/datalib/spire/spire.py,sha256=jDNlkgytLw6pO1YMMFwcxRaeFLsuct8lk63XuWr0lqg,24391
+pycontrails/datalib/spire/__init__.py,sha256=3-My8yQItS6PL0DqXgNaltLqvN6T7nbnNnLD-sy7kt4,186
+pycontrails/datalib/spire/exceptions.py,sha256=U0V_nZTLhxJwrzldvU9PdESx8-zLddRH3FmzkJyFyrI,1714
 pycontrails/ext/synthetic_flight.py,sha256=ByuJDfpuK5WaGMj41wflfzH6zwI1nejVcQXC4JoMvSI,16795
 pycontrails/ext/cirium.py,sha256=DFPfRwLDwddpucAPRQhyT4bDGh0VvvoViMUd3pidam8,415
 pycontrails/ext/empirical_grid.py,sha256=FPNQA0x4nVwBXFlbs3DgIapSrXFYhoc8b8IX0M4xhBc,4363
@@ -61,13 +63,13 @@ pycontrails/models/tau_cirrus.py,sha256=0K7cdHBGaahuWDM0FG1HGqbvhkwyWKHMInwctkBW
 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=meIcgojYvHgm3de9iro2Bv0M4y9ta5VPwcqGAMEbBp8,13663
+pycontrails/models/accf.py,sha256=egdBa4_G3BUaoUQYWvVlTlAIWpLEuNdtCxlK3eckLOc,13599
 pycontrails/models/dry_advection.py,sha256=FqUvRFbnwe4esHBYDayn3iu7R2UUuaQwY8x2oToxNI0,19164
 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
-pycontrails/models/emissions/emissions.py,sha256=iAUJQFVzFDllKlDRVzIEZRm18IryFQedbzq3h2GmFcQ,47691
-pycontrails/models/emissions/black_carbon.py,sha256=HV56zz5-9nrIxDqL2-F6aa7XQYZyv26IDkLHo_Jop9A,20346
+pycontrails/models/emissions/emissions.py,sha256=qt689n4MuWw4XZ0NneBTNR2RqVG3XRYafgkkdSc1yEw,47757
+pycontrails/models/emissions/black_carbon.py,sha256=d0CCQz_-W4Pne-ywS_Rc2plMAe4Azb0jT0QCii3K4aE,20695
 pycontrails/models/emissions/static/edb-nvpm-v29b-engines.csv,sha256=NatpVI1D2tTDLK7uVvlanm9DhfFB44nmFA4aocUcXco,77318
 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
@@ -82,17 +84,17 @@ 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=0zTXQXANYC3oIDyYEUHkaJxuwTe0-GojxBipEutWGxU,45031
 pycontrails/models/cocip/wind_shear.py,sha256=m6ZlWjORfI-lI-D74Z_dIMOHnK4FDYmkb0S6vSpKTO8,3868
-pycontrails/models/cocip/cocip.py,sha256=QbbgSPEI2Lw8mftaxznpUgdNytnMk7O89VsTKBDvQ2w,102407
+pycontrails/models/cocip/cocip.py,sha256=LXopyTZsi7QjOJLmoI9uKXeyvt-JU1jkiAgm_G_askQ,103756
 pycontrails/models/cocip/output_formats.py,sha256=YXYfm32NsI3OkZn4htAOceMIDG31ulehUiMUCqu8hEQ,83713
 pycontrails/models/cocip/__init__.py,sha256=CWrkNd6S3ZJq04pjTc2W22sVAJeJD3bJJRy_zLW8Kkc,962
-pycontrails/models/cocip/cocip_params.py,sha256=rwVW1SnjKnzztlxcxxaCztgzRbIPkMJqC2GefUKQZ6w,12341
+pycontrails/models/cocip/cocip_params.py,sha256=34_F7mXyJpSfek7iRhLVj6JaZeSoFmfcxx2WmmZN42Q,12534
 pycontrails/models/cocip/wake_vortex.py,sha256=YmOuv_oWJ9-fmTx9PVHr6gsXwex0qzLhvoZIJNB9rsk,14515
 pycontrails/models/cocip/cocip_uncertainty.py,sha256=XFWYIEVcmbOO9bP7BMdQXbCiQa0OSvfyr71CWtNON6E,12237
 pycontrails/models/cocip/radiative_heating.py,sha256=1U4SQWwogtyQ2u6J996kAHP0OfpZ3hH2_x4Cyt3Cy8U,18984
 pycontrails/models/cocip/contrail_properties.py,sha256=H0D2FQodX6jW3EmAxQNxGS8erOU0EW2MSAAOLB0LyQc,56202
-pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=M6tdl5ZfNDtiLwJOrXg3sBesf6Larg-5JchsVlJNsG4,14675
+pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=edMHuWKzFN1P4EMWC2HRv5ZS_rUI7Q5Nw3LsYkrI0mE,18936
 pycontrails/models/ps_model/__init__.py,sha256=Fuum5Rq8ya8qkvbeq2wh6NDo-42RCRnK1Y-2syYy0Ck,553
-pycontrails/models/ps_model/ps_model.py,sha256=e-rd3b61futqHFQPXbOj3o-7hIuxHZH0fUzmYI4JDow,32255
+pycontrails/models/ps_model/ps_model.py,sha256=svv9_T5rYDhFRXdnod4xfia1HPQCb9vG9z3fHGjkABU,32262
 pycontrails/models/ps_model/ps_aircraft_params.py,sha256=pD1xpTBX6ML2Pie78kypNibzE5AkvqnAIaTyEMfciuY,13350
 pycontrails/models/ps_model/ps_operational_limits.py,sha256=XwMHO8yu8EZUWtxRgjRKwxmCrmKGoHO7Ob6nlfkrthI,16441
 pycontrails/models/ps_model/ps_grid.py,sha256=DTUXTxYIQ-6iquiCGtScOqkPvakz9F57DxUHQ3JmXIA,26071
@@ -100,10 +102,10 @@ pycontrails/models/ps_model/static/ps-synonym-list-20240524.csv,sha256=ksrpQTHkx
 pycontrails/models/ps_model/static/ps-aircraft-params-20240524.csv,sha256=3eNhSwzut0gon04k2EYKKaXRvQSUlau3yBAbHS0EBao,25784
 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=uLQ86xK12LJ43KKb-CdSaDDamj4GyfDbiHp_NefotZU,91151
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=vMzkgPxUjef4vVPDHlCOCn7AJJozBWicuHhaqC208M8,91325
 pycontrails/physics/geo.py,sha256=5THIXgpaHBQdSYWLgtK4mV_8e1hWW9XeTsSHOShFMeA,36323
 pycontrails/physics/units.py,sha256=BC0e0l_pDeijqN179tXl8eX_Qpw8d17MVujBu1SV3IE,12293
-pycontrails/physics/constants.py,sha256=pHQQmccMUwuNnY4hFtm3L8G2rnUQcfJnroyQr8HAVeM,3146
+pycontrails/physics/constants.py,sha256=xWy7OkDOJNM6umq5dYiuzwG0aTEl5aECLxEpg3Z2SBQ,3202
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44
 pycontrails/physics/thermo.py,sha256=sWGpKa12daSpqZYNgyXd8Ii5nfA_1Mm5mMbnM5GsW-E,12787
 pycontrails/physics/jet.py,sha256=RoHns04wi2EGYWQqYxnr6LUAV-CqsgLhXdrUCrBHAGk,30307