pycontrails 0.54.6__cp312-cp312-win_amd64.whl → 0.54.7__cp312-cp312-win_amd64.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,27 +1,26 @@
-pycontrails/__init__.py,sha256=NOLObVatChUoklxD_qM8rjDtzrYu1gpmurNWqBhPpUM,2074
-pycontrails/_version.py,sha256=fpB6PGg0QTJniUGkjeIPxIbiS3yN4-9wDXf5Ml7KyLE,429
+pycontrails/__init__.py,sha256=mKNmGUS5wW1n1PukeaOkmLwQVN24i1__mk0odjBzwEE,2107
+pycontrails/_version.py,sha256=Jkh_vvZO4qDhndLnoUinQrHjMORnNz_SExncTiuwXhQ,429
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/__init__.py,sha256=kOAehIZBbvksSW3MuU2DfzsyeE4PaFnOTpYMeq2ZDPE,886
-pycontrails/core/aircraft_performance.py,sha256=lXw-RRg96yfXnsWPR5q3ARV_RGp1c32ozfx0mkHlb1k,28688
-pycontrails/core/airports.py,sha256=b0ujvU1nyWr4a-qtNSigPo3s4K02xAeGcyTeeHFK4KU,6963
+pycontrails/core/aircraft_performance.py,sha256=7LxvxHB-2E2Qk1Kn0LG2eiUNFmN-Q-S76ZrDGPCI-P8,28066
+pycontrails/core/airports.py,sha256=ELTH5P7SXs-LGxGfDPFCZnH7bs8GQ9SNbdLpLt7t6zk,7003
 pycontrails/core/cache.py,sha256=NnlElV4ejshgyU2LMf5BtZGqmr1kZOxwz1hAT2Lq1ok,28953
 pycontrails/core/coordinates.py,sha256=J5qjGuXgbLUw_U9_qREdgOaHl0ngK6Hbbjj3uw7FwNE,5565
 pycontrails/core/fleet.py,sha256=ddujPC79K975gWVk8NDskE79OZaUam8tPR9rONaT918,17192
-pycontrails/core/flight.py,sha256=dJ8t2BvM9C4fdmNZFQ9fHxRbcrhOP4KIJ6l0pYQZrsU,82830
+pycontrails/core/flight.py,sha256=jWGmeDDCZx6zjl5Xy-uLcKGeoIrLwcJ-nmYCSklbVLM,82824
 pycontrails/core/flightplan.py,sha256=bcDjmJ-UR1gtuOLgAkCsRnwjJrz_l3n0nVRuj4_d9EU,7555
 pycontrails/core/fuel.py,sha256=06YUDhvC8Rx6KbUXRB9qLTsJX2V7tLbzjwAfDH0R6l8,4472
 pycontrails/core/interpolation.py,sha256=-GC3T6yh3nMtt7JCawoYeCUnDNRY9GHhxhkRhhnntxE,26437
-pycontrails/core/met.py,sha256=JeTLNbFMv19MJk8N3kihLgt5vXlMHOj0AetO8rHtPgU,106497
-pycontrails/core/met_var.py,sha256=kBwk0twIfo4jWNo_L1vxwdB40YzuSjXhbLFxGUFSpfM,11913
-pycontrails/core/models.py,sha256=odpHsazdvF_tKNwNS3y1qU9L3dC0dGV2RA5XqU4BeYw,41004
+pycontrails/core/met.py,sha256=tKYowOqzpC6U6XPWgFmaAoYUH9yj0Kuw5ZMWQDil4js,106640
+pycontrails/core/met_var.py,sha256=bFpBFpQnN6osVAuxNNhG6vG_NMThEIhDcL2B9VpXgww,12407
+pycontrails/core/models.py,sha256=XCCyOpdDuLzvFQii9sjWabdJ6h9V9rukVlVM-yPiXBc,43612
 pycontrails/core/polygon.py,sha256=NZ4YBhdALidXYOPsSX1cwGQ022j-AXgbWIQg7LA-f-I,18593
