cloudnetpy 1.80.1__tar.gz → 1.80.3__tar.gz

{cloudnetpy-1.80.1/cloudnetpy.egg-info → cloudnetpy-1.80.3}/PKG-INFO

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

{cloudnetpy-1.80.1 → cloudnetpy-1.80.3}/cloudnetpy/categorize/categorize.py

@@ -145,10 +145,11 @@ def generate_categorize(
         return utils.time_grid(), data.radar.height
 
     def _close_all() -> None:
-        for field in fields(data):
-            obj = getattr(data, field.name)
-            if isinstance(obj, DataSource):
-                obj.close()
+        if "data" in locals():
+            for field in fields(data):
+                obj = getattr(data, field.name)
+                if isinstance(obj, DataSource):
+                    obj.close()
 
     try:
         radar = Radar(input_files["radar"])

{cloudnetpy-1.80.1 → cloudnetpy-1.80.3}/cloudnetpy/instruments/radiometrics.py

@@ -11,6 +11,7 @@ from pathlib import Path
 from typing import Any, NamedTuple
 
 import numpy as np
+from numpy import ma
 
 from cloudnetpy import output, utils
 from cloudnetpy.cloudnetarray import CloudnetArray
@@ -122,12 +123,15 @@ class RadiometricsMP:
                             logging.info("Skipping unknown record type %d", record_type)
                             unknown_record_types.add(record_type)
                         continue
+
+                    row_trimmed = [value for value in row if value != ""]
+
                     record = Record(
                         row_number=int(row[0]),
                         timestamp=_parse_datetime(row[1]),
                         block_type=block_type,
                         block_index=block_index,
-                        values=dict(zip(column_names, row[3:], strict=True)),
+                        values=dict(zip(column_names, row_trimmed[3:], strict=True)),
                     )
                     rows.append(record)
 
@@ -148,6 +152,15 @@ class RadiometricsMP:
         ah_times = []
         block_titles = {}
         skip_procs = set()
+
+        def _parse_floats() -> list[float]:
+            return [
+                float(record.values[column])
+                if record.values[column].replace(".", "", 1).isdigit()
+                else math.nan
+                for column in self.ranges
+            ]
+
         for record in self.raw_data:
             if record.block_type == 100:
                 block_type = int(record.values["Record Type"]) - 1
@@ -157,20 +170,18 @@ class RadiometricsMP:
                 # "LV2 Processor" values "Zenith" and "0.00:90.00" should be OK
                 # but "Angle20(N)" and similar should be skipped.
                 proc = record.values["LV2 Processor"]
-                if proc.startswith("Angle"):
+                if proc.startswith(("Angle", "Zenith26")):
                     skip_procs.add(proc)
                     continue
                 if title == "Temperature (K)":
                     temp_times.append(record.timestamp)
-                    temps.append(
-                        [float(record.values[column]) for column in self.ranges]
-                    )
+                    temps.append(_parse_floats())
                 elif title == "Relative Humidity (%)":
                     rh_times.append(record.timestamp)
-                    rhs.append([float(record.values[column]) for column in self.ranges])
+                    rhs.append(_parse_floats())
                 elif title == "Vapor Density (g/m^3)":
                     ah_times.append(record.timestamp)
-                    ahs.append([float(record.values[column]) for column in self.ranges])
+                    ahs.append(_parse_floats())
             elif record.block_type == 10:
                 if record.block_index == 0:
                     lwp = record.values["Lqint(mm)"]
@@ -182,15 +193,13 @@ class RadiometricsMP:
                     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]
-                    )
+                    temps.append(_parse_floats())
                 elif record.block_index == 1:
                     ah_times.append(record.timestamp)
-                    ahs.append([float(record.values[column]) for column in self.ranges])
+                    ahs.append(_parse_floats())
                 elif record.block_index == 2:
                     rh_times.append(record.timestamp)
-                    rhs.append([float(record.values[column]) for column in self.ranges])
+                    rhs.append(_parse_floats())
             elif record.block_type == 200:
                 irt_times.append(record.timestamp)
                 irt = record.values["Tir(K)"]
@@ -204,6 +213,7 @@ class RadiometricsMP:
                 times.append(record.timestamp)
                 lwps.append(float(lwp))
                 iwvs.append(float(iwv))
+
         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
@@ -346,7 +356,8 @@ class RadiometricsCombined:
                 if key in ("temperature", "relative_humidity", "absolute_humidity")
                 else None
             )
-            self.data[key] = CloudnetArray(array, key, dimensions=dimensions)
+            array_masked = ma.masked_invalid(array) if np.isnan(array).any() else array
+            self.data[key] = CloudnetArray(array_masked, key, dimensions=dimensions)
 
     def add_meta(self) -> None:
         """Adds some metadata."""

{cloudnetpy-1.80.1 → cloudnetpy-1.80.3}/cloudnetpy/instruments/weather_station.py

@@ -3,7 +3,7 @@ import datetime
 import math
 import re
 from collections import defaultdict
-from collections.abc import Iterable
+from collections.abc import Iterable, Sequence
 from os import PathLike
 
 import numpy as np
@@ -21,11 +21,11 @@ from cloudnetpy.utils import datetime2decimal_hours
 
 
 def ws2nc(
-    weather_station_file: str | list[str],
+    weather_station_file: str | PathLike | Sequence[str | PathLike],
     output_file: str,
     site_meta: dict,
     uuid: str | None = None,
-    date: str | None = None,
+    date: str | datetime.date | None = None,
 ) -> str:
     """Converts weather station data into Cloudnet Level 1b netCDF file.
 
@@ -43,8 +43,10 @@ def ws2nc(
     Raises:
         ValidTimeStampError: No valid timestamps found.
     """
