cloudnetpy 1.61.5__py3-none-any.whl → 1.61.6__py3-none-any.whl

cloudnetpy/instruments/disdrometer/thies.py

@@ -151,7 +151,8 @@ class Thies(Disdrometer):
         with open(filename) as file:
             first_line = file.readline()
         if "TOA5" in first_line:
-            for row in read_toa5(filename):
+            units, process, rows = read_toa5(filename)
+            for row in rows:
                 self._read_line(row["RawString"], row["TIMESTAMP"])
         else:
             with open(filename) as file:

cloudnetpy/instruments/toa5.py

@@ -4,7 +4,9 @@ from os import PathLike
 from typing import Any
 
 
-def read_toa5(filename: str | PathLike) -> list[dict[str, Any]]:
+def read_toa5(
+    filename: str | PathLike,
+) -> tuple[dict[str, str], dict[str, str], list[dict[str, Any]]]:
     """Read ASCII data from Campbell Scientific datalogger such as CR1000.
 
     References
@@ -18,9 +20,11 @@ def read_toa5(filename: str | PathLike) -> list[dict[str, Any]]:
             msg = "Invalid TOA5 file"
             raise ValueError(msg)
         header_line = next(reader)
-        _units_line = next(reader)
-        _process_line = next(reader)
+        units_line = next(reader)
+        process_line = next(reader)
         output = []
+        units = dict(zip(header_line, units_line, strict=False))
+        process = dict(zip(header_line, process_line, strict=False))
 
         row_template: dict[str, Any] = {}
         for header in header_line:
@@ -42,4 +46,4 @@ def read_toa5(filename: str | PathLike) -> list[dict[str, Any]]:
                 else:
                     row[key] = parsed_value
             output.append(row)
-        return output
+        return units, process, output

cloudnetpy/instruments/weather_station.py

@@ -1,5 +1,6 @@
 import datetime
 
+import numpy as np
 from numpy import ma
 
 from cloudnetpy import output
@@ -8,6 +9,7 @@ from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.exceptions import ValidTimeStampError, WeatherStationDataError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
+from cloudnetpy.instruments.toa5 import read_toa5
 from cloudnetpy.metadata import MetaData
 from cloudnetpy.utils import datetime2decimal_hours
 
@@ -19,7 +21,7 @@ def ws2nc(
     uuid: str | None = None,
     date: str | None = None,
 ) -> str:
-    """Converts weather-station data into Cloudnet Level 1b netCDF file.
+    """Converts weather station data into Cloudnet Level 1b netCDF file.
 
     Args:
         weather_station_file: Filename of weather-station ASCII file.
@@ -37,7 +39,14 @@ def ws2nc(
         ValidTimeStampError: No valid timestamps found.
     """
     try:
-        ws = WS(weather_station_file, site_meta)
+        ws: WS
+        if site_meta["name"] == "Palaiseau":
+            ws = PalaiseauWS(weather_station_file, site_meta)
+        elif site_meta["name"] == "Granada":
+            ws = GranadaWS(weather_station_file, site_meta)
+        else:
+            msg = "Unsupported site"
+            raise ValueError(msg)  # noqa: TRY301
         if date is not None:
             ws.screen_timestamps(date)
         ws.convert_time()