-pycontrails/core/rgi_cython.cp312-win_amd64.pyd,sha256=IF3k3DwfYMVySz9jSHyD97wIcmOl-nKkBZ_yCE2Tw7c,263680
-pycontrails/core/vector.py,sha256=T8YMtylYPmeHo3sanfgmZVSCPckoJTFg3Iq8apGBNIA,73445
+pycontrails/core/rgi_cython.cp312-win_amd64.pyd,sha256=PBbWMubyp3_ABYrBFHYRPQWGCqya-m8BLC64MEO2SZo,263680
+pycontrails/core/vector.py,sha256=wtqE8o0ebt-J7_sD8BlsOlMmHVbevtFp9lfsGAwF-Jw,75488
 pycontrails/datalib/__init__.py,sha256=Q2RrnjwtFzfsmJ2tEojDCzDMkd8R0MYw4mQz3YwUsqI,381
 pycontrails/datalib/goes.py,sha256=eMo_A_Kxii3dTItp6_j6obvyT1NiGAr06RyYMuHZzd0,27327
 pycontrails/datalib/landsat.py,sha256=YrDpngF5HtvWFVwxN0FLFxCfZIEmeBMiifdkbH7fQTk,20263
 pycontrails/datalib/sentinel.py,sha256=ukzdSeHKC1UBWEYzehS2LqtKoCpKpaPobLfbZDGy6KU,17679
-pycontrails/datalib/spire.py,sha256=aW0wh5GDrszFb20ZMzmWKQ4uHbOCmHvVt9Sf4U3AyTI,26070
 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
@@ -40,12 +39,15 @@ pycontrails/datalib/ecmwf/static/model_level_dataframe_v20240418.csv,sha256=9u7C
 pycontrails/datalib/gfs/__init__.py,sha256=DGd8twOXwRZZhHx5muc9SJT-YET1KB599kS45_x3IbY,712
 pycontrails/datalib/gfs/gfs.py,sha256=qh_nMDaSqkGs-YgibsmDWWXGtn6HY7EUqv5tve7IK5s,23055
 pycontrails/datalib/gfs/variables.py,sha256=gmw5cs8RAeB-s9kCbnuKFp1K2SqNbc0lNR-JqhcenZY,3239
+pycontrails/datalib/spire/__init__.py,sha256=HTeQFjMc1BJ189fALx5NDGX2IVZ0AUWC_Xu6LCsZduk,191
+pycontrails/datalib/spire/exceptions.py,sha256=G8A68hbwPLYsXpluw7Q6TYJ1cJL-BmkKsiz93fHk-Kc,1776
+pycontrails/datalib/spire/spire.py,sha256=EGgf6GtbtUtIIUyx9mMmfd9X9j6VixauTKn7g3JnZGw,24997
 pycontrails/ext/bada.py,sha256=RmLDMaZQody8XUR-1I_5rPJqoz6eIq63IpDTcuJweoc,1133
 pycontrails/ext/cirium.py,sha256=zRPVBBWwocZKkX3XhonSBf54x7P_xnjRcA7psI0Kqnw,429
 pycontrails/ext/empirical_grid.py,sha256=mveQltokaGeQcxxbdMSLQ6wQ14oh3XX5dfzjWaFpxbk,4503
 pycontrails/ext/synthetic_flight.py,sha256=6w2pC7DpbdHi3J1w5BL-8j3xCzYdP8N7FQ8dsMfDBpw,17226
 pycontrails/models/__init__.py,sha256=TKhrXe1Pu1-mV1gctx8cUAMrVxCCAtBkbZi9olfWq8s,34
