cloudnetpy 1.86.2__tar.gz → 1.86.4__tar.gz

{cloudnetpy-1.86.2/cloudnetpy.egg-info → cloudnetpy-1.86.4}/PKG-INFO

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

{cloudnetpy-1.86.2 → cloudnetpy-1.86.4}/cloudnetpy/concat_lib.py

@@ -132,13 +132,24 @@ class _Concat:
         concat_dimension: str = "time",
         interp_dim: str = "range",
     ) -> None:
-        self.filenames = sorted(map(Path, filenames), key=lambda f: f.name)
         self.concat_dimension = concat_dimension
         self.interp_dim = interp_dim
+        self.filenames = sorted(
+            [Path(filename) for filename in filenames if self._is_valid_file(filename)],
+            key=lambda f: f.name,
+        )
         self.first_filename = self.filenames[0]
         self.first_file = netCDF4.Dataset(self.first_filename)
         self.concatenated_file = self._init_output_file(output_file)
 
+    def _is_valid_file(self, filename: str | PathLike) -> bool:
+        # Added to handle strange .znc files with no time and huge range
+        # dimension resulting in large memory usage (e.g. Jülich 2019-05-18).
+        with netCDF4.Dataset(filename) as nc:
+            return (
+                nc[self.concat_dimension].size > 0 and nc[self.interp_dim].size < 10_000
+            )
+
     def create_global_attributes(self, new_attributes: dict | None) -> None:
         """Copies global attributes from one of the source files."""
         _copy_attributes(self.first_file, self.concatenated_file)

{cloudnetpy-1.86.2 → cloudnetpy-1.86.4}/cloudnetpy/instruments/galileo.py

@@ -92,6 +92,7 @@ def galileo2nc(
                 galileo.check_date(date)
             galileo.sort_timestamps()
             galileo.remove_duplicate_timestamps()
+            galileo.screen_negative_altitudes()
             snr_limit = site_meta.get("snr_limit", 3)
             galileo.screen_by_snr(snr_limit=snr_limit)
             galileo.mask_clutter()
@@ -128,7 +129,6 @@ class Galileo(ChilboltonRadar):
         self.instrument = GALILEO
 
     def mask_clutter(self) -> None:
-        """Masks clutter."""
         # Only strong Z values are valid
         n_low_gates = 15
         ind = np.where(self.data["Zh"][:, :n_low_gates] < -15) and np.where(
@@ -136,6 +136,20 @@ class Galileo(ChilboltonRadar):
         )
         self.data["v"].mask_indices(ind)
 
+    def screen_negative_altitudes(self) -> None:
+        range_var = self.data["range"][:]
+        valid_idx = np.where(range_var > 0)[0]
+        if valid_idx.size == 0:
+            msg = "No valid altitudes found."
+            raise ValueError(msg)
+        if valid_idx.size == range_var.shape[0]:
+            return
+        for arr in self.data.values():
+            if utils.isscalar(arr.data):
+                continue
+            if arr[:].shape[-1] == range_var.shape[0]:
+                arr.data = arr[..., valid_idx]
+
 
 ATTRIBUTES = {
     "antenna_diameter": MetaData(

{cloudnetpy-1.86.2 → cloudnetpy-1.86.4}/cloudnetpy/version.py

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

{cloudnetpy-1.86.2 → cloudnetpy-1.86.4/cloudnetpy.egg-info}/PKG-INFO

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