cloudnetpy 1.85.4__py3-none-any.whl → 1.86.0__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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.dist-info → cloudnetpy-1.86.0.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.86.0.dist-info}/RECORD

@@ -5,18 +5,18 @@ cloudnetpy/concat_lib.py,sha256=u4UOjYzLnThaq-89iwA837OcOJpfmj_3RmRwBCFUh74,1321
 cloudnetpy/constants.py,sha256=YnoSzZm35NDooJfhlulSJBc7g0eSchT3yGytRaTaJEI,845
 cloudnetpy/datasource.py,sha256=EMJ4UHD8Z-JJ9Q82S7RgU1I2q4Z0RcBzBMKUAIwnZBI,6356
 cloudnetpy/exceptions.py,sha256=ZB3aUwjVRznR0CcZ5sZHrB0yz13URDf52Ksv7G7C7EA,1817
-cloudnetpy/metadata.py,sha256=CFpXmdEkVPzvLPv2xHIR-aMMQ-TR26KfESYw-98j7sk,7213
+cloudnetpy/metadata.py,sha256=qqLXSUVhIi6H_Z1zlfXeEkc9qBqA1XO-UwsCVxjIcfk,7317
 cloudnetpy/output.py,sha256=0bybnILsgKHWIuw2GYkqTz2iMCJDZLUN25IQ9o_v3Cg,14968
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy/utils.py,sha256=x3hukn7wuOyF3ctG8EOhvLbSUHOVKLW9ez2LzTjeolU,33110
-cloudnetpy/version.py,sha256=LUOGWnVi7vV8k73yGc-QF9Xywl4hMvUVTdIAxQgjskA,72
+cloudnetpy/utils.py,sha256=XdQGPcQKTC40bf07hEujgJ5ac8j5S8GSrLFuevHIxP0,33235
+cloudnetpy/version.py,sha256=_T0iFq-KrAspEx746Kv1na8NW7WasyutK0cju7bNT_g,72
 cloudnetpy/categorize/__init__.py,sha256=gtvzWr0IDRn2oA6yHBvinEhTGTuub-JkrOv93lBsgrE,61
 cloudnetpy/categorize/atmos_utils.py,sha256=uWc9TABVYPI0sn4H5Az9Jf6NVRaWyEKIi17f0pAJQxE,10679
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
 cloudnetpy/categorize/categorize.py,sha256=UZph73hVCU-UIxB2837oyLFKvTk8fdgLC-krgJDg8zk,23227
 cloudnetpy/categorize/classify.py,sha256=skA9K6Bxh9mFZ_fM4d78zt09BPDzfHLttXle6mFCMbw,8553
-cloudnetpy/categorize/containers.py,sha256=PIJwgQos3CxF9BG4hBNLTaZq252FTH0kdgagT31mFmc,5517
-cloudnetpy/categorize/disdrometer.py,sha256=_Hc7EhoxIIsAn7HCrgSB6aPMelaIW6c4lLeMf0NOnVI,1117
+cloudnetpy/categorize/containers.py,sha256=oXvDazVtd9u3PwNP8ssKMfjW8s6O1bKNcTYHif6AHko,5808
+cloudnetpy/categorize/disdrometer.py,sha256=gJW6qD2Cn3w0JbH69wqtlxDFUhKb2ioR-e9f7VZwxvc,1283
 cloudnetpy/categorize/droplet.py,sha256=wnMN9rHNSMZLXNXuYEd-RAS_8eAIIo2vkE7pp3DSTKs,8725
 cloudnetpy/categorize/falling.py,sha256=ZscFGFPFz_Nlc7PwjVwFDSVOzMGOuCDVAFj7pLvYctQ,4475
 cloudnetpy/categorize/freezing.py,sha256=gigqpb4qfeQSlKXkrPUwCbMnMsxl74thJWSRW2iHJOg,3796
@@ -41,13 +41,13 @@ cloudnetpy/instruments/cl61d.py,sha256=JsCHqVzFGhZi-5xcnsB507FDpyuw83uSWK3IFO3Dh
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=B1UkiB0ytnT3MWYalEegql5QIPaMLg5bJy5xI50JEco,4503
 cloudnetpy/instruments/copernicus.py,sha256=ygEViERBSJdMeP9OxfLelZRDEbSRzY8n17ruYie2wm4,6970
 cloudnetpy/instruments/da10.py,sha256=FcXEu6dfAVvYzMvauiJBSyEkYhGa8hBuwrrdo-3LwHE,1960
