cloudnetpy 1.73.2__tar.gz → 1.74.1__tar.gz

{cloudnetpy-1.73.2/cloudnetpy.egg-info → cloudnetpy-1.74.1}/PKG-INFO

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

{cloudnetpy-1.73.2 → cloudnetpy-1.74.1}/cloudnetpy/categorize/categorize.py

@@ -166,6 +166,7 @@ def generate_categorize(
             except DisdrometerDataError as err:
                 logging.warning("Unable to use disdrometer: %s", err)
         time, height = _define_dense_grid()
+        data.radar.add_location(time)
         valid_ind = _interpolate_to_cloudnet_grid()
         if len(valid_ind) < 2:
             msg = "Less than 2 overlapping radar, lidar and model timestamps found"

{cloudnetpy-1.73.2 → cloudnetpy-1.74.1}/cloudnetpy/categorize/radar.py

@@ -316,11 +316,25 @@ class Radar(DataSource):
 
     def add_meta(self) -> None:
         """Copies misc. metadata from the input file."""
-        for key in ("latitude", "longitude", "altitude"):
-            self.append_data(np.array(self.getvar(key)), key)
         for key in ("time", "height", "radar_frequency"):
             self.append_data(np.array(getattr(self, key)), key)
 
+    def add_location(self, time_new: np.ndarray):
+        """Add latitude, longitude and altitude from nearest timestamp."""
+        idx = np.searchsorted(self.time, time_new)
+        idx_left = np.clip(idx - 1, 0, len(self.time) - 1)
+        idx_right = np.clip(idx, 0, len(self.time) - 1)
+        diff_left = np.abs(time_new - self.time[idx_left])
+        diff_right = np.abs(time_new - self.time[idx_right])
+        idx_closest = np.where(diff_left < diff_right, idx_left, idx_right)
+        for key in ("latitude", "longitude", "altitude"):
+            data = self.getvar(key)
+            if not utils.isscalar(data):
+                data = data[idx_closest]
+            if not np.any(ma.getmaskarray(data)):
+                data = np.array(data)
+            self.append_data(data, key)
+
     def _init_data(self) -> None:
         self.append_data(self.getvar("Zh"), "Z", units="dBZ")
         for key in ("v", "ldr", "width", "sldr", "rainfall_rate"):

{cloudnetpy-1.73.2 → cloudnetpy-1.74.1}/cloudnetpy/instruments/instruments.py

@@ -150,6 +150,13 @@ HALO = Instrument(
     model="StreamLine",
 )
 
+WINDCUBE_WLS100S = Instrument(
+    manufacturer="Vaisala",
+    domain="lidar",
+    category="Doppler lidar",
+    model="WindCube WLS100S",
+)
+
 WINDCUBE_WLS200S = Instrument(
     manufacturer="Vaisala",
     domain="lidar",
@@ -157,6 +164,13 @@ WINDCUBE_WLS200S = Instrument(
     model="WindCube WLS200S",
 )
 
+WINDCUBE_WLS400S = Instrument(
+    manufacturer="Vaisala",
+    domain="lidar",
+    category="Doppler lidar",
+    model="WindCube WLS400S",
+)
+
 WINDCUBE_WLS70 = Instrument(
     manufacturer="Vaisala",
     domain="lidar",

{cloudnetpy-1.73.2 → cloudnetpy-1.74.1}/cloudnetpy/instruments/weather_station.py

@@ -1,7 +1,10 @@
 import csv
 import datetime
 import math
+import re
+from collections import defaultdict
 from collections.abc import Iterable
+from os import PathLike
 
 import numpy as np
 from numpy import ma
@@ -59,6 +62,8 @@ def ws2nc(
         ws = JuelichWS(weather_station_file, site_meta)
     elif site_meta["name"] == "Lampedusa":
         ws = LampedusaWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Limassol":
+        ws = LimassolWS(weather_station_file, site_meta)
     else:
         msg = "Unsupported site"
         raise ValueError(msg)
@@ -122,6 +127,8 @@ class WS(CSVFile):
         self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
 
     def convert_pressure(self) -> None:
+        if "air_pressure" not in self.data:
+            return
         self.data["air_pressure"].data = self.data["air_pressure"][:] * HPA_TO_PA
 
     def convert_time(self) -> None:
@@ -539,3 +546,105 @@ class LampedusaWS(WS):
             "rainfall_rate": raw_data["rain1m"],
         }
         return self.format_data(data)
+
+
+class LimassolWS(WS):
+    def __init__(self, filenames: list[str], site_meta: dict):
+        super().__init__(site_meta)
+        self.filenames = filenames
+        self._data = defaultdict(list)
+        for filename in filenames:
+            for key, values in _parse_sirta(filename).items():
+                self._data[key].extend(values)
+        self._data["time"] = np.array(
+            self._data.pop("Date Time (yyyy-mm-ddThh:mm:ss)")
+        ) - datetime.timedelta(hours=2)
+
+    def convert_time(self) -> None:
+        decimal_hours = datetime2decimal_hours(self._data["time"])
+        self.data["time"] = CloudnetArray(decimal_hours, "time")
+
+    def screen_timestamps(self, date: str) -> None:
+        dates = [str(d.date()) for d in self._data["time"]]
+        valid_ind = [ind for ind, d in enumerate(dates) if d == date]
+        if not valid_ind:
+            raise ValidTimeStampError
+        for key in self._data:
+            self._data[key] = [
+                x for ind, x in enumerate(self._data[key]) if ind in valid_ind
+            ]
+
+    def add_data(self) -> None:
+        self.data["air_temperature"] = CloudnetArray(
+            np.array(self._data["Air temperature (°C)"]), "air_temperature"
+        )
+        self.data["relative_humidity"] = CloudnetArray(
+            np.array(self._data["Relative humidity (%)"]), "relative_humidity"
+        )
+        self.data["rainfall_rate"] = CloudnetArray(
+            np.array(self._data["Total precipitation (mm)"]), "rainfall_rate"
+        )
+        # Wind speed and direction are available since 2025-02-13:
+        if (
+            "Wind speed at 10m (m/s)" in self._data
+            and "Wind direction at 10m (degrees)" in self._data
+        ):
+            self.data["wind_speed"] = CloudnetArray(
+                np.array(self._data["Wind speed at 10m (m/s)"]), "wind_speed"
+            )
+            self.data["wind_direction"] = CloudnetArray(
+                np.array(self._data["Wind direction at 10m (degrees)"]),
+                "wind_direction",
+            )
+        else:
+            self.data["wind_speed"] = CloudnetArray(
+                np.array(self._data["Wind speed (m/s)"]), "wind_speed"
+            )
+
+    def convert_rainfall_rate(self) -> None:
+        rainfall_rate = self.data["rainfall_rate"][:]
+        self.data["rainfall_rate"].data = (
+            rainfall_rate / (10 * 60) / 1000
+        )  # mm/(10 min) -> m/s
+
+
+def _parse_sirta(filename: str | PathLike):
+    """Parse SIRTA-style weather station file."""
+    with open(filename, "rb") as f:
+        raw_content = f.read()
+    try:
+        content = raw_content.decode("utf-8")
+    except UnicodeDecodeError:
+        content = raw_content.decode("latin-1")
+    lines = [line.strip() for line in content.splitlines()]
+    columns: list[str] = []
+    output: dict = {}
+    for line in lines:
+        m = re.fullmatch(r"#\s*Col.\s*(\d+)\s*:\s*(.*)", line)
+        if m is None:
+            continue
+        if m[1] != str(len(columns) + 1):
+            msg = f"Expected column {m[1]}, found {len(columns)+1}"
+            raise ValueError(msg)
+        columns.append(m[2])
+        output[m[2]] = []
+    for line in lines:
+        if not line or line.startswith("#"):
+            continue
+        values = line.split()
+        if len(columns) != len(values):
+            continue
+        for column, value in zip(columns, values, strict=False):
+            parsed: float | datetime.datetime
+            if column == "Date Time (yyyy-mm-ddThh:mm:ss)":
+                parsed = datetime.datetime.strptime(value, "%Y-%m-%dT%H:%M:%S").replace(
+                    tzinfo=datetime.timezone.utc
+                )
+            elif column == "Date Time (yyyy-mm-ddThh:mm:ssZ)":
+                parsed = datetime.datetime.strptime(
+                    value, "%Y-%m-%dT%H:%M:%SZ"
+                ).replace(tzinfo=datetime.timezone.utc)
+            else:
+                parsed = float(value)
+            output[column].append(parsed)
+    return output

{cloudnetpy-1.73.2 → cloudnetpy-1.74.1}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 73
-PATCH = 2
+MINOR = 74
+PATCH = 1
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.73.2 → cloudnetpy-1.74.1/cloudnetpy.egg-info}/PKG-INFO

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