cloudnetpy 1.96.1__tar.gz → 1.96.3__tar.gz

{cloudnetpy-1.96.1/cloudnetpy.egg-info → cloudnetpy-1.96.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.96.1
+Version: 1.96.3
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -43,7 +43,7 @@ Requires-Dist: ceilopyter>=0.2.0
 Requires-Dist: cloudnet-api-client
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
-Requires-Dist: mwrpy>=1.3.5
+Requires-Dist: mwrpy>=1.7.0
 Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/attenuations/__init__.py

@@ -31,7 +31,7 @@ def calc_two_way_attenuation(
     """Calculates two-way attenuation (dB) for given specific attenuation
     (dB km-1) and height above ground level (m).
     """
-    path_lengths = path_lengths_from_ground(height_agl) * con.M_TO_KM  # km
+    path_lengths = path_lengths_from_ground(height_agl) * con.M_TO_KM
     one_way_attenuation = specific_attenuation * path_lengths
     accumulated_attenuation = ma.cumsum(one_way_attenuation, axis=1)
-    return accumulated_attenuation * con.TWO_WAY
+    return accumulated_attenuation * 2  # two way

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/classify.py

@@ -1,5 +1,6 @@
 import numpy as np
 import numpy.typing as npt
+from atmoslib.constants import T0
 from numpy import ma
 from scipy import ndimage
 
@@ -18,7 +19,6 @@ from cloudnetpy.categorize.containers import (
     ClassificationResult,
     Observations,
 )
-from cloudnetpy.constants import T0
 from cloudnetpy.products.product_tools import CategoryBits, QualityBits
 
 

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/containers.py

@@ -4,10 +4,11 @@ from os import PathLike
 
 import numpy as np
 import numpy.typing as npt
+from atmoslib.constants import T0
 from numpy import ma
 
 from cloudnetpy import utils
-from cloudnetpy.constants import MM_H_TO_M_S, T0
+from cloudnetpy.constants import MM_H_TO_M_S
 from cloudnetpy.products.product_tools import CategoryBits
 
 from .disdrometer import Disdrometer

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/falling.py

@@ -2,11 +2,11 @@
 
 import numpy as np
 import numpy.typing as npt
+from atmoslib.constants import T0
 from numpy import ma
 
 from cloudnetpy.categorize import atmos_utils
 from cloudnetpy.categorize.containers import ClassData
-from cloudnetpy.constants import T0
 
 
 def find_falling_hydrometeors(

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/freezing.py

@@ -4,12 +4,12 @@ import logging
 
 import numpy as np
 import numpy.typing as npt
+from atmoslib.constants import T0
 from numpy import ma
 from scipy.interpolate import interp1d
 
 from cloudnetpy import utils
 from cloudnetpy.categorize.containers import ClassData
-from cloudnetpy.constants import T0
 
 
 def find_freezing_region(obs: ClassData, melting_layer: npt.NDArray) -> npt.NDArray:

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/insects.py

@@ -58,7 +58,9 @@ def _insect_probability(obs: ClassData) -> tuple[npt.NDArray, npt.NDArray]:
     prob_from_ldr = _calc_prob_from_ldr(prob)
     prob_from_others = _calc_prob_from_all(prob)
     prob_from_others = _adjust_for_radar(obs, prob, prob_from_others)
-    prob_combined = _fill_missing_pixels(prob_from_ldr, prob_from_others)
+    prob_from_others = _adjust_for_lidar(obs, prob_from_others)
+    is_ldr = ~ma.getmaskarray(obs.ldr) if hasattr(obs, "ldr") else None
+    prob_combined = _fill_missing_pixels(prob_from_ldr, prob_from_others, is_ldr)
     return prob_combined, prob_from_others
 
 
@@ -147,11 +149,31 @@ def _adjust_for_radar(
     return prob_from_others
 
 
+def _adjust_for_lidar(
+    obs: ClassData,
+    prob_from_others: npt.NDArray,
+    weight: float = 0.8,
+) -> npt.NDArray:
+    """Reduces probability above the lidar signal, where liquid may be hidden."""
+    is_beta = ~ma.getmaskarray(obs.beta)
+    n_gates = is_beta.shape[1]
+    top = n_gates - np.argmax(is_beta[:, ::-1], axis=1)
+    top[~is_beta.any(axis=1)] = 0
+    above_lidar = np.arange(n_gates)[np.newaxis, :] >= top[:, np.newaxis]
+    prob_from_others[above_lidar] *= weight
+    return prob_from_others
+
+
 def _fill_missing_pixels(
     prob_from_ldr: npt.NDArray,
     prob_from_others: npt.NDArray,
+    is_ldr: npt.NDArray | None = None,
 ) -> npt.NDArray:
-    return np.maximum(prob_from_ldr, prob_from_others)
+    """Combines probabilities trusting measured ldr over other parameters."""
+    prob = np.maximum(prob_from_ldr, prob_from_others)
+    if is_ldr is not None:
+        prob[is_ldr] = prob_from_ldr[is_ldr]
+    return prob
 
 
 def _screen_insects(

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/melting.py

@@ -2,13 +2,17 @@
 
 import numpy as np
 import numpy.typing as npt
+from atmoslib.constants import T0
 from numpy import ma
 from scipy.ndimage import gaussian_filter
 
 from cloudnetpy import utils
 from cloudnetpy.categorize import droplet
 from cloudnetpy.categorize.containers import ClassData
-from cloudnetpy.constants import T0
+
+MIN_LAPSE_RATE = 0.004  # K m-1
+MIN_LDR_COVERAGE = 0.5
+T0_TOLERANCE = 1  # K
 
 
 def find_melting_layer(obs: ClassData, *, smooth: bool = True) -> npt.NDArray:
@@ -27,11 +31,15 @@ def find_melting_layer(obs: ClassData, *, smooth: bool = True) -> npt.NDArray:
     The peak in *ldr* is the primary parameter we analyze. If
     *ldr* has a proper peak, and *v* < -1 m/s in the base, melting layer
     has been found. If *ldr* is missing we only analyze the behaviour
-    of *v*, which is always present, to detect the melting layer.
+    of *v*, which is always present, to detect the melting layer. If *ldr*
+    covers the profile but shows no peak, there is no melting layer.
 
     Model temperature is used to limit the melting layer search to a certain
     temperature range around 0 C. For ECMWF the range is -4..+3, and for
-    the rest -8..+6.
+    the rest -8..+6. Model temperature must also reach -1 C in the profile,
+    and the search is limited in altitude above the highest 0 C level,
+    because in temperature inversions the temperature range alone may
+    span several kilometers.
 
     Notes:
         This melting layer detection method is novel and needs to be validated.
@@ -63,7 +71,7 @@ def find_melting_layer(obs: ClassData, *, smooth: bool = True) -> npt.NDArray:
     t_range = _find_model_temperature_range(obs.model_type)
 
     for ind, t_prof in enumerate(obs.tw):
-        temp_indices = _get_temp_indices(t_prof, t_range)
+        temp_indices = _get_temp_indices(t_prof, t_range, obs.height)
         if len(temp_indices) <= 1:
             continue
         z_prof = obs.z[ind, temp_indices]
@@ -90,6 +98,8 @@ def find_melting_layer(obs: ClassData, *, smooth: bool = True) -> npt.NDArray:
                     z_prof,
                 )
             except (ValueError, IndexError, AssertionError):
+                if _has_ldr_coverage(ldr_prof, v_prof):
+                    continue
                 height = obs.height[temp_indices]
                 if hasattr(obs, "width"):
                     width_prof = obs.width[ind, temp_indices]
@@ -104,6 +114,16 @@ def find_melting_layer(obs: ClassData, *, smooth: bool = True) -> npt.NDArray:
     return melting_layer
 
 
+def _has_ldr_coverage(ldr_prof: npt.NDArray | None, v_prof: npt.NDArray) -> bool:
+    """Checks if ldr covers enough of the profile to rule out melting layer."""
+    if ldr_prof is None:
+        return False
+    is_v = ~ma.getmaskarray(v_prof)
+    is_ldr = ~ma.getmaskarray(ldr_prof)
+    n_ldr = np.count_nonzero(is_ldr & is_v)
+    return bool(n_ldr >= MIN_LDR_COVERAGE * np.count_nonzero(is_v))
+
+
 def _find_melting_layer_from_ldr(
     ldr_prof: npt.NDArray,
     ldr_dprof: npt.NDArray,
@@ -166,12 +186,28 @@ def _basetop(dprof: npt.NDArray, pind: int) -> tuple[int, int]:
     return base, top
 
 
-def _get_temp_indices(t_prof: npt.NDArray, t_range: tuple) -> npt.NDArray:
+def _get_temp_indices(
+    t_prof: npt.NDArray, t_range: tuple, height: npt.NDArray | None = None
+) -> npt.NDArray:
     """Finds indices of temperature profile covering the given range."""
-    ind = np.where((t_prof > min(t_range) + T0) & (t_prof < max(t_range) + T0))[0]
+    in_range = (t_prof > min(t_range) + T0) & (t_prof < max(t_range) + T0)
+    if height is not None:
+        in_range &= height <= _find_max_height(t_prof, t_range, height)
+    ind = np.where(in_range)[0]
     return np.array([]) if len(ind) == 0 else np.arange(np.min(ind), np.max(ind) + 1)
 
 
+def _find_max_height(t_prof: npt.NDArray, t_range: tuple, height: npt.NDArray) -> float:
+    """Finds maximum melting layer height assuming realistic lapse rate."""
+    warm = np.where(t_prof >= T0)[0]
+    if len(warm) == 0:
+        # Model may be slightly too cold when melting layer is near the ground
+        warm = np.where(t_prof >= T0 - T0_TOLERANCE)[0]
+    if len(warm) == 0:
+        return -np.inf
+    return height[warm[-1]] - min(t_range) / MIN_LAPSE_RATE
+
+
 def _find_model_temperature_range(model_type: str) -> tuple[float, float]:
     """Returns temperature range around 0C for given model type."""
     if model_type == "gdas1":

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/categorize/radar.py

@@ -7,11 +7,10 @@ from os import PathLike
 import numpy as np
 import numpy.typing as npt
 from numpy import ma
-from scipy import constants
 
 from cloudnetpy import utils
 from cloudnetpy.categorize.attenuations import RadarAttenuation
-from cloudnetpy.constants import GHZ_TO_HZ, SEC_IN_HOUR, SPEED_OF_LIGHT
+from cloudnetpy.constants import GHZ_TO_HZ, LN_TO_DB, SEC_IN_HOUR, SPEED_OF_LIGHT
 from cloudnetpy.datasource import DataSource
 
 
@@ -265,8 +264,7 @@ class Radar(DataSource):
             """
             noise_threshold = 3
             n_pulses = _number_of_independent_pulses()
-            ln_to_log10 = 10 / np.log(10)
-            z_precision = ma.divide(ln_to_log10, np.sqrt(n_pulses)) * (
+            z_precision = ma.divide(LN_TO_DB, np.sqrt(n_pulses)) * (
                 1 + (utils.db2lin(z_power_min - z_power) / noise_threshold)
             )
 
@@ -439,8 +437,7 @@ class Radar(DataSource):
 
 
 def _prf_to_folding_velocity(prf: npt.NDArray, radar_frequency: float) -> npt.NDArray:
-    ghz_to_hz = 1e9
     if len(prf) != 1:
         msg = "Unable to determine folding velocity"
         raise RuntimeError(msg)
-    return prf[0] * constants.c / (4 * radar_frequency * ghz_to_hz)
+    return prf[0] * SPEED_OF_LIGHT / (4 * radar_frequency * GHZ_TO_HZ)

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/cli.py

@@ -928,9 +928,11 @@ def main() -> None:
     )
     parser.add_argument(
         "--show",
-        help="Show plotted image",
+        nargs="?",
+        const=True,
         default=False,
-        action=argparse.BooleanOptionalAction,
+        metavar="VARIABLES",
+        help="Show plotted image, optionally only given variables (comma-separated)",
     )
     parser.add_argument(
         "--dl",
@@ -980,6 +982,10 @@ def main() -> None:
         default=None,
     )
     args = parser.parse_args()
+    if isinstance(args.show, str):
+        if args.variables is None:
+            args.variables = args.show
+        args.show = True
 
     logger = logging.getLogger()
     logger.setLevel(logging.INFO)

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/constants.py

@@ -1,24 +1,21 @@
 """Constants used in Cloudnet processing."""
 
+import math
 from typing import Final
 
-# Triple point of water
-T0: Final = 273.16
+T_FREEZING: Final = 273.15
+"""Freezing point of water at standard pressure (K), i.e. 0 degrees Celsius"""
 
-# Ratio of the molecular weight of water vapor to dry air
-MW_RATIO: Final = 0.62198
-
-# Specific gas constant for dry  air (J kg-1 K-1)
-RS: Final = 287.058
-
-# ice density kg m-3
 RHO_ICE: Final = 917
+"""Ice density (kg m-3)"""
+
+RHO_WATER: Final = 1000
+"""Liquid water density (kg m-3)"""
 
-# Standard atmospheric pressure at sea level Pa
-P0: Final = 1013_25
+SPEED_OF_LIGHT: Final = 299_792_458
+"""Speed of light in vacuum (m s-1)"""
 
-# other
-SPEED_OF_LIGHT: Final = 3.0e8
+# Unit conversions
 SEC_IN_MINUTE: Final = 60
 SEC_IN_HOUR: Final = 3600
 SEC_IN_DAY: Final = 86400
@@ -35,7 +32,10 @@ MM_H_TO_M_S: Final = 1 / M_S_TO_MM_H
 GHZ_TO_HZ: Final = 1e9
 HZ_TO_GHZ: Final = 1e-9
 HPA_TO_PA: Final = 100
-PA_TO_HPA: Final = 1 / HPA_TO_PA
 KM_H_TO_M_S: Final = 1000 / SEC_IN_HOUR
-TWO_WAY: Final = 2
-G: Final = 9.80665
+
+CM_TO_KG_M2: Final = 10
+"""Liquid water equivalent cm to kg m-2"""
+
+LN_TO_DB: Final = 10 / math.log(10)
+"""Natural logarithm of a power ratio to decibels"""

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/disdronator/parsivel.py

@@ -9,6 +9,7 @@ import netCDF4
 import numpy as np
 import numpy.typing as npt
 
+from cloudnetpy.constants import M_S_TO_MM_H
 from cloudnetpy.disdronator.process import DisdroL1
 from cloudnetpy.disdronator.utils import convert_to_numpy
 
@@ -434,7 +435,7 @@ def _read_parsivel2nc(filename: str | PathLike) -> ParsivelOutput:
         time = cftime.num2pydate(nc["time"][:], units=nc["time"].units)
         data = {num: nc[key][:] for key, num in PARSIVEL2NC_KEYS.items()}
         # The data logger converts mm/h to m/s, so we need to revert this.
-        data[1] *= 3600 * 1000
+        data[1] *= M_S_TO_MM_H
         # The data logger attempts to convert temperature from °C to K, but this
         # is incorrectly done only for the first value.
         data[12][0] -= 273

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/disdronator/process.py

@@ -4,6 +4,7 @@ import numpy as np
 import numpy.typing as npt
 from numpy import ma
 
+from cloudnetpy import constants
 from cloudnetpy.disdronator.utils import make_rain_mask
 
 
@@ -63,10 +64,9 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
     area_mm2 = (
         l1.area_eff if l1.area_eff is not None else np.repeat(l1.area_nom, n_diameter)
     )
-    area_m2 = area_mm2 * 1e-6
-    diameter_m = l1.diameter / 1000
-    interval_h = interval / 3600
-    rho_w = 1e-6  # kg mm-3
+    area_m2 = area_mm2 * constants.MM2_TO_M2
+    diameter_m = l1.diameter * constants.MM_TO_M
+    interval_h = interval / constants.SEC_IN_HOUR
 
     if spec.ndim == 2:
         number_concentration = spec / (
@@ -81,10 +81,10 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
         energy_flux = (
             np.pi
             / 12
-            * rho_w
+            * constants.RHO_WATER
             * np.sum(
                 spec
-                * l1.diameter**3
+                * diameter_m**3
                 * l1.velocity**2
                 / (area_m2 * interval_h[:, np.newaxis]),
                 axis=1,
@@ -138,10 +138,10 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
         energy_flux = (
             np.pi
             / 12
-            * rho_w
+            * constants.RHO_WATER
             * np.sum(
                 spec_rain
-                * l1.diameter[:, np.newaxis] ** 3
+                * diameter_m[:, np.newaxis] ** 3
                 * l1.velocity**2
                 / (area_m2[:, np.newaxis] * interval_h[:, np.newaxis, np.newaxis]),
                 axis=(1, 2),

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/instruments/fd12p.py

@@ -9,6 +9,7 @@ import numpy as np
 from numpy import ma
 
 from cloudnetpy import output
+from cloudnetpy.constants import MM_H_TO_M_S, MM_TO_M
 from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CSVFile
@@ -122,11 +123,9 @@ class FD12P(CSVFile):
 
     def convert_units(self) -> None:
         precipitation_rate = self.data["precipitation_rate"][:]
-        self.data["precipitation_rate"].data = (
-            precipitation_rate / 3600 / 1000
-        )  # mm/h -> m/s
+        self.data["precipitation_rate"].data = precipitation_rate * MM_H_TO_M_S
         for key in ("precipitation_amount", "snowfall_amount"):
-            self.data[key].data = self.data[key][:] / 1000  # mm -> m
+            self.data[key].data = self.data[key][:] * MM_TO_M
 
     def screen_all_masked(self) -> None:
         is_valid = np.ones_like(self.data["time"][:], dtype=np.bool_)

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/instruments/hatpro.py

@@ -69,8 +69,8 @@ def hatpro2l1c(
 
     try:
         hatpro_raw = lev1_to_nc(
-            "1C01",
-            str(mwr_dir),
+            data_type="1C01",
+            path_to_files=str(mwr_dir),
             instrument_type=instrument_type,
             output_file=str(output_file),
             lidar_path=lidar_file,

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/instruments/mwr3c.py

@@ -10,6 +10,7 @@ import numpy as np
 from numpy import ma
 
 from cloudnetpy import output, utils
+from cloudnetpy.constants import CM_TO_KG_M2
 from cloudnetpy.datasource import DataSource
 from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments.arm_utils import concatenate_files, read_geolocation
@@ -17,7 +18,6 @@ from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
 from cloudnetpy.instruments.instruments import MWR3C
 from cloudnetpy.metadata import COMMON_ATTRIBUTES
 
-CM_TO_KG_M2 = 10
 MISSING_VALUE = -9999
 MAX_OFF_ZENITH = 1.0  # deg
 RAW_VARIABLES = (

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/instruments/mwrlos.py

@@ -10,6 +10,7 @@ import numpy as np
 from numpy import ma
 
 from cloudnetpy import output, utils
+from cloudnetpy.constants import CM_TO_KG_M2
 from cloudnetpy.datasource import DataSource
 from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments.arm_utils import concatenate_files, read_geolocation
@@ -17,7 +18,6 @@ from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
 from cloudnetpy.instruments.instruments import WVR1100
 from cloudnetpy.metadata import COMMON_ATTRIBUTES
 
-CM_TO_KG_M2 = 10
 RAW_VARIABLES = ("time", "liq", "vap", "qc_liq", "qc_vap", "wet_window")
 
 

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/instruments/radiometrics.py

@@ -18,6 +18,7 @@ from numpy import ma
 
 from cloudnetpy import output, utils
 from cloudnetpy.cloudnetarray import CloudnetArray
+from cloudnetpy.constants import CM_TO_KG_M2, G_TO_KG
 from cloudnetpy.exceptions import InconsistentDataError, ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.metadata import MetaData
@@ -236,8 +237,8 @@ class RadiometricsMP:
             _process_superblock()
 
         self.data["time"] = np.array(times, dtype="datetime64[s]")
-        self.data["lwp"] = np.array(lwps)  # mm => kg m-2
-        self.data["iwv"] = np.array(iwvs) * 10  # cm => kg m-2
+        self.data["lwp"] = np.array(lwps)  # mm = kg m-2
+        self.data["iwv"] = np.array(iwvs) * CM_TO_KG_M2
         if irt_times:
             self.data["irt"] = _find_closest(
                 np.array(irt_times, dtype="datetime64[s]"),
@@ -259,7 +260,7 @@ class RadiometricsMP:
         if ah_times:
             self.data["absolute_humidity"] = _find_closest(
                 np.array(ah_times, dtype="datetime64[s]"),
-                np.array(ahs) / 1000,  # g m-3 => kg m-3
+                np.array(ahs) * G_TO_KG,  # g m-3 => kg m-3
                 self.data["time"],
             )
 
@@ -312,8 +313,8 @@ class RadiometricsWVR:
             ],
             dtype="datetime64[s]",
         )
-        self.data["lwp"] = np.array(self.raw_data["LiqCM"]) * 10  # cm => kg m-2
-        self.data["iwv"] = np.array(self.raw_data["VapCM"]) * 10  # cm => kg m-2
+        self.data["lwp"] = np.array(self.raw_data["LiqCM"]) * CM_TO_KG_M2
+        self.data["iwv"] = np.array(self.raw_data["VapCM"]) * CM_TO_KG_M2
         is_zenith = np.abs(np.array(self.raw_data["ELact"]) - 90.0) < 1.0
         tb23_valid = np.array(self.raw_data["TbSky23"]) > 0
         tb31_valid = np.array(self.raw_data["TbSky31"]) > 0

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/instruments/rain_e_h3.py

@@ -6,6 +6,7 @@ from uuid import UUID
 import numpy as np
 
 from cloudnetpy import output
+from cloudnetpy.constants import MM_H_TO_M_S, MM_TO_M
 from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CSVFile
@@ -165,7 +166,5 @@ class RainEH3(CSVFile):
 
     def convert_units(self) -> None:
         rainfall_rate = self.data["rainfall_rate"][:]
-        self.data["rainfall_rate"].data = rainfall_rate / 3600 / 1000  # mm/h -> m/s
-        self.data["rainfall_amount"].data = (
-            self.data["rainfall_amount"][:] / 1000
-        )  # mm -> m
+        self.data["rainfall_rate"].data = rainfall_rate * MM_H_TO_M_S
+        self.data["rainfall_amount"].data = self.data["rainfall_amount"][:] * MM_TO_M

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/instruments/weather_station.py

@@ -14,7 +14,13 @@ from numpy import ma
 
 from cloudnetpy import output
 from cloudnetpy.cloudnetarray import CloudnetArray
-from cloudnetpy.constants import HPA_TO_PA, MM_H_TO_M_S, SEC_IN_HOUR
+from cloudnetpy.constants import (
+    HPA_TO_PA,
+    MM_H_TO_M_S,
+    MM_TO_M,
+    SEC_IN_HOUR,
+    SEC_IN_MINUTE,
+)
 from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CSVFile
@@ -147,7 +153,9 @@ class WS(CSVFile):
         if "rainfall_rate" not in self.data:
             return
         rainfall_rate = self.data["rainfall_rate"][:]
-        self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
+        self.data["rainfall_rate"].data = (
+            rainfall_rate * MM_TO_M / SEC_IN_MINUTE
+        )  # mm/min -> m/s
 
     def convert_pressure(self) -> None:
         if "air_pressure" not in self.data:
@@ -249,9 +257,7 @@ class PalaiseauWS(WS):
             self.data[key] = CloudnetArray(array_masked, key)
 
     def convert_rainfall_amount(self) -> None:
-        self.data["rainfall_amount"].data = (
-            self.data["rainfall_amount"][:] / 1000
-        )  # mm -> m
+        self.data["rainfall_amount"].data = self.data["rainfall_amount"][:] * MM_TO_M
 
     def _validate_header(self, header: list[str]) -> None:
         column_titles = [row for row in header if "Col." in row]
@@ -710,7 +716,7 @@ class LimassolWS(WS):
     def convert_rainfall_rate(self) -> None:
         rainfall_rate = self.data["rainfall_rate"][:]
         self.data["rainfall_rate"].data = (
-            rainfall_rate / (10 * 60) / 1000
+            rainfall_rate * MM_TO_M / (10 * SEC_IN_MINUTE)
         )  # mm/(10 min) -> m/s
 
 

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/model_evaluation/plotting/plotting.py

@@ -18,6 +18,7 @@ from mpl_toolkits.axes_grid1 import make_axes_locatable
 from numpy import ma
 
 import cloudnetpy.model_evaluation.plotting.plot_tools as p_tools
+from cloudnetpy.constants import T_FREEZING
 from cloudnetpy.model_evaluation.plotting.plot_meta import ATTRIBUTES, PlotMeta
 from cloudnetpy.model_evaluation.statistics.statistical_methods import DayStatistics
 from cloudnetpy.plotting.plotting import (
@@ -205,7 +206,7 @@ def plot_colormesh(
         data = data.T
     vmin, vmax = variable_info.plot_range
     if variable_info.clabel == "\u00b0C":
-        data = data - 273.15
+        data = data - T_FREEZING
     if variable_info.plot_scale == "logarithmic":
         data, vmin, vmax = lin2log(data, vmin, vmax)
     cmap = plt.get_cmap(variable_info.cbar, 22)

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/model_evaluation/products/advance_methods.py

@@ -5,6 +5,7 @@ import scipy.stats
 from numpy import ma
 
 import cloudnetpy.utils as cl_tools
+from cloudnetpy.constants import T_FREEZING
 from cloudnetpy.model_evaluation.model_metadata import MODEL_PREFIX
 from cloudnetpy.model_evaluation.products.model_products import ModelManager
 from cloudnetpy.model_evaluation.products.observation_products import ObservationManager
@@ -49,7 +50,7 @@ class AdvanceProductMethods:
         cf = self.getvar_from_object("cf")
         h = self.getvar_from_object("h")
         temperature = self._model_obj.getvar("temperature")
-        t_screened = self.remove_extra_levels(temperature - 273.15)
+        t_screened = self.remove_extra_levels(temperature - T_FREEZING)
         iwc, lwc = (self._model_obj.get_water_content(var) for var in ["iwc", "lwc"])
         coeffs = self.set_frequency_parameters()
         z_sen = self.fit_z_sensitivity(h)

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/model_evaluation/products/model_products.py

@@ -3,9 +3,9 @@ from os import PathLike
 
 import numpy as np
 import numpy.typing as npt
+from atmoslib.constants import RS
 from numpy import ma
 
-from cloudnetpy.constants import RS
 from cloudnetpy.datasource import DataSource
 from cloudnetpy.exceptions import ModelDataError
 from cloudnetpy.model_evaluation.model_metadata import (

{cloudnetpy-1.96.1 → cloudnetpy-1.96.3}/cloudnetpy/model_evaluation/tests/unit/test_model_products.py

@@ -3,7 +3,7 @@ import numpy as np
 import pytest
 from numpy import testing
 
-from cloudnetpy.constants import RS
+from atmoslib.constants import RS
 from cloudnetpy.exceptions import ModelDataError
 from cloudnetpy.model_evaluation.products.model_products import ModelManager