cloudnetpy 1.96.3__tar.gz → 1.96.4__tar.gz

{cloudnetpy-1.96.3/cloudnetpy.egg-info → cloudnetpy-1.96.4}/PKG-INFO

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

{cloudnetpy-1.96.3 → cloudnetpy-1.96.4}/cloudnetpy/disdronator/parsivel.py

@@ -475,6 +475,21 @@ def _read_leipzig(filename: str | PathLike) -> ParsivelOutput:
         return time, data
 
 
+def _read_cloudlab(filename: str | PathLike) -> ParsivelOutput:
+    # Data acquired with ASDO and converted to daily netCDF files. The netCDF
+    # files are similar to parsivel2nc files but without "number_concentration"
+    # and "fall_velocity" variables.
+    with netCDF4.Dataset(filename) as nc:
+        time = cftime.num2pydate(nc["time"][:], units=nc["time"].units)
+        data = {
+            num: nc[key][:]
+            for key, num in PARSIVEL2NC_KEYS.items()
+            if key in nc.variables
+        }
+        data[13] = np.repeat(int(nc.Sensor_ID), len(time))
+        return time, data
+
+
 def _read_parsivel(
     filename: str | PathLike,
     telegram: Sequence[int | str | None] | None = None,
@@ -483,6 +498,8 @@ def _read_parsivel(
 ) -> ParsivelOutput:
     try:
         with netCDF4.Dataset(filename) as nc:
+            if hasattr(nc, "Title") and "CLOUDLAB" in nc.Title:
+                return _read_cloudlab(filename)
             if "number_concentration" in nc.variables:
                 return _read_parsivel2nc(filename)
             if "fieldN" in nc.variables:

{cloudnetpy-1.96.3 → cloudnetpy-1.96.4}/cloudnetpy/model_evaluation/products/advance_methods.py

@@ -105,11 +105,20 @@ class AdvanceProductMethods:
         if self._obs_obj.height is None:
             msg = "No height in observation file"
             raise ValueError(msg)
-        z_sen = [
-            cl_tools.rebin_1d(self._obs_obj.height, self._obs_obj.z_sensitivity, h[i])
-            for i in range(len(h))
-        ]
-        return np.asarray(z_sen)
+        # Interpolate at the model level heights: rebinning assumes evenly
+        # spaced levels, which maps stretched model levels to wrong heights.
+        obs_height = self._obs_obj.height_agl
+        if obs_height is None:
+            obs_height = self._obs_obj.height
+        obs_height = np.asarray(ma.filled(obs_height, np.nan), dtype=float)
+        z_obs = np.asarray(ma.filled(self._obs_obj.z_sensitivity, np.nan), dtype=float)
+        is_valid = np.isfinite(obs_height) & np.isfinite(z_obs)
+        model_height = np.asarray(ma.filled(h, np.nan), dtype=float)
+        z_sen = np.interp(
+            model_height, obs_height[is_valid], z_obs[is_valid], right=np.nan
+        )
+        z_sen[~np.isfinite(model_height)] = np.nan
+        return z_sen
 
     def filter_high_iwc_low_cf(
         self,

{cloudnetpy-1.96.3 → cloudnetpy-1.96.4}/cloudnetpy/model_evaluation/tests/unit/test_advance_methods.py

@@ -69,14 +69,30 @@ def test_fit_z_sensitivity(obs_file, model_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, PRODUCT)
     advance = AdvanceProductMethods(model, obs)
+    # obs heights above ground 7, 8, 11 and 14 km with sensitivities
+    # 0.1, 0.2, 0.0, 1.0; levels above the radar range are NaN
     height = np.array(
         [[5000, 9000, 13000], [10000, 15000, 20000], [8000, 12000, 16000]]
     )
-    expected = ma.masked_invalid([[np.nan, 0.15, 0.5], [0.1, 1, np.nan], [0.15, 0, 1]])
+    expected = np.array(
+        [[0.1, 0.4 / 3, 2 / 3], [0.2 / 3, np.nan, np.nan], [0.2, 1 / 3, np.nan]]
+    )
     result = advance.fit_z_sensitivity(height)
     testing.assert_array_almost_equal(result, expected)
 
 
+def test_fit_z_sensitivity_stretched_grid(obs_file, model_file) -> None:
+    obs = ObservationManager(PRODUCT, str(obs_file))
+    model = ModelManager(str(model_file), MODEL, PRODUCT)
+    advance = AdvanceProductMethods(model, obs)
+    # unevenly spaced model levels within the radar range must all get a value
+    height = np.array([[7000, 7100, 7300, 7700, 8500, 10000, 13000, 14000]])
+    result = advance.fit_z_sensitivity(height)
+    assert np.isfinite(result).all()
+    assert result[0, 0] == pytest.approx(0.1)
+    assert result[0, -1] == pytest.approx(1.0)
+
+
 def test_filter_high_iwc_low_cf(obs_file, model_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, PRODUCT)

{cloudnetpy-1.96.3 → cloudnetpy-1.96.4}/cloudnetpy/version.py

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

{cloudnetpy-1.96.3 → cloudnetpy-1.96.4/cloudnetpy.egg-info}/PKG-INFO

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