-pycontrails/models/accf.py,sha256=YlRo5aDeHSSYE7IRHbNW4dsWTACCkVaYsqGbgM-AqlI,14090
+pycontrails/models/accf.py,sha256=llpEtvEqrA0N2iefEpj8wbObHPhWkuoMpfln0wu7fBc,14026
 pycontrails/models/dry_advection.py,sha256=vDPjNrECefMvRVnfkhWCWbYQPpB2YYhGUvLiIuW10TM,19727
 pycontrails/models/issr.py,sha256=J6mh4pze31XpD2_zD9ujzYPXsZFrmSwNcRORCcLoOVI,7588
 pycontrails/models/pcc.py,sha256=7k8kICqDeZ99O2n2Zpnu7EFNGjEpPka_9cu9nrmP44s,11394
@@ -58,22 +60,22 @@ pycontrails/models/apcemm/inputs.py,sha256=zHRSWVVlwYw6ms7PpC0p0I-xFsRDUVY9eDZ1g
 pycontrails/models/apcemm/utils.py,sha256=gew1MGtuOwKy0CTVKomJ_Lmuhmy4JxsopkughzCeB4o,17519
 pycontrails/models/apcemm/static/apcemm_yaml_template.yaml,sha256=A3H_FWVOtqkZhG91TWLdblMKaLWIcjRMsKqkfTN6mB4,6928
 pycontrails/models/cocip/__init__.py,sha256=v8JJN_Jx3_tOHaqGaQG-Es7srEAtSCHI7-gCEnM-n-s,991
-pycontrails/models/cocip/cocip.py,sha256=CtZWQWAAuOhyn3KVgkvoQGYYRNGP__8G4HR6c-irYe8,105086
-pycontrails/models/cocip/cocip_params.py,sha256=9q6teJgXKxEqWLhA_itMG-A8OeLIFb7XvEUUf7eTjdE,12631
+pycontrails/models/cocip/cocip.py,sha256=R92HXUJA8QJrcCGy5-7v3yR7CAaHyabIBHoYGmVAiuk,106472
+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=jF7iXFmMQEpyI3DNkRa7NFs-unx5a3HmmX6xs9FSJDQ,57734
 pycontrails/models/cocip/output_formats.py,sha256=WpuSYTZ221kYUQNgUZGssdZlMXMy2GeCCiU13pCaAyI,85975
 pycontrails/models/cocip/radiative_forcing.py,sha256=Zx7amTmIQHozuYyxfkryBJZVFDJws6a--By71TIMMIk,46297
 pycontrails/models/cocip/radiative_heating.py,sha256=PcOEkqRtQJNq7bxOoz1baBbVV2ku1UQRMrrQXXsRBwc,19504
-pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=GBFtwCPslStlgJU81WgE7nkWHVfSJkxFrPgJ2nq4PJc,15081
+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=8J7WeTyblaJo69yp6VSRVcic_Jrs1vITXL93jTWHY1o,93672
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=_mXGrCDtC3gfwdUXU5AOdS4m6HCFUEtW8vggTu7ZRVQ,93849
 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=oIi-SxnRKdVDewyzqpA5eE4kzq5CJCtPcNcqrUh4Ito,20940
-pycontrails/models/emissions/emissions.py,sha256=nj3dNXH2NXX4xotsbkt2_yVen4nAioSFFeqCu-9dL9w,49044
+pycontrails/models/emissions/black_carbon.py,sha256=o8mVfDZLnNlfnvsqk8O-ljXrMn4Y_ApFuPROAQWHaQY,21294
+pycontrails/models/emissions/emissions.py,sha256=qczs_7m2HnpWe_Q_PlEE1_qMawrzfid5JyRmSEB3wi4,49110
 pycontrails/models/emissions/ffm2.py,sha256=sWWzaV-5N2nNQlS0RxgKFwPzja5dehc99mfifTHW6pQ,12404
 pycontrails/models/emissions/static/default-engine-uids.csv,sha256=6e-0Fjbka1www4o2CNtw2pW-g0s_E7hZQ6vOaR84Q5Y,6456
 pycontrails/models/emissions/static/edb-gaseous-v29b-engines.csv,sha256=s-3_KGQyVoypXCHeQgsTDwdri-e3JVJn5SDxZo60m_s,128119
