cloudnetpy 1.67.8__tar.gz → 1.68.0__tar.gz

{cloudnetpy-1.67.8/cloudnetpy.egg-info → cloudnetpy-1.68.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.67.8
+Version: 1.68.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.67.8 → cloudnetpy-1.68.0}/cloudnetpy/instruments/__init__.py

@@ -9,5 +9,6 @@ from .mira import mira2nc
 from .mrr import mrr2nc
 from .pollyxt import pollyxt2nc
 from .radiometrics import radiometrics2nc
+from .rain_e_h3 import rain_e_h32nc
 from .rpg import rpg2nc
 from .weather_station import ws2nc

{cloudnetpy-1.67.8 → cloudnetpy-1.68.0}/cloudnetpy/instruments/cloudnet_instrument.py

@@ -112,3 +112,34 @@ class CloudnetInstrument:
         if np.isnan(zenith_angle) or zenith_angle is ma.masked:
             return None
         return zenith_angle
+
+
+class CSVFile(CloudnetInstrument):
+    def __init__(self, site_meta: dict):
+        super().__init__()
+        self.site_meta = site_meta
+        self._data: dict = {}
+
+    def add_date(self) -> None:
+        dt = self._data["time"][0]
+        self.date = dt.strftime("%Y %m %d").split()
+
+    def add_data(self) -> None:
+        for key, value in self._data.items():
+            parsed = (
+                utils.datetime2decimal_hours(value)
+                if key == "time"
+                else ma.array(value)
+            )
+            self.data[key] = CloudnetArray(parsed, key)
+
+    def normalize_rainfall_amount(self) -> None:
+        if "rainfall_amount" in self.data:
+            amount = self.data["rainfall_amount"][:]
+            offset = 0
+            for i in range(1, len(amount)):
+                if amount[i] + offset < amount[i - 1]:
+                    offset += amount[i - 1]
+                amount[i] += offset
+            amount -= amount[0]
+            self.data["rainfall_amount"].data = amount

cloudnetpy-1.68.0/cloudnetpy/instruments/rain_e_h3.py

@@ -0,0 +1,166 @@
+import csv
+import datetime
+from os import PathLike
+
+import numpy as np
+
+from cloudnetpy import output
+from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.instruments import instruments
+from cloudnetpy.instruments.cloudnet_instrument import CSVFile
+
+
+def rain_e_h32nc(
+    input_file: str | PathLike,
+    output_file: str,
+    site_meta: dict,
+    uuid: str | None = None,
+    date: str | datetime.date | None = None,
+):
+    """Converts rain_e_h3 rain-gauge into Cloudnet Level 1b netCDF file.
+
+    Args:
+        input_file: Filename of rain_e_h3 CSV file.
+        output_file: Output filename.
+        site_meta: Dictionary containing information about the site. Required key
+            is `name`.
+        uuid: Set specific UUID for the file.
+        date: Expected date of the measurements as YYYY-MM-DD or datetime.date object.
+
+    Returns:
+        UUID of the generated file.
+
+    Raises:
+        WeatherStationDataError : Unable to read the file.
+        ValidTimeStampError: No valid timestamps found.
+    """
+    rain = RainEH3(site_meta)
+    if isinstance(date, str):
+        date = datetime.date.fromisoformat(date)
+    rain.parse_input_file(input_file, date)
+    rain.add_data()
+    rain.add_date()
+    rain.convert_units()
+    rain.normalize_rainfall_amount()
+    rain.add_site_geolocation()
+    attributes = output.add_time_attribute({}, rain.date)
+    output.update_attributes(rain.data, attributes)
+    return output.save_level1b(rain, output_file, uuid)
+
+
+class RainEH3(CSVFile):
+    def __init__(self, site_meta: dict):
+        super().__init__(site_meta)
+        self.instrument = instruments.RAIN_E_H3
+        self._data = {
+            "time": [],
+            "rainfall_rate": [],
+            "rainfall_amount": [],
+        }
+
+    def parse_input_file(
+        self, filepath: str | PathLike, date: datetime.date | None = None
+    ) -> None:
+        with open(filepath, encoding="latin1") as f:
+            data = list(csv.reader(f, delimiter=";"))
+        n_values = np.median([len(row) for row in data]).astype(int)
+
+        if n_values == 22:
+            self._read_talker_protocol_22_columns(data, date)
+        elif n_values == 16:
+            self._read_talker_protocol_16_columns(data, date)
+        else:
+            msg = "Only talker protocol with 16 or 22 columns is supported."
+            raise NotImplementedError(msg)
+
+    def _read_talker_protocol_16_columns(
+        self, data: list, date: datetime.date | None = None
+    ) -> None:
+        """Old Lindenberg data format.
+
+        0  date  DD.MM.YYYY
+        1  time
+        2  precipitation intensity in mm/h
+        3  precipitation accumulation in mm
+        4  housing contact
+        5  top temperature
+        6  bottom temperature
+        7  heater status
+        8  error code
+        9  system status
+        10 talker interval in seconds
+        11 operating hours
+        12 device type
+        13 user data storage 1
+        14 user data storage 2
+        15 user data storage 3
+
+        """
+        for row in data:
+            if len(row) != 16:
+                continue
+            try:
+                dt = datetime.datetime.strptime(
+                    f"{row[0]} {row[1]}", "%d.%m.%Y %H:%M:%S"
+                )
+            except ValueError:
+                continue
+            if date and date != dt.date():
+                continue
+            self._data["time"].append(dt)
+            self._data["rainfall_rate"].append(float(row[2]))
+            self._data["rainfall_amount"].append(float(row[3]))
+        if not self._data["time"]:
+            raise ValidTimeStampError
+
+    def _read_talker_protocol_22_columns(
+        self, data: list, date: datetime.date | None = None
+    ) -> None:
+        """Columns according to header in Lindenberg data.
+
+        0  datetime utc
+        1  date
+        2  time
+        3  precipitation intensity in mm/h
+        4  precipitation accumulation in mm
+        5  housing contact
+        6  top temperature
+        7  bottom temperature
+        8  heater status
+        9  error code
+        10 system status
+        11 talker interval in seconds
+        12 operating hours
+        13 device type
+        14 user data storage 1
+        15 user data storage 2
+        16 user data storage 3
+        17 user data storage 4
+        18 serial number
+        19 hardware version
+        20 firmware version
+        21 external temperature * checksum
+
+        """
+        for row in data:
+            if len(row) != 22:
+                continue
+            try:
+                dt = datetime.datetime.strptime(f"{row[0]}", "%Y-%m-%d %H:%M:%S")
+            except ValueError:
+                continue
+            if date and date != dt.date():
+                continue
+            self._data["time"].append(dt)
+            self._data["rainfall_rate"].append(float(row[3]))
+            self._data["rainfall_amount"].append(float(row[4]))
+            self.serial_number = row[18]
+        if not self._data["time"]:
+            raise ValidTimeStampError
+
+    def convert_units(self) -> None:
+        rainfall_rate = self.data["rainfall_rate"][:]
+        self.data["rainfall_rate"].data = rainfall_rate / 3600 / 1000  # mm/h -> m/s
+        self.data["rainfall_amount"].data = (
+            self.data["rainfall_amount"][:] / 1000
+        )  # mm -> m

