cloudnetpy 1.97.3__tar.gz → 1.97.5__tar.gz

{cloudnetpy-1.97.3/cloudnetpy.egg-info → cloudnetpy-1.97.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.97.3
+Version: 1.97.5
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.97.3 → cloudnetpy-1.97.5}/cloudnetpy/disdronator/parsivel.py

@@ -1,4 +1,5 @@
 import datetime
+import logging
 import re
 from collections.abc import Sequence
 from os import PathLike
@@ -586,11 +587,13 @@ def read_parsivel_l1(
         msg = "No raw data"
         raise ValueError(msg)
     data_raw = np.swapaxes(l0[93], 1, 2)
-    interval = (
-        l0[9]
-        if 9 in l0
-        else np.median(np.diff(time.astype("datetime64[s]"))).astype(int)
-    )
+    if 9 in l0:
+        interval = l0[9]
+    else:
+        interval = np.median(np.diff(time.astype("datetime64[s]"))).astype(int)
+        logging.warning(
+            "Interval is not available, using mean time difference: %d s", interval
+        )
     return DisdroL1(
         diameter=D,
         diameter_bins=D_BINS,

{cloudnetpy-1.97.3 → cloudnetpy-1.97.5}/cloudnetpy/disdronator/process.py

@@ -1,3 +1,4 @@
+import datetime
 from dataclasses import dataclass
 
 import numpy as np
@@ -80,7 +81,7 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
         fall_velocity = ma.masked_where(spec == 0, np.tile(l1.velocity, (n_time, 1)))
         rain_amount = np.pi / 6 * np.sum(spec * l1.diameter**3 / area_mm2, axis=1)
         radar_refl = np.sum(
-            spec * l1.diameter**6 / (l1.velocity * area_m2 * interval_h[:, np.newaxis]),
+            spec * l1.diameter**6 / (l1.velocity * area_m2 * interval[:, np.newaxis]),
             axis=1,
         )
         energy_flux = (
@@ -167,7 +168,11 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
             )
         )
     rain_rate = rain_amount / interval_h
-    rain_accum = np.cumsum(rain_amount)
+
+    # Typically time_diff matches interval, but in Bucharest time_diff is 60 s
+    # and interval is 5 s as of 2026-11-11.
+    time_diff = np.median(np.diff(time) / datetime.timedelta(hours=1))
+    rain_accum = np.cumsum(rain_rate * time_diff)
 
     min_radar_refl = -10
     radar_refl_db = 10 * ma.log10(radar_refl)

{cloudnetpy-1.97.3 → cloudnetpy-1.97.5}/cloudnetpy/instruments/mira.py

@@ -43,7 +43,10 @@ def mira2nc(
         site_meta: Dictionary containing information about the site. Required
             key-value pair is `name`. Optional `model` takes `mira-35` (default),
             `mira-35s`, `mira-35c`, or `mira-10`. Optional `radar_constant` (dB)
-            is used to calculate Zh from SNRg in old files without Zg.
+            is used to calculate Zh from SNRg in old files without Zg. Optional
+            `zenith_angle` (deg) overrides the angle reported in the raw file.
+            Optional `zenith_offset` and `azimuth_offset` (deg) are added to the
+            angles reported in the raw file.
         uuid: Set specific UUID for the file.
         date: Expected date as YYYY-MM-DD of all profiles in the file.
 
@@ -89,6 +92,10 @@ def mira2nc(
                 # Empirical values, should be checked
                 snr_limit = -30 if mira.instrument == MIRA10 else -17
 
+            zenith = site_meta.get("zenith_angle")
+            if zenith is not None:
+                mira.override_elevation_angle(zenith=zenith)
+
             # Old MIRA files don't have angle variables.
             if "elevation" not in mira.data:
                 mira.append_data(ma.masked_all_like(mira.time.data), "elevation")
@@ -156,6 +163,13 @@ class Mira(NcRadar):
             output[key] = value.strip()
         return output
 
+    def override_elevation_angle(self, zenith: float) -> None:
+        if not isinstance(zenith, int | float) or zenith < -90 or zenith > 90:
+            msg = f"Invalid zenith angle: {zenith}"
+            raise ValueError(msg)
+        elevation = float(90 - zenith)
+        self.append_data(np.repeat(elevation, len(self.time)), "elevation")
+
     def add_radar_frequency(self) -> None:
         # XMT should always be present. In newer files, there's also
         # LO_frequency variable which doesn't match XMT exactly and sometimes

{cloudnetpy-1.97.3 → cloudnetpy-1.97.5}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 97
-PATCH = 3
+PATCH = 5
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.97.3 → cloudnetpy-1.97.5/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.97.3
+Version: 1.97.5
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License