@@ -85,12 +87,12 @@ pycontrails/models/humidity_scaling/quantiles/era5-pressure-level-quantiles.pq,s
 pycontrails/models/ps_model/__init__.py,sha256=fCGfdrJjK4K_EOODU8exmOFzedbABb3bMbuFi0gbrgc,571
 pycontrails/models/ps_model/ps_aircraft_params.py,sha256=xs6-bCAhhOgN-LRDa7rUuuJdYM-bjDAMABLRayVhYwo,13731
 pycontrails/models/ps_model/ps_grid.py,sha256=IhtCJF5FxJM7xYcc6jwPog91owe3dfkMwsOh6UTcrqI,26772
-pycontrails/models/ps_model/ps_model.py,sha256=-l2sEWzyjaoXNjvATKoC_vqbNYfex4XpgXSzDAf03zQ,33261
+pycontrails/models/ps_model/ps_model.py,sha256=DAPAbajZVd2YHTcbiPK5w9X8ZkqYbSDq-5hrU3C7C8o,33268
 pycontrails/models/ps_model/ps_operational_limits.py,sha256=95evggmtPbnr3kqNgqfOEJhbupK_D_ksONPmTm0k2B8,16966
 pycontrails/models/ps_model/static/ps-aircraft-params-20240524.csv,sha256=2RtIHwXRuMVAEfsefopm1m6ozHi8YciYUN3WTMpfoo4,25852
 pycontrails/models/ps_model/static/ps-synonym-list-20240524.csv,sha256=MLXOeVjC5FQULGNc6rn-_BdSURJAkJLMSDzPhC7OpDY,1141
 pycontrails/physics/__init__.py,sha256=AScCMSMSZjKxfL6mssdSLwcja1ml7MzREThQp5PLr9U,45
-pycontrails/physics/constants.py,sha256=SWG7H7eJCvQXfUR3qS6_fYzNvEeRZga50qT2RuaHoYU,3262
+pycontrails/physics/constants.py,sha256=_MVuhk6GxxZhj5RL_ci6IAgSe4oJyxLZwBvpMuGcl3Q,3319
 pycontrails/physics/geo.py,sha256=WyZKLj-63yGCfjePEhiwxLp26be44VCdEiisu9tXtzE,37461
 pycontrails/physics/jet.py,sha256=z_MNEU7BVcy0sTtRbpKooS0Ynf4Ah5kVMDoLIeO-4Fg,31274
 pycontrails/physics/thermo.py,sha256=HAcg2wmNXW-vJbOF2kOXBoUyJiAosPY0nRWeM37otdY,13238
@@ -103,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.6.dist-info/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
-pycontrails-0.54.6.dist-info/METADATA,sha256=xLlw2rgL4SdWGJz7X5z5AwKSe_-kgycaMUlYsEorXNo,9292
-pycontrails-0.54.6.dist-info/NOTICE,sha256=QG0F9avpssHcmlEMlLbndVRGqmB7ATPIk16uDVmTlVE,1972
-pycontrails-0.54.6.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
-pycontrails-0.54.6.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.54.6.dist-info/RECORD,,
+pycontrails-0.54.7.dist-info/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
+pycontrails-0.54.7.dist-info/METADATA,sha256=AZq6GUBX-wSYt5twiubQKHrcgpbFvbo-Wdyht8mKZwE,9288
+pycontrails-0.54.7.dist-info/NOTICE,sha256=VIhzKNYi4lQx6fpZyqiY6eMHpLuwp-_G0JQkmYYa7h0,2005
+pycontrails-0.54.7.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
+pycontrails-0.54.7.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.54.7.dist-info/RECORD,,