cloudnetpy 1.61.17__tar.gz → 1.62.0__tar.gz

{cloudnetpy-1.61.17/cloudnetpy.egg-info → cloudnetpy-1.62.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.61.17
+Version: 1.62.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.61.17 → cloudnetpy-1.62.0}/cloudnetpy/categorize/classify.py

@@ -10,6 +10,7 @@ import cloudnetpy.categorize.atmos
 from cloudnetpy import utils
 from cloudnetpy.categorize import droplet, falling, freezing, insects, melting
 from cloudnetpy.categorize.containers import ClassData, ClassificationResult
+from cloudnetpy.constants import T0
 
 
 def classify_measurements(data: dict) -> ClassificationResult:
@@ -36,6 +37,14 @@ def classify_measurements(data: dict) -> ClassificationResult:
         implementation compared to the original Cloudnet methodology.
         Especially methods classifying insects, melting layer and liquid droplets.
 
+        Explanation of bits:
+            - bit 0: Liquid droplets
+            - bit 1: Falling hydrometeors
+            - bit 2: Freezing region
+            - bit 3: Melting layer
+            - bit 4: Aerosols
+            - bit 5: Insects
+
     """
     obs = ClassData(data)
     bits: list[np.ndarray] = [np.array([])] * 6
@@ -73,6 +82,8 @@ def classify_measurements(data: dict) -> ClassificationResult:
         bits = _filter_insects(bits)
     bits[4] = _find_aerosols(obs, bits[1], bits[0])
     bits[4][filtered_ice] = False
+    bits = _fix_super_cold_liquid(obs, bits)
+
     return ClassificationResult(
         category_bits=_bits_to_integer(bits),
         is_rain=obs.is_rain,
@@ -82,6 +93,15 @@ def classify_measurements(data: dict) -> ClassificationResult:
     )
 
 
+def _fix_super_cold_liquid(obs: ClassData, bits: list) -> list:
+    """Supercooled liquid droplets do not exist in atmosphere below around -38 C."""
+    t_limit = T0 - 38
+    super_cold_liquid = np.where((obs.tw < t_limit) & bits[0])
+    bits[0][super_cold_liquid] = False
+    bits[1][super_cold_liquid] = True
+    return bits
+
+
 def _remove_false_radar_liquid(
     liquid_from_radar: np.ndarray,
     liquid_from_lidar: np.ndarray,

{cloudnetpy-1.61.17 → cloudnetpy-1.62.0}/cloudnetpy/instruments/ceilo.py

@@ -87,12 +87,15 @@ def ceilo2nc(
     if ceilo_obj.instrument is None or ceilo_obj.instrument.model is None:
         msg = "Failed to read ceilometer model"
         raise RuntimeError(msg)
-    if "cl61" in ceilo_obj.instrument.model.lower():
-        # This kind of screening could be used with other ceilometers as well:
+    if any(
+        model in ceilo_obj.instrument.model.lower()
+        for model in ("cl61", "chm15k", "chm15kx", "cl51", "cl31")
+    ):
         mask = ceilo_obj.data["beta_smooth"].mask
         ceilo_obj.data["beta"] = ma.masked_where(mask, ceilo_obj.data["beta_raw"])
         ceilo_obj.data["beta"][ceilo_obj.data["beta"] <= 0] = ma.masked
-        ceilo_obj.data["depolarisation"].mask = ceilo_obj.data["beta"].mask
+        if "depolarisation" in ceilo_obj.data:
+            ceilo_obj.data["depolarisation"].mask = ceilo_obj.data["beta"].mask
     ceilo_obj.screen_depol()
     ceilo_obj.screen_invalid_values()
     ceilo_obj.prepare_data()

{cloudnetpy-1.61.17 → cloudnetpy-1.62.0}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 61
-PATCH = 17
+MINOR = 62
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.61.17 → cloudnetpy-1.62.0/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.61.17
+Version: 1.62.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License