-cloudnetpy/instruments/fd12p.py,sha256=5TFyNO26VGpO4ts9UIJiuLo4LUwQPHO6aK2fTnOtaKY,7019
+cloudnetpy/instruments/fd12p.py,sha256=M5yJDsPi0tHWMDUYOsoqciyKdRQ-zHEq2t19KnpZ6Io,6915
 cloudnetpy/instruments/galileo.py,sha256=f_-GkRxhNaQPbI8HpOwSmoKfGqyjmD16A0ZFgwLOIig,5137
 cloudnetpy/instruments/hatpro.py,sha256=TGOqwW0TfoPEYk13MFvFzwgJGzm6MVE5AsPavcIoj3I,10248
 cloudnetpy/instruments/instruments.py,sha256=WZgH7HjzM9Ane1CSnYCSLidbST8hunUeSt2lPntq9As,4999
 cloudnetpy/instruments/lufft.py,sha256=G6KeJOeltLUlGCHHEk8ns2K7WJ9ImAr25rSB2JltawE,4286
 cloudnetpy/instruments/mira.py,sha256=jJ17xJmXwqfvZ7hgJaongRrRxoQpivMEQYssgSQFYbA,12638
-cloudnetpy/instruments/mrr.py,sha256=z50VYLOBW2o7enU7FHZYNFQRW2goEQpeGe7-iCBRQtg,6020
+cloudnetpy/instruments/mrr.py,sha256=KvhfNIY2ozHE1MRLNYPqtBFThxLGN_YuCpBUGDIR76s,6319
 cloudnetpy/instruments/nc_lidar.py,sha256=PtZauDdI3bX3bv4gIVvV6N53e2Co-ehBL_tByHM9hj8,1713
 cloudnetpy/instruments/nc_radar.py,sha256=XFKxPLKivnhHTgjE5HFrxjWZ0oCifhDUAog051vkMiY,7533
 cloudnetpy/instruments/pollyxt.py,sha256=IFq_RJrhgJ79OVyuo48PwYQK_zZ6VZFB_S5bEirRyzs,10566
@@ -103,10 +103,10 @@ cloudnetpy/model_evaluation/tests/unit/test_plotting.py,sha256=5hkhtqX-JQ8-Yy6DA
 cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=Ra3r4V0qbqkpDuaTYvEIbaasl0nZ5gmTLR4eGC0glBQ,9724
 cloudnetpy/model_evaluation/tests/unit/test_tools.py,sha256=Ia_VrLdV2NstX5gbx_3AZTOAlrgLAy_xFZ8fHYVX0xI,3817
 cloudnetpy/plotting/__init__.py,sha256=lg9Smn4BI0dVBgnDLC3JVJ4GmwoSnO-qoSd4ApvwV6Y,107
-cloudnetpy/plotting/plot_meta.py,sha256=9d1OgPDysBDUUhncXdj-_EKmGdK7JutNBkzf8YV2lVg,18249
-cloudnetpy/plotting/plotting.py,sha256=ZmWddEZVw7xIbmivAH9t4BV_Dxz1du_MvsH6mBMT8MU,41575
+cloudnetpy/plotting/plot_meta.py,sha256=4AyKaTgp4ngxcUd3d0d7usJK-VpVrXGOCaXmpkGueNo,18455
+cloudnetpy/plotting/plotting.py,sha256=v1dD6kmMJ-t88p4rqrnFzS94qUjpI_v9fCAp49fA2V0,42015
 cloudnetpy/products/__init__.py,sha256=cBJdJBYltz5ZTKDqnRo-0StytAZK8gE3RYxxriFA4ak,295
-cloudnetpy/products/classification.py,sha256=6WxiGGJXqlAPgJ9hVNTKm3f7iGsqA7e3L3xqVxFFs7w,16894
+cloudnetpy/products/classification.py,sha256=Vbx2A43XP8F6q82wOPA_7pyUhuoyDty199bLU_7aNd0,17382
 cloudnetpy/products/der.py,sha256=UXdAxmmwChVVWSI4QSGAXphfMnbymGRTtGdKWEvh-J4,13162
 cloudnetpy/products/drizzle.py,sha256=0h1N_WVjC2GgIkAN-4ydOwl7WJn3psxeqmPHfX8WHhQ,11935
 cloudnetpy/products/drizzle_error.py,sha256=QN98Io9UsBoEYxKBqfwoS88OGBiK5U5RYnVQjyTWHCI,6220
@@ -118,10 +118,10 @@ cloudnetpy/products/lwc.py,sha256=xsNiiG6dGKIkWaFk0xWTabc1bZ4ULf6SqcqHs7itAUk,19
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=MMWnp68U7bv157-CPB2VeTQvaR6zl7sexbBT_kJ_pn8,6734
 cloudnetpy/products/product_tools.py,sha256=eyqIw_0KhlpmmYQE69RpGdRIAOW7JVPlEgkTBp2kdps,11302
-cloudnetpy-1.85.4.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.86.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.85.4.dist-info/METADATA,sha256=pphHS172_hmq2kGCZQKFmcP9VnicMegTxXStqPgzwVA,5836
-cloudnetpy-1.85.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.85.4.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.85.4.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.85.4.dist-info/RECORD,,
+cloudnetpy-1.86.0.dist-info/METADATA,sha256=WsqDp8V-e0nRQBcXKMctqT-wdrQW2vgMX6Ev73tbLD4,5836
+cloudnetpy-1.86.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.86.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.86.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.86.0.dist-info/RECORD,,