cloudnetpy-qc 1.25.0__tar.gz → 1.25.2__tar.gz

{cloudnetpy_qc-1.25.0/cloudnetpy_qc.egg-info → cloudnetpy_qc-1.25.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy_qc
-Version: 1.25.0
+Version: 1.25.2
 Summary: Quality control routines for CloudnetPy products
 Author-email: Finnish Meteorological Institute <actris-cloudnet@fmi.fi>
 License: MIT License

{cloudnetpy_qc-1.25.0 → cloudnetpy_qc-1.25.2}/cloudnetpy_qc/quality.py

@@ -14,6 +14,7 @@ from typing import NamedTuple, TypedDict
 import netCDF4
 import numpy as np
 import scipy.stats
+from cftime import num2pydate
 from numpy import ma
 from requests import RequestException
 
@@ -75,8 +76,9 @@ class FileReport(NamedTuple):
 
 
 class SiteMeta(TypedDict):
-    latitude: float | None
-    longitude: float | None
+    time: np.ndarray | None
+    latitude: float | np.ndarray | None
+    longitude: float | np.ndarray | None
     altitude: float | None
 
 
@@ -114,6 +116,7 @@ def run_tests(
                 test_instance._add_error(
                     f"Failed to run test: {err} ({type(err).__name__})"
                 )
+                logging.exception("Failed to run test:")
             test_reports.append(test_instance.report)
             if test_instance.coverage is not None:
                 coverage = test_instance.coverage
@@ -799,14 +802,31 @@ class TestCoordinates(Test):
                 self._add_error(f"Variable '{key}' is missing")
 
         if "latitude" in self.nc.variables and "longitude" in self.nc.variables:
-            site_lat = self.site_meta["latitude"]
-            site_lon = self.site_meta["longitude"]
+            site_lat = np.atleast_1d(self.site_meta["latitude"])
+            site_lon = np.atleast_1d(self.site_meta["longitude"])
             file_lat = np.atleast_1d(self.nc["latitude"][:])
             file_lon = np.atleast_1d(self.nc["longitude"][:])
             file_lon[file_lon > 180] -= 360
-            dist = utils.haversine(site_lat, site_lon, file_lat, file_lon)
+
+            if (
+                self.site_meta["time"] is not None
+                and file_lat.size > 1
+                and file_lon.size > 1
+            ):
+                site_time = self._read_site_time()
+                file_time = self._read_file_time()
+                idx = utils.find_closest(file_time, site_time)
+                file_lat = file_lat[idx]
+                file_lon = file_lon[idx]
+            else:
+                file_lat, file_lon = utils.average_coordinate(file_lat, file_lon)
+                site_lat, site_lon = utils.average_coordinate(site_lat, site_lon)
+
+            dist = np.atleast_1d(
+                utils.haversine(site_lat, site_lon, file_lat, file_lon)
+            )
             i = np.argmax(dist)
-            max_dist = 100 if self.nc.cloudnet_file_type == "model" else 10
+            max_dist = self._calc_max_dist(site_lat, site_lon)
             if dist[i] > max_dist:
                 self._add_error(
                     f"Variables 'latitude' and 'longitude' do not match "
@@ -828,6 +848,37 @@ class TestCoordinates(Test):
                     f"but received {round(file_alt[i])}\u00a0m"
                 )
 
+    def _read_site_time(self):
+        for dt in self.site_meta["time"]:
+            if (
+                not isinstance(dt, datetime.datetime)
+                or dt.tzinfo is None
+                or dt.tzinfo.utcoffset(dt) is None
+            ):
+                raise ValueError("Naive datetimes are not supported")
+        naive_dt = [
+            dt.astimezone(datetime.timezone.utc).replace(tzinfo=None)
+            for dt in self.site_meta["time"]
+        ]
+        return np.array(naive_dt, dtype="datetime64[s]")
+
+    def _read_file_time(self):
+        naive_dt = num2pydate(
+            self.nc["time"][:], self.nc["time"].units, self.nc["time"].calendar
+        )
+        return np.array(naive_dt, dtype="datetime64[s]")
+
+    def _calc_max_dist(self, latitude, longitude):
+        if self.nc.cloudnet_file_type == "model":
+            angle = 1  # Model resolution should be at least 1 degrees.
+            half_angle = angle / 2
+            min_lat = np.maximum(-90, latitude - half_angle)
+            max_lat = np.minimum(90, latitude + half_angle)
+            min_lon = np.maximum(-180, longitude - half_angle)
+            max_lon = np.minimum(180, longitude + half_angle)
+            return utils.haversine(min_lat, min_lon, max_lat, max_lon)
+        return 10
+
 
 # ------------------------------#
 # ------ Error / Warning ------ #

{cloudnetpy_qc-1.25.0 → cloudnetpy_qc-1.25.2}/cloudnetpy_qc/utils.py

@@ -141,3 +141,51 @@ def haversine(
 
     a = np.sin(dlat / 2) ** 2 + np.cos(lat1) * np.cos(lat2) * np.sin(dlon / 2) ** 2
     return 2 * r * np.arcsin(np.sqrt(a))
+
+
+def find_closest(x: npt.NDArray, x_new: npt.NDArray) -> npt.NDArray[np.intp]:
+    """Find the closest values between two arrays.
+
+    Args:
+        x: Sorted array.
+        x_new: Sorted array.
+
+    Returns:
+        Indices into `x` which correspond to the closest values in `x_new`.
+
+    Example:
+        >>> x = np.array([0.9, 1.2, 2.0, 2.1])
+        >>> x_new = np.array([1, 2])
+        >>> find_closest(x, x_new)
+        array([0, 2])
+    """
+    idx = np.searchsorted(x, x_new)
+    idx_left = np.clip(idx - 1, 0, len(x) - 1)
+    idx_right = np.clip(idx, 0, len(x) - 1)
+    diff_left = np.abs(x_new - x[idx_left])
+    diff_right = np.abs(x_new - x[idx_right])
+    return np.where(diff_left < diff_right, idx_left, idx_right)
+
+
+def average_coordinate(
+    latitude: npt.NDArray, longitude: npt.NDArray
+) -> tuple[float, float]:
+    """Calculate average position from given coordinates.
+
+    Args:
+        latitude: Array of latitudes.
+        longitude: Array of longitudes.
+
+    Returns:
+        Tuple of average latitude and longitude.
+    """
+    if latitude.size == longitude.size == 1:
+        return latitude[0], longitude[0]
+    latitude = np.radians(latitude)
+    longitude = np.radians(longitude)
+    x = np.mean(np.cos(latitude) * np.cos(longitude))
+    y = np.mean(np.cos(latitude) * np.sin(longitude))
+    z = np.mean(np.sin(latitude))
+    avg_lat = np.degrees(np.atan2(z, np.sqrt(x * x + y * y)))
+    avg_lon = np.degrees(np.atan2(y, x))
+    return avg_lat, avg_lon

{cloudnetpy_qc-1.25.0 → cloudnetpy_qc-1.25.2}/cloudnetpy_qc/version.py

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

{cloudnetpy_qc-1.25.0 → cloudnetpy_qc-1.25.2/cloudnetpy_qc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy_qc
-Version: 1.25.0
+Version: 1.25.2
 Summary: Quality control routines for CloudnetPy products
 Author-email: Finnish Meteorological Institute <actris-cloudnet@fmi.fi>
 License: MIT License

{cloudnetpy_qc-1.25.0 → cloudnetpy_qc-1.25.2}/pyproject.toml

@@ -30,7 +30,7 @@ Repository = "https://github.com/actris-cloudnet/cloudnetpy-qc"
 Changelog = "https://github.com/actris-cloudnet/cloudnetpy-qc/blob/main/CHANGELOG.md"
 
 [[tool.mypy.overrides]]
-module = ["cfchecker.*", "scipy.*"]
+module = ["cfchecker.*", "cftime.*", "scipy.*"]
 ignore_missing_imports = true
 
 [tool.release-version]

{cloudnetpy_qc-1.25.0 → cloudnetpy_qc-1.25.2}/tests/test_qc.py

@@ -93,6 +93,7 @@ class Check:
     def __init__(self, filename: str, file_type: str | None = None):
         # Norunda
         site_meta: quality.SiteMeta = {
+            "time": None,
             "latitude": 60.086,
             "longitude": 17.479,
             "altitude": 46.0,