cloudnetpy 1.61.17__py3-none-any.whl → 1.62.1__py3-none-any.whl

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/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/instruments/weather_station.py

@@ -288,9 +288,12 @@ class GranadaWS(WS):
                     continue
                 parsed = value
                 if keymap[key] != "time":
-                    parsed = float(value)
+                    try:
+                        parsed = float(value)
+                    except ValueError:
+                        parsed = math.nan
                 data[keymap[key]].append(parsed)
-        return data
+        return self.format_data(data)
 
 
 class KenttarovaWS(WS):

cloudnetpy/version.py

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

{cloudnetpy-1.61.17.dist-info → cloudnetpy-1.62.1.dist-info}/METADATA

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

{cloudnetpy-1.61.17.dist-info → cloudnetpy-1.62.1.dist-info}/RECORD

@@ -8,12 +8,12 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=YkCaxVkG_Mt2hng_IVnhygHteV4UMKzKALkeFZwFJL8,14822
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JV0Fawnme1HoZgoiidV3eIzsn6vx0AEjBNmI1CcrBsA,28517
-cloudnetpy/version.py,sha256=sG8SRbHJPdakaVUw4g_7bMgKh3Jib6mBrnrhZvVBWZM,73
+cloudnetpy/version.py,sha256=wheZa4Kklouj0BjH963Wn0-elHVUt16TN53szDdSzNc,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=G4DmEJCt1FAPYyt7oXzBH47JTeb5lUOGDakkviOXblE,12390
 cloudnetpy/categorize/atmos_utils.py,sha256=64uenj2uxj3P3Blaq_pBN1pBjcF-X4LYNt-uTOjvevg,3778
 cloudnetpy/categorize/categorize.py,sha256=aoIxbBEwUFO-Xx_oofKM68aL0KEJuGi3OaWMKCCuUK8,17827
-cloudnetpy/categorize/classify.py,sha256=l8XoO42GJysio5ODX6qoxWHD9RqtMyz_-T8ZOpOkMxU,9219
+cloudnetpy/categorize/classify.py,sha256=a-0bVCtynGfORnDGTsPuzqkuDeOOR_OMz5ai9NsMuic,9870
 cloudnetpy/categorize/containers.py,sha256=aL_55tTDYjICS_TnG1u0FwBeXDS0S4mfDMU0kY_DUbs,4312
 cloudnetpy/categorize/disdrometer.py,sha256=keU3pFvKtk840A0oLwAyNDuqOCswBPJEKf2bV0YWyA8,2004
 cloudnetpy/categorize/droplet.py,sha256=894VHdL9ScaB8f1oxXwM2la4ShXd-uWywQDINoaoiD8,8687
@@ -28,7 +28,7 @@ cloudnetpy/categorize/radar.py,sha256=C4R74E_jmLOJqXLrfhdrAitHRHHA79UYuChz9VLxy5
 cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1IRRwTI,398
 cloudnetpy/instruments/basta.py,sha256=_OTnySd36ktvxk_swWBzbv_H4AVGlkF_Ce3KtPGD1rE,3758
 cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3Dn0WbvoAppFOMbA8,5270
-cloudnetpy/instruments/ceilo.py,sha256=-QZNgdTiFmz0G57CU_gZ1cQtYzppgkFJqjndfleefH0,8924
+cloudnetpy/instruments/ceilo.py,sha256=vmKRY-NLB042BLpmJn4sfufEwK5xAI2vOXLRr7K85bU,8981
 cloudnetpy/instruments/ceilometer.py,sha256=-aPEZs_r0Gxeu53PHeWAkZMB2BUdauS47tkL7RFxo6k,12078
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=RG5HJxGM6p0F-IGyr85fvOizcMmgx48OeD_XeIsrgSU,3367
@@ -47,7 +47,7 @@ cloudnetpy/instruments/rpg.py,sha256=siPmiyOGdB_OtlnIiP0PAt_cySnped0clLLGnyzw02o
 cloudnetpy/instruments/rpg_reader.py,sha256=2eYu-tBd0QyreUKqJT726aIMbA29aIxXK-UJCkOXMLM,11356
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
 cloudnetpy/instruments/vaisala.py,sha256=GGuA_v4S7kR9yApSr1-d0ETzNj4ehEZ7-pD1-AdPYRE,14662
-cloudnetpy/instruments/weather_station.py,sha256=SHuDUFNximD0vyuKTE1fHO8twjuIXElVsN32tt09CUo,17371
+cloudnetpy/instruments/weather_station.py,sha256=F5G_hbmkS4WgORS5oRVLxvKHuYBuef4MC_cZDu4lu_Y,17499
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=HJZrEysQkx9MiIVPDV25CYHpXi_SjgZlgO-otoaKK34,25640
@@ -108,8 +108,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=3esU5cG5GI2WVmOENqrJ0FbMuxLegADv7q8TB0RorGg,4674
 cloudnetpy/products/product_tools.py,sha256=VNw2diJj30POz68-3qNVkJP7r9AUspT_d1Fp0BbeIx8,10414
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.61.17.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.61.17.dist-info/METADATA,sha256=2AH_VXXd8wljsFeHDdnGWqPrOqt8gcKDSBRo82PrTYo,5785
-cloudnetpy-1.61.17.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-cloudnetpy-1.61.17.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.61.17.dist-info/RECORD,,
+cloudnetpy-1.62.1.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.62.1.dist-info/METADATA,sha256=3HgHFWQOFDZ4zxvdTjICRhRbGgW2ODI4hxvPJPm9158,5784
+cloudnetpy-1.62.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+cloudnetpy-1.62.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.62.1.dist-info/RECORD,,