cloudnetpy 1.66.14__py3-none-any.whl → 1.66.16__py3-none-any.whl

cloudnetpy/categorize/categorize.py

@@ -167,10 +167,11 @@ def generate_categorize(
                 logging.warning("Unable to use disdrometer: %s", err)
         time, height = _define_dense_grid()
         valid_ind = _interpolate_to_cloudnet_grid()
-        if not valid_ind:
-            msg = "No overlapping radar and lidar timestamps found"
+        if len(valid_ind) < 2:
+            msg = "Less than 2 overlapping radar, lidar and model timestamps found"
             raise ValidTimeStampError(msg)
         _screen_bad_time_indices(valid_ind)
+
         if any(source in data.radar.source_type.lower() for source in ("rpg", "basta")):
             data.radar.filter_speckle_noise()
             data.radar.filter_1st_gate_artifact()

cloudnetpy/concat_lib.py

@@ -192,6 +192,8 @@ class _Concat:
             ind0 = len(self.concatenated_file.variables[self.concat_dimension])
             ind1 = ind0 + len(file.variables[self.concat_dimension])
             for key in self.concatenated_file.variables:
+                if key not in file.variables:
+                    continue
                 array = file[key][:]
                 if key in self.common_variables:
                     if allow_vary is not None and key in allow_vary:

cloudnetpy/instruments/nc_radar.py

@@ -103,18 +103,26 @@ class NcRadar(DataSource, CloudnetInstrument):
             azimuth_reference = ma.median(azimuth)
             azimuth_tolerance = 0.1
 
-        elevation = self.data["elevation"].data
-        zenith = 90 - elevation
-        is_stable_zenith = np.isclose(zenith, ma.median(zenith), atol=0.1)
+        zenith = 90 - self.data["elevation"].data
+
+        is_valid_zenith = np.abs(zenith) < 10
+        if not np.any(is_valid_zenith):
+            msg = "No valid zenith angles"
+            raise ValidTimeStampError(msg)
+
+        valid_zenith = zenith[is_valid_zenith]
+        is_stable_zenith = np.isclose(zenith, ma.median(valid_zenith), atol=0.1)
         is_stable_azimuth = np.isclose(
             azimuth,
             azimuth_reference,
             atol=azimuth_tolerance,
         )
         is_stable_profile = is_stable_zenith & is_stable_azimuth
+
         if ma.isMaskedArray(is_stable_profile):
             is_stable_profile[is_stable_profile.mask] = False
         n_removed = np.count_nonzero(~is_stable_profile)
+
         if n_removed >= len(zenith) - 1:
             msg = "Less than two profiles with valid zenith / azimuth angles"
             raise ValidTimeStampError(msg)

cloudnetpy/instruments/pollyxt.py

@@ -6,7 +6,7 @@ import logging
 import netCDF4
 import numpy as np
 from numpy import ma
-from numpy.testing import assert_array_equal
+from numpy.testing import assert_almost_equal
 
 from cloudnetpy import output, utils
 from cloudnetpy.exceptions import InconsistentDataError, ValidTimeStampError
@@ -190,7 +190,9 @@ def _read_array_from_multiple_files(files1: list, files2: list, key) -> np.ndarr
             array1 = _read_array_from_file_pair(nc1, nc2, key)
             if ind == 0:
                 array = array1
-        assert_array_equal(array, array1, f"Inconsistent variable '{key}'")
+        assert_almost_equal(
+            array, array1, err_msg=f"Inconsistent variable '{key}'", decimal=2
+        )
     return np.array(array)
 
 
@@ -201,7 +203,9 @@ def _read_array_from_file_pair(
 ) -> np.ndarray:
     array1 = nc_file1.variables[key][:]
     array2 = nc_file2.variables[key][:]
-    assert_array_equal(array1, array2, f"Inconsistent variable '{key}'")
+    assert_almost_equal(
+        array1, array2, err_msg=f"Inconsistent variable '{key}'", decimal=2
+    )
     return array1
 
 

cloudnetpy/instruments/radiometrics.py

@@ -61,6 +61,7 @@ def radiometrics2nc(
 
     radiometrics = RadiometricsCombined(objs, site_meta)
     radiometrics.screen_time(date)
+    radiometrics.sort_timestamps()
     radiometrics.time_to_fractional_hours()
     radiometrics.data_to_cloudnet_arrays()
     radiometrics.add_meta()
@@ -143,9 +144,13 @@ class Radiometrics:
         lwps = []
         iwvs = []
         irts = []
+        irt_times = []
         temps = []
+        temp_times = []
         rhs = []
+        rh_times = []
         ahs = []
+        ah_times = []
         block_titles = {}
         for record in self.raw_data:
             if record.block_type == 100:
@@ -154,12 +159,15 @@ class Radiometrics:
                 block_titles[block_type] = title
             if title := block_titles.get(record.block_type + record.block_index):
                 if title == "Temperature (K)":
+                    temp_times.append(record.timestamp)
                     temps.append(
                         [float(record.values[column]) for column in self.ranges]
                     )
                 elif title == "Relative Humidity (%)":
+                    rh_times.append(record.timestamp)
                     rhs.append([float(record.values[column]) for column in self.ranges])
                 elif title == "Vapor Density (g/m^3)":
+                    ah_times.append(record.timestamp)
                     ahs.append([float(record.values[column]) for column in self.ranges])
             elif record.block_type == 10:
                 if record.block_index == 0:
@@ -169,15 +177,20 @@ class Radiometrics:
                     times.append(record.timestamp)
                     lwps.append(float(lwp))
                     iwvs.append(float(iwv))
+                    irt_times.append(record.timestamp)
                     irts.append([float(irt)])
+                    temp_times.append(record.timestamp)
                     temps.append(
                         [float(record.values[column]) for column in self.ranges]
                     )
                 elif record.block_index == 1:
+                    ah_times.append(record.timestamp)
                     ahs.append([float(record.values[column]) for column in self.ranges])
                 elif record.block_index == 2:
+                    rh_times.append(record.timestamp)
                     rhs.append([float(record.values[column]) for column in self.ranges])
             elif record.block_type == 200:
+                irt_times.append(record.timestamp)
                 irt = record.values["Tir(K)"]
                 irts.append([float(irt)])
             elif record.block_type == 300:
@@ -186,16 +199,29 @@ class Radiometrics:
                 times.append(record.timestamp)
                 lwps.append(float(lwp))
                 iwvs.append(float(iwv))
-        n_time = len(times)
         self.data["time"] = np.array(times, dtype="datetime64[s]")
         self.data["lwp"] = np.array(lwps)  # mm => kg m-2
         self.data["iwv"] = np.array(iwvs) * 10  # cm => kg m-2
-        self.data["irt"] = np.array(irts[:n_time])
-        self.data["temperature"] = np.array(temps[:n_time])
-        self.data["relative_humidity"] = np.array(rhs[:n_time]) / 100  # % => 1
-        self.data["absolute_humidity"] = (
-            np.array(ahs[:n_time]) / 1000
-        )  # g m-3 => kg m-3
+        self.data["irt"] = _find_closest(
+            np.array(irt_times, dtype="datetime64[s]"),
+            np.array(irts),
+            self.data["time"],
+        )
+        self.data["temperature"] = _find_closest(
+            np.array(temp_times, dtype="datetime64[s]"),
+            np.array(temps),
+            self.data["time"],
+        )
+        self.data["relative_humidity"] = _find_closest(
+            np.array(rh_times, dtype="datetime64[s]"),
+            np.array(rhs) / 100,  # % => 1
+            self.data["time"],
+        )
+        self.data["absolute_humidity"] = _find_closest(
+            np.array(ah_times, dtype="datetime64[s]"),
+            np.array(ahs) / 1000,  # g m-3 => kg m-3
+            self.data["time"],
+        )
 
 
 class RadiometricsCombined:
@@ -233,6 +259,13 @@ class RadiometricsCombined:
                 continue
             self.data[key] = self.data[key][valid_mask]
 
+    def sort_timestamps(self):
+        ind = np.argsort(self.data["time"])
+        for key in self.data:
+            if key in ("range", "height"):
+                continue
+            self.data[key] = self.data[key][ind]
+
     def time_to_fractional_hours(self) -> None:
         base = self.data["time"][0].astype("datetime64[D]")
         self.data["time"] = (self.data["time"] - base) / np.timedelta64(1, "h")
@@ -272,6 +305,10 @@ def _parse_datetime(text: str) -> datetime.datetime:
     )
 
 
+def _find_closest(x: np.ndarray, y: np.ndarray, x_new: np.ndarray) -> np.ndarray:
+    return y[np.argmin(np.abs(x_new - x[:, np.newaxis]), axis=0)]
+
+
 ATTRIBUTES = {
     "irt": MetaData(
         long_name="Infrared brightness temperatures",

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 66
-PATCH = 14
+PATCH = 16
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.66.14.dist-info → cloudnetpy-1.66.16.dist-info}/METADATA

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

{cloudnetpy-1.66.14.dist-info → cloudnetpy-1.66.16.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cloudnetpy/__init__.py,sha256=X_FqY-4yg5GUj5Edo14SToLEos6JIsC3fN-v1FUgQoA,43
 cloudnetpy/cli.py,sha256=lHkeAErmAijI-Ugpd4DHRHfbZP4SXOake0LIY5Ovv_Q,20782
 cloudnetpy/cloudnetarray.py,sha256=Ol1ha4RPAmFZANL__U5CaMKX4oYMXYR6OnjoCZ9w3eo,7077
-cloudnetpy/concat_lib.py,sha256=RiL6fgaKjX2YyXl0BonbCjLXV2voIKPcQcdR9ZkQ8QA,11888
+cloudnetpy/concat_lib.py,sha256=lLjEC0ILPI1ghv8Wu9WVDiQoAkwwBKlW5jV8KoIde_8,11963
 cloudnetpy/constants.py,sha256=RDB9aqpBRztk3QVCFgsmi9fwhtLuit_0WJrt0D6sDcc,736
 cloudnetpy/datasource.py,sha256=FcWS77jz56gIzwnbafDLdj-HjAyu0P_VtY7gkeVZThU,7952
 cloudnetpy/exceptions.py,sha256=ns48useL9RN3mPh7CqIiLA19VI9OmVbyRsKTkwbThF8,1760
@@ -9,11 +9,11 @@ cloudnetpy/metadata.py,sha256=DOGt7EQLS-AVJEszrUrpXr3gHVQv655FzeCzKrOPvoU,5477
 cloudnetpy/output.py,sha256=lq4YSeMT_d-j4rlQkKm9KIZ8boupTBBBKV1eUawpmCI,15672
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JksYOwf9ORiR_QpoKrTe1JJwXpPYJj-wlwaZKCHoh3o,29744
-cloudnetpy/version.py,sha256=2QGNMZni3ixostxBEdUnnkW51Mi01KeZjZ44M5gaAgU,73
+cloudnetpy/version.py,sha256=eHl2AuLZQX2QkNhffKVbnwbtG_WTP5AnXh-UB2mXFyM,73
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=9-ymI6i1xASf-XAFyO87FaTfvq6bF89N1i_27OkUp-M,10104
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
-cloudnetpy/categorize/categorize.py,sha256=I5Bmj5xnolO9CQkkh9CEC5oMyQMGUW6IaRMsljoKsFc,20717
+cloudnetpy/categorize/categorize.py,sha256=HtttmUlnLE4Cw3QLdz-DRfRpd8sVr_Tp4A62XI67x24,20739
 cloudnetpy/categorize/classify.py,sha256=qovHgHsMku5kpl3cJxKteNBsG8GAkfI3Zo8QhJwZSFQ,8512
 cloudnetpy/categorize/containers.py,sha256=evqVQOoUycBtaFeKpms7_NuM9z8jKWq37nLIhoDxa8k,5278
 cloudnetpy/categorize/disdrometer.py,sha256=keU3pFvKtk840A0oLwAyNDuqOCswBPJEKf2bV0YWyA8,2004
@@ -47,9 +47,9 @@ cloudnetpy/instruments/lufft.py,sha256=ugXF6pssHAAz1Y_hqPdpKuluAjxxHSR88xBmQuS6R
 cloudnetpy/instruments/mira.py,sha256=f679zjmIxLVVtUVSMeO5IWbEdaj6qOJu5Gf9MKQJSL8,9412
 cloudnetpy/instruments/mrr.py,sha256=eeAzCp3CiHGauywjwvMUAFwZ4vBOZMcd3IlF8KsrLQo,5711
 cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wfTcOyQ,1705
-cloudnetpy/instruments/nc_radar.py,sha256=ctmb0tJHkRoz-Ic8UAw4_v4VfS27r22_4X_1s4mUAas,6990
-cloudnetpy/instruments/pollyxt.py,sha256=YuVEHr-BX31rtVOFsWGU-SQFAmcxpXL26eyCVMz_9hw,8933
-cloudnetpy/instruments/radiometrics.py,sha256=troxDHj7DDx04dIj0Qe8pRDWGz7W_qxmq7H620_jE-s,10481
+cloudnetpy/instruments/nc_radar.py,sha256=dbhfI0uLNjDIQqg6RRCTGuInLjv_OC-43wvVV28gJYE,7189
+cloudnetpy/instruments/pollyxt.py,sha256=lkiBu8ChvLd86eCkeIGxHKwraeDQFuVSgCVlsAYTYN8,9010
+cloudnetpy/instruments/radiometrics.py,sha256=ySG4a042XkgjMTG8d20oAPNvFvw9bMwwiqS3zv-JF_w,11825
 cloudnetpy/instruments/rpg.py,sha256=IozvBJ8_qXTPqtp58FQwRsoI5_aI3-kycpXugZkS0d4,17462
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
@@ -115,9 +115,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=01Zc6xV8CSuYcIcLpchFf5POL3_c629-YMNDZJ51udA,10853
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.66.14.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.66.14.dist-info/METADATA,sha256=EBvDEO2ZIXKdZkYX856_rst7Cy6S4QRThZSh9F75aMI,5806
-cloudnetpy-1.66.14.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-cloudnetpy-1.66.14.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.66.14.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.66.14.dist-info/RECORD,,
+cloudnetpy-1.66.16.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.66.16.dist-info/METADATA,sha256=-1JjOwxS5yjpcgomZnjK0GP5D8YWeD2HwgKtwwA7l2o,5806
+cloudnetpy-1.66.16.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+cloudnetpy-1.66.16.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.66.16.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.66.16.dist-info/RECORD,,