pycontrails 0.54.5__cp312-cp312-macosx_11_0_arm64.whl → 0.54.7__cp312-cp312-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
@@ -68,12 +69,26 @@ class Cocip(Model):
     -----
     **Inputs**
 
-    The required meteorology variables depend on the data source (e.g. ECMWF, GFS).
+    The required meteorology variables depend on the data source. :class:`Cocip`
+    supports data-source-specific variables from ECMWF models (HRES, ERA5) and the NCEP GFS, plus
+    a generic set of model-agnostic variables.
 
     See :attr:`met_variables` and :attr:`rad_variables` for the list of required variables
     to the ``met`` and ``rad`` parameters, respectively.
     When an item in one of these arrays is a :class:`tuple`, variable keys depend on data source.
 
+    A warning will be raised if meteorology data is from a source not currently supported by
+    a pycontrails datalib. In this case it is the responsibility of the user to ensure that
+    meteorology data is formatted correctly. The warning can be suppressed with a context manager:
+
+    .. code-block:: python
+        :emphasize-lines: 2,3
+
+        import warnings
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", category=UserWarning, message="Unknown provider")
+            cocip = Cocip(met, rad, ...)
+
     The current list of required variables (labelled by ``"standard_name"``):
 
     .. list-table:: Variable keys for pressure level data
@@ -82,24 +97,31 @@ class Cocip(Model):
         * - Parameter
           - ECMWF
           - GFS
+          - Generic
         * - Air Temperature
           - ``air_temperature``
           - ``air_temperature``
+          - ``air_temperature``
         * - Specific Humidity
           - ``specific_humidity``
           - ``specific_humidity``
+          - ``specific_humidity``
         * - Eastward wind
           - ``eastward_wind``
           - ``eastward_wind``
+          - ``eastward_wind``
         * - Northward wind
           - ``northward_wind``
           - ``northward_wind``
+          - ``northward_wind``
         * - Vertical velocity
           - ``lagrangian_tendency_of_air_pressure``
           - ``lagrangian_tendency_of_air_pressure``
+          - ``lagrangian_tendency_of_air_pressure``
         * - Ice water content
           - ``specific_cloud_ice_water_content``
           - ``ice_water_mixing_ratio``
+          - ``mass_fraction_of_cloud_ice_in_air``
 
     .. list-table:: Variable keys for single-level radiation data
         :header-rows: 1
@@ -107,12 +129,15 @@ class Cocip(Model):
         * - Parameter
           - ECMWF
           - GFS
+          - Generic
         * - Top solar radiation
           - ``top_net_solar_radiation``
           - ``toa_upward_shortwave_flux``
+          - ``toa_net_downward_shortwave_flux``
         * - Top thermal radiation
           - ``top_net_thermal_radiation``
           - ``toa_upward_longwave_flux``
+          - ``toa_outgoing_longwave_flux``
 
     **Modifications**
 
@@ -214,14 +239,26 @@ class Cocip(Model):
         met_var.EastwardWind,
         met_var.NorthwardWind,
         met_var.VerticalVelocity,
-        (ecmwf.SpecificCloudIceWaterContent, gfs.CloudIceWaterMixingRatio),
+        (
+            met_var.MassFractionOfCloudIceInAir,
+            ecmwf.SpecificCloudIceWaterContent,
+            gfs.CloudIceWaterMixingRatio,
+        ),
     )
 
     #: Required single-level top of atmosphere radiation variables.
     #: Variable keys depend on data source (e.g. ECMWF, GFS).
     rad_variables = (
-        (ecmwf.TopNetSolarRadiation, gfs.TOAUpwardShortwaveRadiation),
-        (ecmwf.TopNetThermalRadiation, gfs.TOAUpwardLongwaveRadiation),
+        (
+            met_var.TOANetDownwardShortwaveFlux,
+            ecmwf.TopNetSolarRadiation,
+            gfs.TOAUpwardShortwaveRadiation,
+        ),
+        (
+            met_var.TOAOutgoingLongwaveFlux,
+            ecmwf.TopNetThermalRadiation,
+            gfs.TOAUpwardLongwaveRadiation,
+        ),
     )
 
     #: Minimal set of met variables needed to run the model after pre-processing.
@@ -242,7 +279,11 @@ class Cocip(Model):
     #:   Moved Geopotential from :attr:`met_variables` to :attr:`optional_met_variables`
     optional_met_variables = (
         (met_var.Geopotential, met_var.GeopotentialHeight),
-        (ecmwf.CloudAreaFractionInLayer, gfs.TotalCloudCoverIsobaric),
+        (
+            met_var.CloudAreaFractionInAtmosphereLayer,
+            ecmwf.CloudAreaFractionInLayer,
+            gfs.TotalCloudCoverIsobaric,
+        ),
     )
 
     #: Met data is not optional
@@ -442,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.
 
@@ -575,10 +652,12 @@ class Cocip(Model):
         if verbose_outputs:
             interpolate_met(met, self.source, "tau_cirrus", **interp_kwargs)
 
-            # handle ECMWF/GFS ciwc variables
+            # handle ECMWF/GFS/generic ciwc variables
             if (key := "specific_cloud_ice_water_content") in met:  # noqa: SIM114
                 interpolate_met(met, self.source, key, **interp_kwargs)
