cloudnetpy 1.85.0__tar.gz → 1.85.2__tar.gz

{cloudnetpy-1.85.0/cloudnetpy.egg-info → cloudnetpy-1.85.2}/PKG-INFO

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

{cloudnetpy-1.85.0 → cloudnetpy-1.85.2}/cloudnetpy/instruments/mira.py

@@ -9,6 +9,7 @@ from os import PathLike
 from tempfile import NamedTemporaryFile, TemporaryDirectory
 from uuid import UUID
 
+import numpy as np
 from numpy import ma
 
 from cloudnetpy import concat_lib, output, utils
@@ -74,9 +75,7 @@ def mira2nc(
             mira.sort_timestamps()
             mira.remove_duplicate_timestamps()
             mira.linear_to_db(("Zh", "ldr", "SNR"))
-            n_profiles = utils.n_elements(mira.time, 5, "time")
-            valid_ind = utils.remove_masked_blocks(mira.data["Zh"][:], limit=n_profiles)
-            mira.screen_time_indices(valid_ind)
+            mira.screen_low_power()
 
             if "snr_limit" in site_meta and site_meta["snr_limit"] is not None:
                 snr_limit = site_meta["snr_limit"]
@@ -151,6 +150,24 @@ class Mira(NcRadar):
         time_stamps = self.getvar("time")
         return utils.seconds2date(float(time_stamps[0]), self.epoch).date()
 
+    def screen_low_power(self) -> None:
+        """Screen times with average transmit power close to zero."""
+        if "tpow" not in self.data:
+            logging.warning("Variable tpow is missing")
+            return
+        tpow = self.data["tpow"][:]
+        # Threshold for abnormally low power e.g. Limassol 2024-10-20. Average
+        # power should 30 to 60 W according to MIRA-35 data sheet. Based on a
+        # random sample, typical range is 15 to 25 W. In Lampedusa, the power is
+        # constantly as low as 1.9 W.
+        is_low = tpow < 1
+        n_removed = np.count_nonzero(is_low)
+        if n_removed > 0:
+            logging.warning(
+                "Filtering %s profiles due to low average transmit power", n_removed
+            )
+            self.screen_time_indices(~is_low)
+
     def screen_invalid_ldr(self) -> None:
         """Masks LDR in MIRA STSR mode data.
         Is there a better way to identify this mode?
@@ -284,6 +301,7 @@ def _get_keymap(filetype: str) -> dict[str, str]:
                 ("prf", "prf"),
                 ("rg0", "rg0"),
                 ("NyquistVelocity", "NyquistVelocity"),  # variable in some mmclx files
+                ("tpow", "tpow"),
             ]
         ),
     }
@@ -311,6 +329,9 @@ ATTRIBUTES = {
     "prf": MetaData(
         long_name="Pulse Repetition Frequency", units="Hz", dimensions=("time",)
     ),
+    "tpow": MetaData(
+        long_name="Average Transmit Power", units="W", dimensions=("time",)
+    ),
     "zenith_offset": MetaData(
         long_name="Zenith offset of the instrument",
         units="degrees",

{cloudnetpy-1.85.0 → cloudnetpy-1.85.2}/cloudnetpy/instruments/rpg.py

@@ -83,6 +83,10 @@ def rpg2nc(
     valid_ind = fmcw.add_zenith_angle()
     fmcw.screen_time_indices(valid_ind)
     fmcw.add_height()
+    if len(np.unique(fmcw.data["time"][:].astype("f4"))) != len(fmcw.data["time"][:]):
+        msg = "Convert time to f8 to keep values unique in netCDF"
+        logging.info(msg)
+        fmcw.data["time"].data_type = "f8"
     attributes = output.add_time_attribute(RPG_ATTRIBUTES, fmcw.date)
     output.update_attributes(fmcw.data, attributes)
     output.save_level1b(fmcw, output_file, uuid)
@@ -137,19 +141,17 @@ def _reduce_header(header: dict) -> dict:
     """Removes duplicate header data. Otherwise, we would need n_files dimension."""
     reduced_header = {}
     for key, data in header.items():
+        # Handle outliers in latitude and longitude (e.g. Galati 2024-02-11):
+        if key in ("latitude", "longitude"):
+            reduced_header[key] = ma.median(data)
+            continue
         first_profile_value = data[0]
         is_identical_value = bool(
             np.isclose(data, first_profile_value, rtol=1e-2).all(),
         )
         if is_identical_value is False:
             msg = f"Inconsistent header: {key}: {data}"
-            if key in (
-                "latitude",
-                "longitude",
-                "sample_duration",
-                "calibration_interval",
-                "noise_threshold",
-            ):
+            if key in ("sample_duration", "calibration_interval", "noise_threshold"):
                 logging.warning(msg)
             else:
                 raise InconsistentDataError(msg)

{cloudnetpy-1.85.0 → cloudnetpy-1.85.2}/cloudnetpy/products/epsilon.py

@@ -138,12 +138,12 @@ def _horizontal_wind_from_doppler_lidar_file(
         t = np.broadcast_to(time[:, None], mask.shape)[~mask]
         h = np.broadcast_to(height[None, :], mask.shape)[~mask]
 
-        if len(np.unique(t)) < 2 or len(np.unique(h)) < 2:
+        if len(np.unique(t)) < 3 or len(np.unique(h)) < 3:
             msg = "Not enough unique values for interpolation"
             raise ValidTimeStampError(msg)
 
-        interp_linear = LinearNDInterpolator(list(zip(t, h, strict=False)), V[~mask])
-        interp_nearest = NearestNDInterpolator(list(zip(t, h, strict=False)), V[~mask])
+        interp_linear = LinearNDInterpolator(list(zip(t, h, strict=True)), V[~mask])
+        interp_nearest = NearestNDInterpolator(list(zip(t, h, strict=True)), V[~mask])
         T, H = np.meshgrid(time, height, indexing="ij")
         V_linear = interp_linear(T, H)
         V_nearest = interp_nearest(T, H)

{cloudnetpy-1.85.0 → cloudnetpy-1.85.2}/cloudnetpy/utils.py

@@ -1035,17 +1035,6 @@ def path_lengths_from_ground(height: npt.NDArray) -> npt.NDArray:
     return np.diff(height, prepend=0)
 
 
-def remove_masked_blocks(array: ma.MaskedArray, limit: int = 50) -> npt.NDArray:
-    """Filters out large blocks of completely masked profiles."""
-    if array.ndim == 1:
-        return np.array(not ma.all(array.mask))
-    masked_profiles = ma.all(array.mask, axis=1)
-    labeled_array, _ = ndimage.label(masked_profiles)
-    mask = np.bincount(labeled_array) < limit
-    mask[0] = True
-    return mask[labeled_array]
-
-
 def sha256sum(filename: str | PathLike) -> str:
     """Calculates hash of file using sha-256."""
     return _calc_hash_sum(filename, "sha256", is_base64=False)

{cloudnetpy-1.85.0 → cloudnetpy-1.85.2}/cloudnetpy/version.py

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

{cloudnetpy-1.85.0 → cloudnetpy-1.85.2/cloudnetpy.egg-info}/PKG-INFO

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