cloudnetpy 1.85.4__tar.gz → 1.86.0__tar.gz

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

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

{cloudnetpy-1.85.4 → 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.4 → 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.4 → 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.4 → cloudnetpy-1.86.0}/cloudnetpy/instruments/mrr.py

@@ -104,6 +104,7 @@ def mrr2nc(
             if date:
                 mrr.screen_by_date(date)
             mrr.add_time_and_range()
+            mrr.fix_range()
             mrr.add_site_geolocation()
             mrr.add_zenith_angle()
             mrr.add_radar_specific_variables()
@@ -161,6 +162,12 @@ class MrrPro(NcRadar):
                 valid_indices.append(ind)
         self.screen_time_indices(valid_indices)
 
+    def fix_range(self) -> None:
+        # It seems like the "range" variable in MRR-PRO raw files is actually
+        # defined above mean sea level -> convert to range above ground level
+        range_data = self.data["range"].data
+        range_data -= range_data[0]
+
 
 ATTRIBUTES = {
     "lwc": MetaData(

{cloudnetpy-1.85.4 → 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.4 → cloudnetpy-1.86.0}/cloudnetpy/plotting/plot_meta.py

@@ -19,6 +19,7 @@ class PlotMeta(NamedTuple):
         moving_average: Whether to plot a moving average in a 1d plot.
         contour: Whether to plot contours on top of a filled colormap.
         zero_line: Whether to plot a zero line in a 1d plot.
+        mask_zero: Whether to mask zero values in the plot.
         time_smoothing_duration: The duration of the time smoothing window
             (in 2d plots) in minutes.
     """
@@ -30,6 +31,7 @@ class PlotMeta(NamedTuple):
     moving_average: bool = True
     contour: bool = False
     zero_line: bool = False
+    mask_zeros: bool = False
     time_smoothing_duration: int = 0
 
 
@@ -150,6 +152,7 @@ ATTRIBUTES = {
         "rainfall_rate": PlotMeta(
             cmap="Blues",
             plot_range=(0, 50 / 3600000),
+            mask_zeros=True,
         )
     },
     "mwr": {
@@ -390,6 +393,7 @@ ATTRIBUTES = {
         "number_concentration": PlotMeta(plot_range=(1e-2, 1e3), log_scale=True),
         "fall_velocity": PlotMeta(
             plot_range=(0, 10),
+            mask_zeros=True,
         ),
         "pressure": PlotMeta(
             plot_range=(1e4, 1.2e5),
@@ -560,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),
@@ -598,6 +602,7 @@ ATTRIBUTES = {
             cmap="Blues",
             plot_range=(1e-5, 1e-2),
             log_scale=True,
+            mask_zeros=True,
         ),
         "lwc_error": PlotMeta(
             cmap="RdYlGn_r",
@@ -608,6 +613,7 @@ ATTRIBUTES = {
         ),
         "pia": PlotMeta(
             plot_range=(0, 3),
+            mask_zeros=True,
         ),
         "lwp": PlotMeta(
             zero_line=True,

{cloudnetpy-1.85.4 → cloudnetpy-1.86.0}/cloudnetpy/plotting/plotting.py

@@ -362,6 +362,10 @@ class Plot:
         self._is_log = sub_plot.plot_meta.log_scale
         self._ax = sub_plot.ax
 
+    def _mask_zeros(self) -> None:
+        self._data = ma.masked_where(self._data == 0, self._data)
+        self._data_orig = ma.masked_where(self._data_orig == 0, self._data_orig)
+
     def _convert_units(self) -> str:
         multiply, add = "multiply", "add"
         units_conversion = {
@@ -491,6 +495,8 @@ class Plot:
 class Plot2D(Plot):
     def plot(self, figure_data: FigureData) -> None:
         self._convert_units()
+        if self._plot_meta.mask_zeros:
+            self._mask_zeros()
         if figure_data.file_type == "cpr-simulation":
             min_x, max_x = 0, EARTHCARE_MAX_X
         else:
@@ -693,6 +699,8 @@ class Plot1D(Plot):
             msg = "All data is masked"
             raise PlottingError(msg)
         units = self._convert_units()
+        if self._plot_meta.mask_zeros:
+            self._mask_zeros()
         self._mark_gaps(figure_data)
         self._ax.plot(
             figure_data.time_including_gaps,
@@ -823,6 +831,9 @@ class Plot1D(Plot):
         max_y = max_data + gap
         if min_y == 0 and max_y == 0:
             return fallback
+        if min_y == max_y:
+            gap = np.abs(min_y) * percent_gap
+            return min_y - gap, max_y + gap
         return min_y, max_y
 
     def _get_plot_options(self) -> dict:

{cloudnetpy-1.85.4 → 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.4 → 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.4 → cloudnetpy-1.86.0}/cloudnetpy/version.py

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

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

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