cloudnetpy 1.90.4__tar.gz → 1.90.6__tar.gz

{cloudnetpy-1.90.4/cloudnetpy.egg-info → cloudnetpy-1.90.6}/PKG-INFO

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

{cloudnetpy-1.90.4 → cloudnetpy-1.90.6}/cloudnetpy/categorize/categorize.py

@@ -92,7 +92,7 @@ def generate_categorize(
         if data.disdrometer is not None:
             data.disdrometer.interpolate_to_grid(time)
         if data.mwr is not None:
-            data.mwr.interpolate_to_grid(time)
+            data.mwr.interpolate_to_grid(time, max_time=2)
         data.model.calc_attenuations(data.radar.radar_frequency)
         data.model.interpolate_to_common_height()
         model_gap_ind = data.model.interpolate_to_grid(time, height)

{cloudnetpy-1.90.4 → cloudnetpy-1.90.6}/cloudnetpy/categorize/mwr.py

@@ -24,7 +24,14 @@ class Mwr(DataSource):
         self._init_lwp_data()
         self._init_lwp_error()
 
-    def interpolate_to_grid(self, time_grid: npt.NDArray, max_time: float = 1) -> None:
+    def interpolate_to_grid(self, time_grid: npt.NDArray, max_time: float) -> None:
+        """Interpolate LWP using linear interpolation.
+
+        Args:
+            time_grid: 1D array, new time coordinates.
+            max_time: Maximum allowed gap in minutes. Values outside this gap will
+                be masked.
+        """
         for key, array in self.data.items():
             self.data[key].data = interpolate_1d(
                 self.time, array.data, time_grid, max_time=max_time

{cloudnetpy-1.90.4 → cloudnetpy-1.90.6}/cloudnetpy/instruments/rpg.py

@@ -335,12 +335,13 @@ class Fmcw(Rpg):
 
     def mask_invalid_ldr(self) -> None:
         """Removes ldr outliers."""
-        threshold = -35
-        if "ldr" in self.data:
-            self.data["ldr"].data = ma.masked_less_equal(
-                self.data["ldr"].data,
-                threshold,
-            )
+        thresholds = {"ldr": -35, "sldr": -40}
+        for key, threshold in thresholds.items():
+            if key in self.data:
+                self.data[key].data = ma.masked_less_equal(
+                    self.data[key].data,
+                    threshold,
+                )
 
     def mask_invalid_width(self) -> None:
         """Removes very low width values.

{cloudnetpy-1.90.4 → cloudnetpy-1.90.6}/cloudnetpy/utils.py

@@ -498,6 +498,8 @@ def interpolate_1d(
             return ma.masked_all(time_new.shape)
         time = time[~y.mask]
         y = y[~y.mask]
+    time, unique_idx = np.unique(time, return_index=True)
+    y = y[unique_idx]
     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.90.4 → cloudnetpy-1.90.6}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 90
-PATCH = 4
+PATCH = 6
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.90.4 → cloudnetpy-1.90.6/cloudnetpy.egg-info}/PKG-INFO

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

{cloudnetpy-1.90.4 → cloudnetpy-1.90.6}/pyproject.toml

@@ -55,6 +55,11 @@ check_untyped_defs = true
 module = ["cftime.*", "mpl_toolkits.*", "scipy.*", "voodoonet.*"]
 ignore_missing_imports = true
 
+[tool.pytest.ini_options]
+filterwarnings = [
+  "ignore::scipy.stats.ConstantInputWarning",
+]
+
 [tool.release-version]
 filename = "cloudnetpy/version.py"
 pattern = ["MAJOR = (?P<major>\\d+)", "MINOR = (?P<minor>\\d+)", "PATCH = (?P<patch>\\d+)"]