-            elif (key := "ice_water_mixing_ratio") in met:
+            elif (key := "ice_water_mixing_ratio") in met:  # noqa: SIM114
+                interpolate_met(met, self.source, key, **interp_kwargs)
+            elif (key := "mass_fraction_of_cloud_ice_in_air") in met:
                 interpolate_met(met, self.source, key, **interp_kwargs)
 
             self.source["rho_air"] = thermo.rho_d(
@@ -1587,8 +1666,7 @@ def _process_rad(rad: MetDataset) -> MetDataset:
                 rad.data["time"].attrs["shift_radiation_time"] = "variable"
             return rad
 
-        else:
-            shift_radiation_time = -np.timedelta64(30, "m")
+        shift_radiation_time = -np.timedelta64(30, "m")
 
     elif dataset == "ERA5" and product == "ensemble":
         shift_radiation_time = -np.timedelta64(90, "m")
@@ -1893,8 +1971,8 @@ def calc_shortwave_radiation(
     Raises
     ------
     ValueError
-        If ``rad`` does not contain ``"toa_upward_shortwave_flux"`` or
-        ``"top_net_solar_radiation"`` variable.
+        If ``rad`` does not contain ``"toa_net_downward_shortwave_flux"``,
+        ``"toa_upward_shortwave_flux"`` or ``"top_net_solar_radiation"`` variable.
 
     Notes
     -----
@@ -1918,6 +1996,13 @@ def calc_shortwave_radiation(
         sdr = geo.solar_direct_radiation(longitude, latitude, time, threshold_cos_sza=0.01)
         vector["sdr"] = sdr
 
+    # Generic contains net downward shortwave flux at TOA (SDR - RSR) in W/m2
+    generic_key = "toa_net_downward_shortwave_flux"
+    if generic_key in rad:
+        tnsr = interpolate_met(rad, vector, generic_key, **interp_kwargs)
+        vector["rsr"] = np.maximum(sdr - tnsr, 0.0)
+        return
+
     # GFS contains RSR (toa_upward_shortwave_flux) variable directly
     gfs_key = "toa_upward_shortwave_flux"
     if gfs_key in rad:
@@ -1926,10 +2011,13 @@ def calc_shortwave_radiation(
 
     ecmwf_key = "top_net_solar_radiation"
     if ecmwf_key not in rad:
-        msg = f"'rad' data must contain either '{gfs_key}' or '{ecmwf_key}' (ECMWF) variable."
+        msg = (
+            f"'rad' data must contain either '{generic_key}' (generic), "
+            f"'{gfs_key}' (GFS), or '{ecmwf_key}' (ECMWF) variable."
+        )
         raise ValueError(msg)
 
-    # ECMWF contains "top_net_solar_radiation" which is SDR - RSR
+    # ECMWF also contains net downward shortwave flux at TOA, but possibly as an accumulation
     tnsr = interpolate_met(rad, vector, ecmwf_key, **interp_kwargs)
     tnsr = _rad_accumulation_to_average_instantaneous(rad, ecmwf_key, tnsr)
     vector.update({ecmwf_key: tnsr})
@@ -1958,14 +2046,20 @@ def calc_outgoing_longwave_radiation(
     Raises
     ------
     ValueError
-        If ``rad`` does not contain a ``"toa_upward_longwave_flux"``
-        or ``"top_net_thermal_radiation"`` variable.
+        If ``rad`` does not contain a ``"toa_outgoing_longwave_flux"``,
+        ``"toa_upward_longwave_flux"`` or ``"top_net_thermal_radiation"`` variable.
     """
 
     if "olr" in vector:
-        return None
+        return
 
-    # GFS contains OLR (toa_upward_longwave_flux) variable directly
+    # Generic contains OLR (toa_outgoing_longwave_flux) directly
+    generic_key = "toa_outgoing_longwave_flux"
+    if generic_key in rad:
+        interpolate_met(rad, vector, generic_key, "olr", **interp_kwargs)
+        return
+
+    # GFS contains OLR (toa_upward_longwave_flux) directly
     gfs_key = "toa_upward_longwave_flux"
     if gfs_key in rad:
         interpolate_met(rad, vector, gfs_key, "olr", **interp_kwargs)
@@ -1974,7 +2068,10 @@ def calc_outgoing_longwave_radiation(
     # ECMWF contains "top_net_thermal_radiation" which is -1 * OLR
     ecmwf_key = "top_net_thermal_radiation"
     if ecmwf_key not in rad:
-        msg = f"'rad' data must contain either '{gfs_key}' or '{ecmwf_key}' (ECMWF) variable."
+        msg = (
+            f"'rad' data must contain either '{generic_key}' (generic), "
+            f"'{gfs_key}' (GFS), or '{ecmwf_key}' (ECMWF) variable."
+        )
         raise ValueError(msg)
 
     tntr = interpolate_met(rad, vector, ecmwf_key, **interp_kwargs)

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

@@ -2259,3 +2259,4 @@ def compare_cocip_with_goes(
         plt.close()
 
         return output_path
+    return None

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