@@ -53,11 +62,29 @@ def ws2nc(
 
 
 class WS(CloudnetInstrument):
+    date: list[str]
+
+    def convert_time(self) -> None:
+        pass
+
+    def screen_timestamps(self, date: str) -> None:
+        pass
+
+    def add_date(self) -> None:
+        pass
+
+    def add_data(self) -> None:
+        pass
+
+    def convert_units(self) -> None:
+        pass
+
+
+class PalaiseauWS(WS):
     def __init__(self, filename: str, site_meta: dict):
         super().__init__()
         self.filename = filename
         self.site_meta = site_meta
-        self.date: list[str] = []
         self.instrument = instruments.GENERIC_WEATHER_STATION
         self._data = self._read_data()
 
@@ -145,7 +172,94 @@ class WS(CloudnetInstrument):
         self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
         self.data["rainfall_amount"].data = (
             self.data["rainfall_amount"][:] / 1000
-        )  # m -> mm
+        )  # mm -> m
+
+
+class GranadaWS(WS):
+    def __init__(self, filename: str, site_meta: dict):
+        super().__init__()
+        self.filename = filename
+        self.site_meta = site_meta
+        self.instrument = instruments.GENERIC_WEATHER_STATION
+        self._data = self._read_data()
+
+    def _read_data(self) -> dict:
+        keymap = {
+            "TIMESTAMP": "time",
+            "air_t_Avg": "air_temperature",
+            "rh_Avg": "relative_humidity",
+            "pressure_Avg": "air_pressure",
+            "wind_speed_avg": "wind_speed",
+            "wind_dir_avg": "wind_direction",
+            "rain_Tot": "rainfall_rate",
+        }
+        expected_units = {
+            "air_t_Avg": "degC",
+            "rh_Avg": "%",
+            "pressure_Avg": "hPa",
+            "wind_speed_avg": "m/s",
+            "wind_dir_avg": "Deg",
+            "rain_Tot": "mm",
+        }
+        units, process, rows = read_toa5(self.filename)
+        for key in units:
+            if key in expected_units and expected_units[key] != units[key]:
+                msg = (
+                    f"Expected {key} to have units {expected_units[key]},"
+                    f" got {units[key]} instead"
+                )
+                raise ValueError(msg)
+
+        data: dict[str, list] = {keymap[key]: [] for key in units if key in keymap}
+        for row in rows:
+            for key, value in row.items():
+                if key not in keymap:
+                    continue
+                parsed = value
+                if keymap[key] != "time":
+                    parsed = float(value)
+                data[keymap[key]].append(parsed)
+        return data
+
+    def convert_time(self) -> None:
+        pass
+
+    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_date(self) -> None:
+        first_date = self._data["time"][0].date()
+        self.date = [
+            str(first_date.year),
+            str(first_date.month).zfill(2),
+            str(first_date.day).zfill(2),
+        ]
+
+    def add_data(self) -> None:
+        for key, value in self._data.items():
+            parsed = datetime2decimal_hours(value) if key == "time" else np.array(value)
+            self.data[key] = CloudnetArray(parsed, key)
+        self.data["rainfall_amount"] = CloudnetArray(
+            np.cumsum(self._data["rainfall_rate"]), "rainfall_amount"
+        )
+
+    def convert_units(self) -> None:
+        temperature_kelvins = atmos_utils.c2k(self.data["air_temperature"][:])
+        self.data["air_temperature"].data = temperature_kelvins
+        self.data["relative_humidity"].data = self.data["relative_humidity"][:] / 100
+        self.data["air_pressure"].data = self.data["air_pressure"][:] * 100  # hPa -> Pa
+        rainfall_rate = self.data["rainfall_rate"][:]
+        self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
+        self.data["rainfall_amount"].data = (
+            self.data["rainfall_amount"][:] / 1000
+        )  # mm -> m
 
 
 ATTRIBUTES = {

cloudnetpy/products/mwr_tools.py

@@ -130,3 +130,4 @@ class Mwr:
         )
         self.nc_l2.source_file_uuids = self.nc_l1c.file_uuid
         self.nc_l2.mwrpy_version = mwrpy_version
+        self.nc_l2.instrument_pid = self.nc_l1c.instrument_pid

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 61
-PATCH = 5
+PATCH = 6
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.61.5.dist-info → cloudnetpy-1.61.6.dist-info}/METADATA

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