-    if not isinstance(weather_station_file, list):
+    if isinstance(weather_station_file, str | PathLike):
         weather_station_file = [weather_station_file]
+    if isinstance(date, str):
+        date = datetime.date.fromisoformat(date)
     ws: WS
     if site_meta["name"] == "Palaiseau":
         ws = PalaiseauWS(weather_station_file, site_meta)
@@ -64,6 +66,8 @@ def ws2nc(
         ws = LampedusaWS(weather_station_file, site_meta)
     elif site_meta["name"] == "Limassol":
         ws = LimassolWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "L'Aquila":
+        ws = LAquilaWS(weather_station_file, site_meta)
     else:
         msg = "Unsupported site"
         raise ValueError(msg)
@@ -98,8 +102,8 @@ class WS(CSVFile):
         rainfall_amount = ma.cumsum(self.data["rainfall_rate"].data * resolution)
         self.data["rainfall_amount"] = CloudnetArray(rainfall_amount, "rainfall_amount")
 
-    def screen_timestamps(self, date: str) -> None:
-        dates = np.array([str(d.date()) for d in self._data["time"]])
+    def screen_timestamps(self, date: datetime.date) -> None:
+        dates = np.array([d.date() for d in self._data["time"]])
         valid_mask = dates == date
         if not valid_mask.any():
             raise ValidTimeStampError
@@ -139,7 +143,7 @@ class WS(CSVFile):
 
 
 class PalaiseauWS(WS):
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         super().__init__(site_meta)
         self.filenames = filenames
         self._data = self._read_data()
@@ -170,8 +174,8 @@ class PalaiseauWS(WS):
         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"]]
+    def screen_timestamps(self, date: datetime.date) -> None:
+        dates = [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
@@ -228,7 +232,7 @@ class BucharestWS(PalaiseauWS):
 
 
 class GranadaWS(WS):
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         if len(filenames) != 1:
             raise ValueError
         super().__init__(site_meta)
@@ -278,7 +282,7 @@ class GranadaWS(WS):
 
 
 class KenttarovaWS(WS):
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         super().__init__(site_meta)
         self.filenames = filenames
         self._data = self._read_data()
@@ -334,7 +338,7 @@ class HyytialaWS(WS):
     - BbRT/mm = Bucket content in real-time (Pluvio200) [mm].
     """
 
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         super().__init__(site_meta)
         self.filename = filenames[0]
         self._data = self._read_data()
@@ -395,7 +399,7 @@ class HyytialaWS(WS):
 
 
 class GalatiWS(WS):
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         super().__init__(site_meta)
         self.filename = filenames[0]
         self._data = self._read_data()
@@ -450,7 +454,7 @@ class GalatiWS(WS):
 
 
 class JuelichWS(WS):
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         super().__init__(site_meta)
         self.filename = filenames[0]
         self._data = self._read_data()
@@ -496,7 +500,7 @@ class JuelichWS(WS):
 class LampedusaWS(WS):
     """Read Lampedusa weather station data in ICOS format."""
 
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         super().__init__(site_meta)
         self.filename = filenames[0]
         self._data = self._read_data()
@@ -549,7 +553,7 @@ class LampedusaWS(WS):
 
 
 class LimassolWS(WS):
-    def __init__(self, filenames: list[str], site_meta: dict):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
         super().__init__(site_meta)
         self.filenames = filenames
         self._data = defaultdict(list)
@@ -562,8 +566,8 @@ class LimassolWS(WS):
         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"]]
+    def screen_timestamps(self, date: datetime.date) -> None:
+        dates = [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
@@ -646,3 +650,51 @@ def _parse_sirta(filename: str | PathLike):
                 parsed = float(value)
             output[column].append(parsed)
     return output
+
+
+class LAquilaWS(WS):
+    def __init__(self, filenames: Sequence[str | PathLike], site_meta: dict):
+        super().__init__(site_meta)
+        self.filenames = filenames
+        self._data = self._read_data()
+
+    def _read_data(self) -> dict:
+        data: dict[str, list] = {
+            key: []
+            for key in [
+                "time",
+                "air_temperature",
+                "air_pressure",
+                "relative_humidity",
+                "rainfall_rate",
+                "wind_speed",
+                "wind_direction",
+            ]
+        }
+        for filename in self.filenames:
+            with open(filename) as f:
+                for row in f:
+                    if row.startswith("#"):
+                        continue
+                    columns = row.split(",")
+                    if len(columns) != 7:
+                        continue
+                    timestamp = datetime.datetime.strptime(
+                        columns[0], "%Y-%m-%dT%H:%M:%SZ"
+                    ).replace(tzinfo=datetime.timezone.utc)
+                    data["time"].append(timestamp)
+                    data["air_temperature"].append(self._parse_value(columns[1]))
+                    data["air_pressure"].append(self._parse_value(columns[2]))
+                    data["relative_humidity"].append(self._parse_value(columns[3]))
+                    data["rainfall_rate"].append(self._parse_value(columns[4]))
+                    data["wind_speed"].append(self._parse_value(columns[5]))
+                    data["wind_direction"].append(self._parse_value(columns[6]))
+        output = self.format_data(data)
+        _, time_ind = np.unique(output["time"], return_index=True)
+        for key in output:
+            output[key] = output[key][time_ind]
+        return output
+
+    def _parse_value(self, value: str) -> float:
+        value = value.strip()
+        return float(value) if value else math.nan

{cloudnetpy-1.80.1 → cloudnetpy-1.80.3}/cloudnetpy/version.py

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

{cloudnetpy-1.80.1 → cloudnetpy-1.80.3/cloudnetpy.egg-info}/PKG-INFO

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