pycontrails 0.54.6__cp311-cp311-macosx_11_0_arm64.whl → 0.54.8__cp311-cp311-macosx_11_0_arm64.whl

pycontrails/models/cocip/cocip.py

@@ -18,11 +18,12 @@ import numpy.typing as npt
 import pandas as pd
 import xarray as xr
 
-from pycontrails.core import met_var
+from pycontrails.core import met_var, models
 from pycontrails.core.aircraft_performance import AircraftPerformance
 from pycontrails.core.fleet import Fleet
 from pycontrails.core.flight import Flight
 from pycontrails.core.met import MetDataset
+from pycontrails.core.met_var import MetVariable
 from pycontrails.core.models import Model, interpolate_met
 from pycontrails.core.vector import GeoVectorDataset, VectorDataDict
 from pycontrails.datalib import ecmwf, gfs
@@ -482,6 +483,42 @@ class Cocip(Model):
 
         return self.source
 
+    @classmethod
+    def generic_rad_variables(cls) -> tuple[MetVariable, ...]:
+        """Return a model-agnostic list of required radiation variables.
+
+        Returns
+        -------
+        tuple[MetVariable]
+            List of model-agnostic variants of required variables
+        """
+        available = set(met_var.MET_VARIABLES)
+        return tuple(models._find_match(required, available) for required in cls.rad_variables)
+
+    @classmethod
+    def ecmwf_rad_variables(cls) -> tuple[MetVariable, ...]:
+        """Return an ECMWF-specific list of required radiation variables.
+
+        Returns
+        -------
+        tuple[MetVariable]
+            List of ECMWF-specific variants of required variables
+        """
+        available = set(ecmwf.ECMWF_VARIABLES)
+        return tuple(models._find_match(required, available) for required in cls.rad_variables)
+
+    @classmethod
+    def gfs_rad_variables(cls) -> tuple[MetVariable, ...]:
+        """Return a GFS-specific list of required radiation variables.
+
+        Returns
+        -------
+        tuple[MetVariable]
+            List of GFS-specific variants of required variables
+        """
+        available = set(gfs.GFS_VARIABLES)
+        return tuple(models._find_match(required, available) for required in cls.rad_variables)
+
     def _set_timesteps(self) -> None:
         """Set the :attr:`timesteps` based on the ``source`` time range.
 
@@ -960,14 +997,14 @@ class Cocip(Model):
         else:
             f_surv = contrail_properties.ice_particle_survival_fraction(iwc, iwc_1)
 
-        n_ice_per_m_1 = contrail_properties.ice_particle_number(
+        n_ice_per_m_0 = contrail_properties.initial_ice_particle_number(
             nvpm_ei_n=nvpm_ei_n,
             fuel_dist=fuel_dist,
-            f_surv=f_surv,
             air_temperature=air_temperature,
             T_crit_sac=T_critical_sac,
             min_ice_particle_number_nvpm_ei_n=self.params["min_ice_particle_number_nvpm_ei_n"],
         )
+        n_ice_per_m_1 = n_ice_per_m_0 * f_surv
 
         # Check for persistent initial_contrails
         persistent_1 = contrail_properties.initial_persistent(iwc_1, rhi_1)
@@ -981,6 +1018,8 @@ class Cocip(Model):
         self._sac_flight["rho_air_1"] = rho_air_1
         self._sac_flight["rhi_1"] = rhi_1
         self._sac_flight["iwc_1"] = iwc_1
+        self._sac_flight["f_surv"] = f_surv
+        self._sac_flight["n_ice_per_m_0"] = n_ice_per_m_0
         self._sac_flight["n_ice_per_m_1"] = n_ice_per_m_1
         self._sac_flight["persistent_1"] = persistent_1
 
@@ -1347,7 +1386,13 @@ class Cocip(Model):
         if verbose_outputs:
             sac_cols += ["dT_dz", "ds_dz", "dz_max"]
 
-        downwash_cols = ["rho_air_1", "iwc_1", "n_ice_per_m_1"]
+        downwash_cols = [
+            "rho_air_1",
+            "iwc_1",
+            "f_surv",
+            "n_ice_per_m_0",
+            "n_ice_per_m_1",
+        ]
         df = pd.concat(
             [
                 self.source.dataframe.set_index(col_idx),
@@ -2174,8 +2219,6 @@ def calc_contrail_properties(
         air_temperature += contrail["cumul_heat"]
 
     # get required radiation
-    theta_rad = geo.orbital_position(time)
-    sd0 = geo.solar_constant(theta_rad)
     sdr = contrail["sdr"]
     rsr = contrail["rsr"]
     olr = contrail["olr"]
@@ -2210,6 +2253,9 @@ def calc_contrail_properties(
     diffuse_h = contrail_properties.horizontal_diffusivity(ds_dz, depth)
 
     if radiative_heating_effects:
+        # theta_rad has float64 dtype, convert back to float32 if needed
+        theta_rad = geo.orbital_position(time).astype(sdr.dtype, copy=False)
+        sd0 = geo.solar_constant(theta_rad)
         heat_rate = radiative_heating.heating_rate(
             air_temperature=air_temperature,
             rhi=rhi,

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/contrail_properties.py

@@ -201,10 +201,9 @@ def iwc_post_wake_vortex(
     return np.maximum(iwc - iwc_ad, 0.0)
 
 
-def ice_particle_number(
+def initial_ice_particle_number(
     nvpm_ei_n: npt.NDArray[np.floating],
     fuel_dist: npt.NDArray[np.floating],
-    f_surv: npt.NDArray[np.floating],
     air_temperature: npt.NDArray[np.floating],
     T_crit_sac: npt.NDArray[np.floating],
     min_ice_particle_number_nvpm_ei_n: float,
@@ -222,8 +221,6 @@ def ice_particle_number(
         black carbon number emissions index, [:math:`kg^{-1}`]
     fuel_dist : npt.NDArray[np.floating]
         fuel consumption of the flight segment per distance traveled, [:math:`kg m^{-1}`]
-    f_surv : npt.NDArray[np.floating]
-        Fraction of contrail ice particle number that survive the wake vortex phase.
     air_temperature : npt.NDArray[np.floating]
         ambient temperature for each waypoint, [:math:`K`]
     T_crit_sac : npt.NDArray[np.floating]
@@ -235,11 +232,12 @@ def ice_particle_number(
     Returns
     -------
     npt.NDArray[np.floating]
-        initial number of ice particles per distance after the wake vortex phase, [:math:`# m^{-1}`]
+        The initial number of ice particles per distance before the wake vortex
+        phase, [:math:`# m^{-1}`]
     """
     f_activation = ice_particle_activation_rate(air_temperature, T_crit_sac)
     nvpm_ei_n_activated = nvpm_ei_n * f_activation