{cloudnetpy-1.61.5.dist-info → cloudnetpy-1.61.6.dist-info}/RECORD

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=WoVTNuxni0DUr163vZ-_mDr1brXhY15XSlGMrq9Aoqw,14700
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=0TlHm71YtSrKXBsRKctitnhQrvZPE-ulEVeAQW-oK58,27398
-cloudnetpy/version.py,sha256=wWSbFMdT54VpsZJNxnh15y-5LNveGZg6cV6si07cF60,72
+cloudnetpy/version.py,sha256=EsOOkDhmmN4gMdVOGcAyBa9FEtyJpkC4FPZ6YnoxVgA,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=fWW8ye_8HZASRAiYwURFKWzcGOYIA2RKeVxCq0lVOuM,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
@@ -45,13 +45,13 @@ cloudnetpy/instruments/pollyxt.py,sha256=SccV9htZ5MWrK7JEleOr4hbmeTr-lKktUzAt7H9
 cloudnetpy/instruments/radiometrics.py,sha256=2ofeZ6KJ_JOWTd3UA-wSzJpM5cjN7R4jZeBLJCQKEYc,7624
 cloudnetpy/instruments/rpg.py,sha256=U8nEOlOI74f2lk2w4C4xKZCrW6AkDZpQZYE3yv7SNHE,17130
 cloudnetpy/instruments/rpg_reader.py,sha256=LAdXL3TmD5QzQbqtPOcemZji_qkXwmw6a6F8NmF6Zg8,11355
-cloudnetpy/instruments/toa5.py,sha256=xYJYEVNykCWqIsESno0eBIWqkYb-LHXjFjUp3EoqGDU,1565
+cloudnetpy/instruments/toa5.py,sha256=1JnuYViD8c_tHJZ9lf4OU44iepEkXHsXOzDfVf_b0qc,1759
 cloudnetpy/instruments/vaisala.py,sha256=GzESZvboOoXzWmmr9dC-y6oM6ogc-M-zT3KmBTaD0LI,14512
-cloudnetpy/instruments/weather_station.py,sha256=gTY3Y5UATqJo9Gld4hm7WdsKBwcF8WgNTIK2nOfl3Nc,5739
+cloudnetpy/instruments/weather_station.py,sha256=0ajUvZ4BQIr_HXwBgEek2rf3Oorqp4L-t95gIUVK9vM,9650
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=WiL-vCjw9Gmb5irvW3AXddsyprp8MGOfqcVAlfy0zpc,25521
-cloudnetpy/instruments/disdrometer/thies.py,sha256=lNR5ahOKIsO_gcpmbYZwh2UP2aawpQ5J9RrrnPKFFIE,10046
+cloudnetpy/instruments/disdrometer/thies.py,sha256=8V_1wx-8ncBJKs40e1_kvpOh3wj5UIl8YwvkVHf34MA,10086
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=oUGIblcEWLLv16YKUch-M5KA-dGRAcuHa-9anP3xtX4,6447
 cloudnetpy/model_evaluation/metadata.py,sha256=7ZL87iDbaQJIMu8wfnMvb01cGVPkl8RtvEm_tt9uIHE,8413
@@ -105,11 +105,11 @@ cloudnetpy/products/ier.py,sha256=IcGPlQahbwJjp3vOOrxWSYW2FPzbSV0KQL5eYECc4kU,77
 cloudnetpy/products/iwc.py,sha256=MUPuVKWgqOuuLRCGk3QY74uBZB_7P1qlinlP8nEvz9o,10124
 cloudnetpy/products/lwc.py,sha256=TbIR6kMwjbm63ed5orB1pkqx9ZBm8C5TF2JmT8WKdKI,18794
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
-cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
+cloudnetpy/products/mwr_tools.py,sha256=RuzokxxqXlTGk7XAOrif_FDPUJdf0j_wJgNq-7a_nK8,4684
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.61.5.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.61.5.dist-info/METADATA,sha256=yj6xgn1999ZwuQIreZDzaDsYYfX9lnjDmA0oTL93Y4M,5784
-cloudnetpy-1.61.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloudnetpy-1.61.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.61.5.dist-info/RECORD,,
+cloudnetpy-1.61.6.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.61.6.dist-info/METADATA,sha256=0LfEZSv2s7N1rWbBerVyMlCKhFGupgn6KqjvJvZxDa4,5784
+cloudnetpy-1.61.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloudnetpy-1.61.6.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.61.6.dist-info/RECORD,,