disdrodb 0.2.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

disdrodb/metadata/geolocation.py

@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
-
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------.
 """Metadata tools to verify/complete geolocation information."""
+
 import time
 
 import numpy as np
@@ -126,7 +125,7 @@ def infer_altitudes(lats, lons, dem="aster30m"):
         block_lons = lons[i : i + max_locations]
 
         # Create the list_coords string in the format "lat1,lon1|lat2,lon2|..."
-        list_coords = "|".join([f"{lat},{lon}" for lat, lon in zip(block_lats, block_lons)])
+        list_coords = "|".join([f"{lat},{lon}" for lat, lon in zip(block_lats, block_lons, strict=True)])
 
         # Define API URL
         url = f"https://api.opentopodata.org/v1/{dem}?locations={list_coords}&interpolation=nearest"

disdrodb/metadata/info.py

@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
-
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------.
 """Test Metadata Info Extraction."""
+
 import os
-from typing import Optional
 
 from disdrodb.api.info import (
     infer_campaign_name_from_path,
@@ -29,7 +27,7 @@ from disdrodb.metadata.reader import read_station_metadata
 from disdrodb.metadata.search import get_list_metadata
 
 
-def get_archive_metadata_key_value(key: str, return_tuple: bool = True, metadata_archive_dir: Optional[str] = None):
+def get_archive_metadata_key_value(key: str, return_tuple: bool = True, metadata_archive_dir: str | None = None):
     """Return the values of a metadata key for all the archive.
 
     Parameters

disdrodb/metadata/manipulation.py

@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
-
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

disdrodb/metadata/reader.py

@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
-
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

disdrodb/metadata/search.py

@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
-
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +16,6 @@
 # -----------------------------------------------------------------------------.
 """Routines to manipulate the DISDRODB Metadata Archive."""
 
-
 from disdrodb.api.path import define_metadata_filepath
 from disdrodb.api.search import available_stations
 

disdrodb/metadata/standards.py

@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
-
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

disdrodb/metadata/writer.py

@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
-
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

disdrodb/physics/__init__.py

@@ -0,0 +1,17 @@
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2026 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+"""DISDRODB physics module."""

disdrodb/physics/atmosphere.py

@@ -0,0 +1,273 @@
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2026 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+"""DISDRODB atmospheric physics module."""
+
+import numpy as np
+import xarray as xr
+
+
+def get_gravitational_acceleration(latitude, altitude=0):
+    """
+    Computes gravitational acceleration at a given altitude and latitude.
+
+    Parameters
+    ----------
+    altitude : float
+        Altitude in meters. The default is 0 m (sea level).
+    latitude : float
+        Latitude in degrees.
+
+    Returns
+    -------
+    float
+        Gravitational acceleration in m/s^2.
+    """
+    g0 = 9.806229 - 0.025889372 * np.cos(2 * np.deg2rad(latitude))
+    return g0 - 2.879513 * altitude / 1e6
+
+
+def get_air_pressure_at_height(
+    altitude,
+    latitude,
+    temperature,
+    sea_level_air_pressure=101_325,
+    lapse_rate=0.0065,
+    gas_constant_dry_air=287.04,
+):
+    """
+    Computes the air pressure at a given height in a standard atmosphere.
+
+    According to the hypsometric formula of Brutsaert 1982; Ulaby et al. 1981
+
+    Parameters
+    ----------
+    altitude : float
+        Altitude in meters.
+    latitude : float
+        Latitude in degrees.
+    temperature : float
+        Temperature at altitude in Kelvin.
+    sea_level_air_pressure : float, optional
+        Standard atmospheric pressure at sea level in Pascals. The default is 101_325 Pascals.
+    lapse_rate : float, optional
+        Standard atmospheric lapse rate in K/m. The default is 0.0065 K/m.
+    gas_constant_dry_air : float, optional
+        Gas constant for dry air in J/(kg*K). The default is 287.04 J/(kg*K).
+
+    Returns
+    -------
+    float
+        Air pressure in Pascals.
+    """
+    g = get_gravitational_acceleration(altitude=altitude, latitude=latitude)
+    return sea_level_air_pressure * np.exp(
+        -g / (lapse_rate * gas_constant_dry_air) * np.log(1 + lapse_rate * altitude / temperature),
+    )
+
+
+def get_air_temperature_at_height(altitude, sea_level_temperature, lapse_rate=0.0065):
+    """
+    Computes the air temperature at a given height in a standard atmosphere.
+
+    Reference: Brutsaert 1982; Ulaby et al. 1981
+
+    Parameters
+    ----------
+    altitude : float
+        Altitude in meters.
+    sea_level_temperature : float
+        Standard temperature at sea level in Kelvin.
+    lapse_rate : float, optional
+        Standard atmospheric lapse rate in K/m. The default is 0.0065 K/m.
+
+    Returns
+    -------
+    float
+        Air temperature in Kelvin.
+    """
+    return sea_level_temperature - lapse_rate * altitude
+
+
+def get_air_dynamic_viscosity(temperature):
+    """
+    Computes the dynamic viscosity of dry air.
+
+    Reference: Beard 1977; Pruppacher & Klett 1978
+
+    Parameters
+    ----------
+    temperature : float
+        Temperature in Kelvin.
+
+    Returns
+    -------
+    float
+        Dynamic viscosity of dry air in kg/(m*s) (aka Pa*s).
+    """
+    # Convert to Celsius
+    temperature = temperature - 273.15
+
+    # Define mask
+    above_freezing_mask = temperature > 0
+
+    # Compute viscosity above freezing temperature
+    viscosity_above_0 = (1.721 + 0.00487 * temperature) / 1e5
+
+    # Compute viscosity below freezing temperature
+    viscosity_below_0 = (1.718 + 0.0049 * temperature - 1.2 * temperature**2 / 1e5) / 1e5
+
+    # Define final viscosity
+    viscosity = xr.where(above_freezing_mask, viscosity_above_0, viscosity_below_0)
+    return viscosity
+
+
+def get_air_density(temperature, air_pressure, vapor_pressure, gas_constant_dry_air=287.04):
+    """
+    Computes the air density according to the equation of state for moist air.
+
+    Reference: Brutsaert 1982
+
+    Parameters
+    ----------
+    temperature : float
+        Temperature in Kelvin.
+    air_pressure : float
+        Air pressure in Pascals.
+    vapor_pressure : float
+        Vapor pressure in Pascals.
+    gas_constant_dry_air : float, optional
+        Gas constant for dry air in J/(kg*K). The default is 287.04 J/(kg*K).
+
+    Returns
+    -------
+    float
+        Air density in kg/m^3.
+    """
+    # # Define constant for water vapor in J/(kg·K)
+    # gas_constant_water_vapor=461.5
+
+    # # Partial pressure of dry air (Pa)
+    # pressure_dry_air = air_pressure - vapor_pressure
+
+    # # Density of dry air (kg/m^3)
+    # density_dry_air = pressure_dry_air / (gas_constant_dry_air * temperature)
+
+    # # Density of water vapor (kg/m^3)
+    # density_water_vapor = vapor_pressure / (gas_constant_water_vapor * temperature)
+
+    # # Total air density (kg/m^3)
+    # air_density = density_dry_air + density_water_vapor
+
+    return air_pressure * (1 - 0.378 * vapor_pressure / air_pressure) / (gas_constant_dry_air * temperature)
+
+
+def get_vapor_actual_pressure_at_height(
+    altitude,
+    sea_level_temperature,
+    sea_level_relative_humidity,
+    sea_level_air_pressure=101_325,
+    lapse_rate=0.0065,
+):
+    """
+    Computes the vapor pressure using Yamamoto's exponential relationship.
+
+    Reference: Brutsaert 1982
+
+    Parameters
+    ----------
+    altitude : float
+        Altitude in meters.
+    sea_level_temperature : float
+        Standard temperature at sea level in Kelvin.
+    sea_level_relative_humidity : float
+        Relative humidity at sea level. A value between 0 and 1.
+    sea_level_air_pressure : float, optional
+        Standard atmospheric pressure at sea level in Pascals. The default is 101_325 Pascals.
+    lapse_rate : float, optional
+        Standard atmospheric lapse rate in K/m. The default is 0.0065 K/m.
+
+    Returns
+    -------
+    float
+        Vapor pressure in Pascals.
+    """
+    temperature_at_altitude = get_air_temperature_at_height(
+        altitude=altitude,
+        sea_level_temperature=sea_level_temperature,
+        lapse_rate=lapse_rate,
+    )
+    esat = get_vapor_saturation_pressure(sea_level_temperature)
+    actual_vapor = sea_level_relative_humidity / (1 / esat - (1 - sea_level_relative_humidity) / sea_level_air_pressure)
+    return actual_vapor * np.exp(-(5.8e3 * lapse_rate / (temperature_at_altitude**2) + 5.5e-5) * altitude)
+
+
+def get_vapor_saturation_pressure(temperature):
+    """
+    Computes the saturation vapor pressure over water as a function of temperature.
+
+    Use formulation and coefficients of Wexler (1976, 1977).
+    References: Brutsaert 1982; Pruppacher & Klett 1978; Flatau & al. 1992
+
+    Parameters
+    ----------
+    temperature : float
+        Temperature in Kelvin.
+
+    Returns
+    -------
+    float
+        Saturation vapor pressure in Pascal.
+    """
+    # Polynomial coefficients
+    g = [
+        -0.29912729e4,
+        -0.60170128e4,
+        0.1887643854e2,
+        -0.28354721e-1,
+        0.17838301e-4,
+        -0.84150417e-9,
+        0.44412543e-12,
+        0.2858487e1,
+    ]
+    # Perform polynomial accumulation using Horner rule
+    esat = g[6]
+    for i in [5, 4, 3, 2]:
+        esat = esat * temperature + g[i]
+    esat = esat + g[7] * np.log(temperature)
+    for i in [1, 0]:
+        esat = esat * temperature + g[i]
+    return np.exp(esat / (temperature**2))
+
+
+def get_vapor_actual_pressure(relative_humidity, temperature):
+    """
+    Computes the actual vapor pressure over water.
+
+    Parameters
+    ----------
+    relative_humidity : float
+        Relative humidity. A value between 0 and 1.
+    temperature : float
+        Temperature in Kelvin.
+
+    Returns
+    -------
+    float
+        Actual vapor pressure in Pascal.
+    """
+    esat = get_vapor_saturation_pressure(temperature)
+    return relative_humidity * esat

disdrodb/physics/water.py

@@ -0,0 +1,131 @@
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2026 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+"""DISDRODB water physics module."""
+
+import numpy as np
+import xarray as xr
+
+
+def get_pure_water_density(temperature):
+    """
+    Computes the density of pure water at standard pressure.
+
+    For temperatures above freezing uses Kell formulation.
+    For temperatures below freezing use Dorsch & Boyd formulation.
+
+    References: Pruppacher & Klett 1978; Weast & Astle 1980
+
+    Parameters
+    ----------
+    temperature : float
+        Temperature in Kelvin.
+
+    Returns
+    -------
+    float
+        Density of pure water in kg/m^3.
+    """
+    # Convert to Celsius
+    temperature = temperature - 273.15
+
+    # Define mask
+    above_freezing_mask = temperature > 0
+
+    # Compute density above freezing temperature
+    c = [9.9983952e2, 1.6945176e1, -7.9870401e-3, -4.6170461e-5, 1.0556302e-7, -2.8054253e-10, 1.6879850e-2]
+    density = c[0] + sum(c * temperature**i for i, c in enumerate(c[1:6], start=1))
+    density_above_0 = density / (1 + c[6] * temperature)
+
+    # Compute density below freezing temperature
+    c = [999.84, 0.086, -0.0108]
+    density_below_0 = c[0] + sum(c * temperature**i for i, c in enumerate(c[1:], start=1))
+
+    # Define final density
+    density = xr.where(above_freezing_mask, density_above_0, density_below_0)
+    return density
+
+
+def get_pure_water_compressibility(temperature):
+    """
+    Computes the isothermal compressibility of pure ordinary water.
+
+    Reference: Kell, Weast & Astle 1980
+
+    Parameters
+    ----------
+    temperature : float
+        Temperature in Kelvin.
+
+    Returns
+    -------
+    float
+        Compressibility of water in Pascals.
+    """
+    # Convert to Celsius
+    temperature = temperature - 273.15
+
+    # Compute compressibility
+    c = [5.088496e1, 6.163813e-1, 1.459187e-3, 2.008438e-5, -5.857727e-8, 4.10411e-10, 1.967348e-2]
+    compressibility = c[0] + sum(c * temperature**i for i, c in enumerate(c[1:6], start=1))
+    compressibility = compressibility / (1 + c[6] * temperature) * 1e-11
+    return compressibility
+
+
+def get_pure_water_surface_tension(temperature):
+    """
+    Computes the surface tension of pure ordinary water against air.
+
+    Reference: Pruppacher & Klett 1978
+
+    Parameters
+    ----------
+    temperature : float
+        Temperature in Kelvin.
+
+    Returns
+    -------
+    float
+        Surface tension in N/m.
+    """
+    sigma = 0.0761 - 0.000155 * (temperature - 273.15)
+    return sigma
+
+
+def get_water_density(temperature, air_pressure, sea_level_air_pressure=101_325):
+    """
+    Computes the density of water according to Weast & Astle 1980.
+
+    Parameters
+    ----------
+    temperature : float
+        Temperature in Kelvin.
+    air_pressure : float
+        Air pressure in Pascals.
+    sea_level_air_pressure : float
+        Standard atmospheric pressure at sea level in Pascals.
+        The default is 101_325 Pascal.
+    freezing_temperature : float, optional
+        Freezing temperature of water in Kelvin. The default is 273.15 K.
+
+    Returns
+    -------
+    float
+        Water density in kg/m^3.
+    """
+    delta_pressure = sea_level_air_pressure - air_pressure
+    water_compressibility = get_pure_water_compressibility(temperature)
+    return get_pure_water_density(temperature) * np.exp(-1 * water_compressibility * delta_pressure)

disdrodb/physics/wrappers.py

@@ -0,0 +1,63 @@
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2026 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+"""DISDRODB physics wrapper functions."""
+
+from disdrodb.physics.atmosphere import (
+    get_air_density,
+    get_air_dynamic_viscosity,
+    get_air_pressure_at_height,
+    get_vapor_actual_pressure,
+)
+
+
+####---------------------------------------------------------------------------.
+#### Wrappers
+def retrieve_air_pressure(ds_env):
+    """Retrieve air pressure."""
+    if "air_pressure" in ds_env:
+        return ds_env["air_pressure"]
+    air_pressure = get_air_pressure_at_height(
+        altitude=ds_env["altitude"],
+        latitude=ds_env["latitude"],
+        temperature=ds_env["temperature"],
+        sea_level_air_pressure=ds_env["sea_level_air_pressure"],
+        lapse_rate=ds_env["lapse_rate"],
+    )
+    return air_pressure
+
+
+def retrieve_air_dynamic_viscosity(ds_env):
+    """Retrieve air dynamic viscosity."""
+    air_viscosity = get_air_dynamic_viscosity(ds_env["temperature"])
+    return air_viscosity
+
+
+def retrieve_air_density(ds_env):
+    """Retrieve air density."""
+    temperature = ds_env["temperature"]
+    relative_humidity = ds_env["relative_humidity"]
+    air_pressure = retrieve_air_pressure(ds_env)
+    vapor_pressure = get_vapor_actual_pressure(
+        relative_humidity=relative_humidity,
+        temperature=temperature,
+    )
+    air_density = get_air_density(
+        temperature=temperature,
+        air_pressure=air_pressure,
+        vapor_pressure=vapor_pressure,
+    )
+    return air_density

disdrodb/psd/__init__.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
 # -----------------------------------------------------------------------------.
 """Implement PSD model and fitting routines."""
 
-
 from disdrodb.psd.fitting import estimate_model_parameters
 from disdrodb.psd.models import (
     ExponentialPSD,

disdrodb/psd/fitting.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------.
-# Copyright (c) 2021-2023 DISDRODB developers
+# Copyright (c) 2021-2026 DISDRODB developers
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------.
 """Routines for PSD fitting."""
+
 import numpy as np
 import scipy.stats as ss
 import xarray as xr
@@ -23,7 +24,7 @@ from scipy.optimize import minimize
 from scipy.special import gamma, gammaln  # Regularized lower incomplete gamma function
 
 from disdrodb.constants import DIAMETER_DIMENSION
-from disdrodb.l1.fall_velocity import get_raindrop_fall_velocity_from_ds
+from disdrodb.fall_velocity import get_rain_fall_velocity_from_ds
 from disdrodb.l2.empirical_dsd import (
     get_median_volume_drop_diameter,
     get_moment,
@@ -1056,14 +1057,26 @@ def _compute_z(ND, D, dD):
     return Z
 
 
-def _compute_target_variable_error(target, ND_obs, ND_preds, D, dD, V):
+def _compute_target_variable_error(target, ND_obs, ND_preds, D, dD, V, relative=False, eps=1e-12):
+    # Compute observed and predicted target variables
     if target == "Z":
-        errors = np.abs(_compute_z(ND_obs, D, dD) - _compute_z(ND_preds, D, dD))
+        obs = _compute_z(ND_obs, D, dD)
+        pred = _compute_z(ND_preds, D, dD)
     elif target == "R":
-        errors = np.abs(_compute_rain_rate(ND_obs, D, dD, V) - _compute_rain_rate(ND_preds, D, dD, V))
-    else:  # if target == "LWC":
-        errors = np.abs(_compute_lwc(ND_obs, D, dD) - _compute_lwc(ND_preds, D, dD))
-    return errors
+        obs = _compute_rain_rate(ND_obs, D, dD, V)
+        pred = _compute_rain_rate(ND_preds, D, dD, V)
+    else:  # "LWC"
+        obs = _compute_lwc(ND_obs, D, dD)
+        pred = _compute_lwc(ND_preds, D, dD)
+
+    # Absolute error
+    abs_error = np.abs(obs - pred)
+
+    # Return relative error if requested
+    if relative:
+        return abs_error / (np.abs(obs) + eps)
+
+    return abs_error
 
 
 def _compute_cost_function(ND_obs, ND_preds, D, dD, V, target, transformation, error_order):
@@ -1992,6 +2005,7 @@ ATTRS_PARAMS_DICT = {
     },
 }
 
+PSD_MODELS = list(ATTRS_PARAMS_DICT)
 
 MOM_METHODS_DICT = {
     "GammaPSD": {
@@ -2356,7 +2370,7 @@ def get_gs_parameters(ds, psd_model, target="ND", transformation="log", error_or
 
     # Check fall velocity is available if target R
     if "fall_velocity" not in ds:
-        ds["fall_velocity"] = get_raindrop_fall_velocity_from_ds(ds)
+        ds["fall_velocity"] = get_rain_fall_velocity_from_ds(ds)
 
     # Retrieve estimation function
     func = OPTIMIZATION_ROUTINES_DICT["GS"][psd_model]