-    return fuel_dist * np.maximum(nvpm_ei_n_activated, min_ice_particle_number_nvpm_ei_n) * f_surv
+    return fuel_dist * np.maximum(nvpm_ei_n_activated, min_ice_particle_number_nvpm_ei_n)
 
 
 def ice_particle_activation_rate(

pycontrails/models/cocip/output_formats.py

@@ -1188,10 +1188,18 @@ def meteorological_time_slice_statistics(
     )
 
     # ISSR: Volume of airspace with RHi > 100% between FL300 and FL450
-    met = humidity_scaling.eval(met)
-    rhi = met["rhi"].data.sel(level=slice(150, 300))
-    rhi = rhi.interp(time=time)
-    is_issr = rhi > 1
+    met_cruise = MetDataset(met.data.sel(level=slice(150, 300)))
+    rhi = humidity_scaling.eval(met_cruise)["rhi"].data
+
+    try:
+        # If the given time is already in the dataset, select the time slice
+        i = rhi.get_index("time").get_loc(time)
+    except KeyError:
+        rhi = rhi.interp(time=time)
+    else:
+        rhi = rhi.isel(time=i)
+
+    is_issr = rhi > 1.0
 
     # Cirrus in a longitude-latitude grid
     if cirrus_coverage is None:

pycontrails/models/cocip/radiative_forcing.py

@@ -1104,10 +1104,7 @@ def _contrail_optical_depth_above_contrail_layer(
 
     da_surface_area = geo.grid_surface_area(da["longitude"].values, da["latitude"].values)
     da = da / da_surface_area
-
-    lon_coords = da["longitude"].values
-    wrap_longitude = (lon_coords[-1] + lon_coords[0] + np.diff(lon_coords)[0]) == 0.0
-    mda = MetDataArray(da, wrap_longitude=wrap_longitude, copy=False)
+    mda = MetDataArray(da)
 
     # Interpolate to contrails_level
     contrails_level["tau_contrails_above"] = contrails_level.intersect_met(mda)
@@ -1133,10 +1130,7 @@ def _rsr_and_olr_with_contrail_overlap(
         Contrail waypoints at the current altitude layer with `rsr_overlap` and
         `olr_overlap` attached.
     """
-    # Change in radiation fields
-    lon_coords = delta_rad_t["longitude"].values
-    wrap_longitude = (lon_coords[-1] + lon_coords[0] + np.diff(lon_coords)[0]) == 0.0
-    mds = MetDataset(delta_rad_t, wrap_longitude=wrap_longitude, copy=False)
+    mds = MetDataset(delta_rad_t)
 
     # Interpolate radiation fields to obtain `rsr_overlap` and `olr_overlap`
     delta_rsr = contrails_level.intersect_met(mds["rsr"])

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
@@ -1485,18 +1488,18 @@ def find_initial_persistent_contrails(
     )
     iwc_1 = contrail_properties.iwc_post_wake_vortex(iwc, iwc_ad)
     f_surv = contrail_properties.ice_particle_survival_fraction(iwc, iwc_1)
-    n_ice_per_m = contrail_properties.ice_particle_number(
+    n_ice_per_m_0 = contrail_properties.initial_ice_particle_number(
         nvpm_ei_n=nvpm_ei_n,
         fuel_dist=fuel_dist,
-        f_surv=f_surv,
         air_temperature=air_temperature,
         T_crit_sac=T_crit_sac,
         min_ice_particle_number_nvpm_ei_n=params["min_ice_particle_number_nvpm_ei_n"],
     )
+    n_ice_per_m_1 = n_ice_per_m_0 * f_surv
 
     # The logic below corresponds to Cocip._create_downwash_contrail (roughly)
     contrail["iwc"] = iwc_1
-    contrail["n_ice_per_m"] = n_ice_per_m
+    contrail["n_ice_per_m"] = n_ice_per_m_1
 
     # Check for persistent initial_contrails
     rhi_1 = contrail["rhi"]
@@ -2149,18 +2152,18 @@ def result_to_metdataset(
     size = np.prod(shape)
 
     dtype = result["ef"].dtype if result else np.float32
-    contrail_age = np.zeros(size, dtype=np.float32)
-    ef_per_m = np.zeros(size, dtype=dtype)
+    contrail_age_1d = np.zeros(size, dtype=np.float32)
+    ef_per_m_1d = np.zeros(size, dtype=dtype)
 
     if result:
         contrail_idx = result["index"]
         # Step 1: Contrail age. Convert from timedelta to float
-        contrail_age[contrail_idx] = result["age"] / np.timedelta64(1, "h")
+        contrail_age_1d[contrail_idx] = result["age"] / np.timedelta64(1, "h")
         # Step 2: EF
-        ef_per_m[contrail_idx] = result["ef"] / nominal_segment_length
+        ef_per_m_1d[contrail_idx] = result["ef"] / nominal_segment_length
 
-    contrail_age = contrail_age.reshape(shape)
-    ef_per_m = ef_per_m.reshape(shape)
+    contrail_age_4d = contrail_age_1d.reshape(shape)
+    ef_per_m_4d = ef_per_m_1d.reshape(shape)
 
     # Step 3: Dataset dims and attrs
     dims = tuple(source.coords)
@@ -2168,8 +2171,8 @@ def result_to_metdataset(
 
     # Step 4: Dataset core variables
     data_vars = {
-        "contrail_age": (dims, contrail_age, local_attrs["contrail_age"]),
-        "ef_per_m": (dims, ef_per_m, local_attrs["ef_per_m"]),
+        "contrail_age": (dims, contrail_age_4d, local_attrs["contrail_age"]),
+        "ef_per_m": (dims, ef_per_m_4d, local_attrs["ef_per_m"]),
     }
 
     # Step 5: Dataset variables from verbose_dicts