cloudnetpy 1.85.5__tar.gz → 1.86.0__tar.gz

{cloudnetpy-1.85.5/cloudnetpy.egg-info → cloudnetpy-1.86.0}/PKG-INFO

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

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/categorize/containers.py

@@ -92,10 +92,18 @@ class ClassData:
         rain_from_disdrometer = self._find_rain_from_disdrometer()
         ind = ~rain_from_disdrometer.mask
         is_rain[ind] = rain_from_disdrometer[ind]
-        mask = ma.getmaskarray(self.tw)
-        first_valid_ind = np.nonzero(np.all(~mask, axis=0))[0][0]
-        is_positive_temp = self.tw[:, first_valid_ind] > T0 + 5  # Filter snowfall
-        return is_rain & is_positive_temp
+        # Filter out snowfall:
+        if (
+            self.data.disdrometer is not None
+            and "synop_WaWa" in self.data.disdrometer.data
+        ):
+            wawa = self.data.disdrometer.data["synop_WaWa"].data
+            liquid_rain_only = (wawa >= 57) & (wawa <= 68)
+        else:
+            mask = ma.getmaskarray(self.tw)
+            first_valid_ind = np.nonzero(np.all(~mask, axis=0))[0][0]
+            liquid_rain_only = self.tw[:, first_valid_ind] > T0 + 5
+        return is_rain & liquid_rain_only
 
     def _find_rain_from_radar_echo(self) -> npt.NDArray:
         first_gate_with_data = np.argmin(self.z.mask.all(axis=0))

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/categorize/disdrometer.py

@@ -24,14 +24,17 @@ class Disdrometer(DataSource):
 
     def interpolate_to_grid(self, time_grid: npt.NDArray) -> None:
         for key, array in self.data.items():
+            method = "nearest" if key == "synop_WaWa" else "linear"
             self.data[key].data = interpolate_1d(
-                self.time, array.data, time_grid, max_time=1
+                self.time, array.data, time_grid, max_time=1, method=method
             )
 
     def _init_rainfall_rate(self) -> None:
-        keys = ("rainfall_rate", "n_particles")
+        keys = ("rainfall_rate", "n_particles", "synop_WaWa")
         for key in keys:
             if key not in self.dataset.variables:
+                if key == "synop_WaWa":
+                    continue
                 msg = f"variable {key} is missing"
                 raise DisdrometerDataError(msg)
             self.append_data(self.dataset.variables[key][:], key)

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/instruments/fd12p.py

@@ -198,7 +198,4 @@ ATTRIBUTES = {
         comment="Cumulated snow since 00:00 UTC",
         dimensions=("time",),
     ),
-    "synop_WaWa": MetaData(
-        long_name="Synop code WaWa", units="1", dimensions=("time",)
-    ),
 }

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/metadata.py

@@ -224,4 +224,7 @@ COMMON_ATTRIBUTES = {
         comment="SNR threshold used in data screening.",
         dimensions=None,
     ),
+    "synop_WaWa": MetaData(
+        long_name="Synop code WaWa", units="1", dimensions=("time",)
+    ),
 }

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/plotting/plot_meta.py

@@ -564,7 +564,7 @@ ATTRIBUTES = {
             plot_range=(0, 5),
         ),
         "radar_rain_atten": PlotMeta(
-            plot_range=(0, 5),
+            plot_range=(0, 15),
         ),
         "radar_melting_atten": PlotMeta(
             plot_range=(0, 5),

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/products/classification.py

@@ -11,6 +11,7 @@ from numpy import ma
 
 from cloudnetpy import output, utils
 from cloudnetpy.categorize import atmos_utils
+from cloudnetpy.constants import M_S_TO_MM_H
 from cloudnetpy.datasource import DataSource
 from cloudnetpy.metadata import MetaData
 from cloudnetpy.products.product_tools import CategorizeBits, QualityBits
@@ -189,24 +190,36 @@ def _get_attenuation_classes(data_source: DataSource) -> AttenuationClass:
     rain_atten = _read_atten("radar_rain_atten")
     melting_atten = _read_atten("radar_melting_atten")
 
-    if (
-        "lwp" not in data_source.dataset.variables
-        or data_source.getvar("radar_frequency") < 90
-    ):
+    not_w_band = data_source.getvar("radar_frequency") < 90
+
+    if "lwp" not in data_source.dataset.variables or not_w_band:
         lwp = np.zeros(data_source.time.shape)
     else:
         lwp_data = data_source.getvar("lwp")
         lwp = lwp_data.filled(0) if isinstance(lwp_data, ma.MaskedArray) else lwp_data
 
+    if "rainfall_rate" not in data_source.dataset.variables or not_w_band:
+        rain_rate = np.zeros(data_source.time.shape)
+    else:
+        rain_data = data_source.getvar("rainfall_rate") * M_S_TO_MM_H
+        rain_rate = (
+            rain_data.filled(0) if isinstance(rain_data, ma.MaskedArray) else rain_data
+        )
+
     total_atten = liquid_atten + rain_atten + melting_atten
 
     threshold_moderate = 10  # dB
     threshold_severe = 15  # dB
     threshold_lwp = 1  # kg/m2
+    threshold_rain = 3  # mm/h
 
     small = total_atten > 0
     moderate = total_atten >= threshold_moderate
-    severe = (total_atten > threshold_severe) | (lwp[:, np.newaxis] > threshold_lwp)
+    severe = (
+        (total_atten > threshold_severe)
+        | (lwp[:, np.newaxis] > threshold_lwp)
+        | (rain_rate[:, np.newaxis] > threshold_rain)
+    )
 
     return AttenuationClass(small=small, moderate=moderate, severe=severe)
 

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/utils.py

@@ -420,7 +420,11 @@ def interpolate_2d_nearest(
 
 
 def interpolate_1d(
-    time: npt.NDArray, y: ma.MaskedArray, time_new: npt.NDArray, max_time: float
+    time: npt.NDArray,
+    y: ma.MaskedArray,
+    time_new: npt.NDArray,
+    max_time: float,
+    method: str = "linear",
 ) -> npt.NDArray:
     """1D linear interpolation preserving the mask.
 
@@ -430,6 +434,7 @@ def interpolate_1d(
         time_new: 1D array, new time coordinates.
         max_time: Maximum allowed gap in minutes. Values outside this gap will
             be masked.
+        method: Interpolation method, 'linear' (default) or 'nearest'.
     """
     if np.max(time) > 24 or np.min(time) < 0:
         msg = "Time vector must be in fraction hours between 0 and 24"
@@ -439,7 +444,7 @@ def interpolate_1d(
             return ma.masked_all(time_new.shape)
         time = time[~y.mask]
         y = y[~y.mask]
-    fun = interp1d(time, y, fill_value=(y[0], y[-1]), bounds_error=False)
+    fun = interp1d(time, y, kind=method, fill_value=(y[0], y[-1]), bounds_error=False)
     interpolated = ma.array(fun(time_new))
     bad_idx = get_gap_ind(time, time_new, max_time / 60)
 

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 85
-PATCH = 5
+MINOR = 86
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.85.5 → cloudnetpy-1.86.0/cloudnetpy.egg-info}/PKG-INFO

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