{cloudnetpy-1.67.8 → cloudnetpy-1.68.0}/cloudnetpy/instruments/weather_station.py

@@ -12,7 +12,7 @@ from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.constants import HPA_TO_PA, MM_H_TO_M_S, SEC_IN_HOUR
 from cloudnetpy.exceptions import ValidTimeStampError, WeatherStationDataError
 from cloudnetpy.instruments import instruments
-from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
+from cloudnetpy.instruments.cloudnet_instrument import CSVFile
 from cloudnetpy.instruments.toa5 import read_toa5
 from cloudnetpy.utils import datetime2decimal_hours
 
@@ -79,28 +79,13 @@ def ws2nc(
     return output.save_level1b(ws, output_file, uuid)
 
 
-class WS(CloudnetInstrument):
+class WS(CSVFile):
     def __init__(self, site_meta: dict):
-        super().__init__()
-        self._data: dict
-        self.site_meta = site_meta
+        super().__init__(site_meta)
         self.instrument = instruments.GENERIC_WEATHER_STATION
 
     date: list[str]
 
-    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 ma.array(value)
-            self.data[key] = CloudnetArray(parsed, key)
-
     def calculate_rainfall_amount(self) -> None:
         if "rainfall_amount" in self.data:
             return
@@ -137,17 +122,6 @@ class WS(CloudnetInstrument):
     def convert_pressure(self) -> None:
         self.data["air_pressure"].data = self.data["air_pressure"][:] * HPA_TO_PA
 
-    def normalize_rainfall_amount(self) -> None:
-        if "rainfall_amount" in self.data:
-            amount = self.data["rainfall_amount"][:]
-            offset = 0
-            for i in range(1, len(amount)):
-                if amount[i] + offset < amount[i - 1]:
-                    offset += amount[i - 1]
-                amount[i] += offset
-            amount -= amount[0]
-            self.data["rainfall_amount"].data = amount
-
     def convert_time(self) -> None:
         pass
 

{cloudnetpy-1.67.8 → cloudnetpy-1.68.0}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 67
-PATCH = 8
+MINOR = 68
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.67.8 → cloudnetpy-1.68.0/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.67.8
+Version: 1.68.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.67.8 → cloudnetpy-1.68.0}/cloudnetpy.egg-info/SOURCES.txt

@@ -60,6 +60,7 @@ cloudnetpy/instruments/nc_lidar.py
 cloudnetpy/instruments/nc_radar.py
 cloudnetpy/instruments/pollyxt.py
 cloudnetpy/instruments/radiometrics.py
+cloudnetpy/instruments/rain_e_h3.py
 cloudnetpy/instruments/rpg.py
 cloudnetpy/instruments/rpg_reader.py
 cloudnetpy/instruments/toa5.py