cloudnetpy 1.86.1__tar.gz → 1.86.3__tar.gz

{cloudnetpy-1.86.1/cloudnetpy.egg-info → cloudnetpy-1.86.3}/PKG-INFO

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

{cloudnetpy-1.86.1 → cloudnetpy-1.86.3}/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.1 → cloudnetpy-1.86.3}/cloudnetpy/instruments/mira.py

@@ -3,6 +3,7 @@
 import datetime
 import logging
 import os
+import re
 from collections import OrderedDict
 from collections.abc import Sequence
 from os import PathLike
@@ -224,7 +225,7 @@ def _parse_input_files(
                 )
                 raise FileNotFoundError(msg)
 
-            filetypes = list({f.split(".")[-1].lower() for f in valid_files})
+            filetypes = list({_get_suffix(f) for f in valid_files})
 
             if len(filetypes) > 1:
                 err_msg = "Mixed mmclx and znc files. Please use only one filetype."
@@ -241,7 +242,7 @@ def _parse_input_files(
             )
     else:
         input_filename = input_files
-        keymap = _get_keymap(str(input_filename).split(".")[-1])
+        keymap = _get_keymap(_get_suffix(input_filename))
 
     return input_filename, keymap
 
@@ -258,6 +259,13 @@ def _get_ignored_variables(filetype: str) -> list | None:
     return keymaps.get(filetype.lower(), keymaps.get("mmclx"))
 
 
+def _get_suffix(filename: str | PathLike) -> str:
+    m = re.search(r"\.(\w+)(\.\d+)?$", str(filename))
+    if m is None:
+        return ""
+    return m[1].lower()
+
+
 def _get_keymap(filetype: str) -> dict[str, str]:
     """Returns a dictionary mapping the variables in the raw data to the processed
     Cloudnet file.
@@ -284,6 +292,7 @@ def _get_keymap(filetype: str) -> dict[str, str]:
                 ("nave", "nave"),
                 ("prf", "prf"),
                 ("rg0", "rg0"),
+                ("tpow", "tpow"),
             ],
         ),
         "mmclx": OrderedDict(

{cloudnetpy-1.86.1 → cloudnetpy-1.86.3}/cloudnetpy/version.py

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

{cloudnetpy-1.86.1 → cloudnetpy-1.86.3/cloudnetpy.egg-info}/PKG-INFO

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