cloudnetpy 1.69.7__tar.gz → 1.69.9__tar.gz

{cloudnetpy-1.69.7/cloudnetpy.egg-info → cloudnetpy-1.69.9}/PKG-INFO

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

{cloudnetpy-1.69.7 → cloudnetpy-1.69.9}/cloudnetpy/exceptions.py

@@ -30,13 +30,6 @@ class PlottingError(CloudnetException):
         super().__init__(msg)
 
 
-class WeatherStationDataError(CloudnetException):
-    """Internal exception class."""
-
-    def __init__(self, msg: str = "Unable to read the file"):
-        super().__init__(msg)
-
-
 class ModelDataError(CloudnetException):
     """Internal exception class."""
 

{cloudnetpy-1.69.7 → cloudnetpy-1.69.9}/cloudnetpy/instruments/rain_e_h3.py

@@ -31,7 +31,6 @@ def rain_e_h32nc(
         UUID of the generated file.
 
     Raises:
-        WeatherStationDataError : Unable to read the file.
         ValidTimeStampError: No valid timestamps found.
     """
     rain = RainEH3(site_meta)

{cloudnetpy-1.69.7 → cloudnetpy-1.69.9}/cloudnetpy/instruments/weather_station.py

@@ -10,7 +10,7 @@ from cloudnetpy import output
 from cloudnetpy.categorize import atmos_utils
 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.exceptions import ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CSVFile
 from cloudnetpy.instruments.toa5 import read_toa5
@@ -38,46 +38,44 @@ def ws2nc(
         UUID of the generated file.
 
     Raises:
-        WeatherStationDataError : Unable to read the file.
         ValidTimeStampError: No valid timestamps found.
     """
     if not isinstance(weather_station_file, list):
         weather_station_file = [weather_station_file]
-    try:
-        ws: WS
-        if site_meta["name"] == "Palaiseau":
-            ws = PalaiseauWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Bucharest":
-            ws = BucharestWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Granada":
-            ws = GranadaWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Kenttärova":
-            ws = KenttarovaWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Hyytiälä":
-            ws = HyytialaWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Galați":
-            ws = GalatiWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Jülich":
-            ws = JuelichWS(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()
-        ws.add_date()
-        ws.add_site_geolocation()
-        ws.add_data()
-        ws.convert_temperature_and_humidity()
-        ws.convert_pressure()
-        ws.convert_rainfall_rate()
-        ws.convert_rainfall_amount()
-        ws.normalize_rainfall_amount()
-        ws.calculate_rainfall_amount()
-        attributes = output.add_time_attribute({}, ws.date)
-        output.update_attributes(ws.data, attributes)
-    except ValueError as err:
-        raise WeatherStationDataError from err
+    ws: WS
+    if site_meta["name"] == "Palaiseau":
+        ws = PalaiseauWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Bucharest":
+        ws = BucharestWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Granada":
+        ws = GranadaWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Kenttärova":
+        ws = KenttarovaWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Hyytiälä":
+        ws = HyytialaWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Galați":
+        ws = GalatiWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Jülich":
+        ws = JuelichWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Lampedusa":
+        ws = LampedusaWS(weather_station_file, site_meta)
+    else:
+        msg = "Unsupported site"
+        raise ValueError(msg)
+    if date is not None:
+        ws.screen_timestamps(date)
+    ws.convert_time()
+    ws.add_date()
+    ws.add_site_geolocation()
+    ws.add_data()
+    ws.convert_temperature_and_humidity()
+    ws.convert_pressure()
+    ws.convert_rainfall_rate()
+    ws.convert_rainfall_amount()
+    ws.normalize_rainfall_amount()
+    ws.calculate_rainfall_amount()
+    attributes = output.add_time_attribute({}, ws.date)
+    output.update_attributes(ws.data, attributes)
     return output.save_level1b(ws, output_file, uuid)
 
 
@@ -486,3 +484,58 @@ class JuelichWS(WS):
                 data[keymap[key]].append(parsed)
 
         return self.format_data(data)
+
+
+class LampedusaWS(WS):
+    """Read Lampedusa weather station data in ICOS format."""
+
+    def __init__(self, filenames: list[str], site_meta: dict):
+        super().__init__(site_meta)
+        self.filename = filenames[0]
+        self._data = self._read_data()
+
+    def _read_data(self) -> dict:
+        with open(self.filename, newline="") as f:
+            fields = [
+                "time",
+                "str1",
+                "str2",
+                "T",
+                "RH",
+                "Td",
+                "P",
+                "WSi",
+                "WDi",
+                "WS10m",
+                "WD10m",
+                "rain1m",
+                "rain2h",
+                "empty",
+            ]
+            reader = csv.DictReader(f, fieldnames=fields)
+            raw_data: dict = {key: [] for key in fields}
+            for row in reader:
+                for key, value in row.items():
+                    fixed_value = value.strip("\0")
+                    parsed_value: float | datetime.datetime
+                    if key == "time":
+                        parsed_value = datetime.datetime.strptime(
+                            fixed_value, "%y%m%d %H%M%S"
+                        )
+                    else:
+                        try:
+                            parsed_value = float(fixed_value)
+                        except ValueError:
+                            parsed_value = math.nan
+                    raw_data[key].append(parsed_value)
+
+        data = {
+            "time": raw_data["time"],
+            "air_temperature": raw_data["T"],
+            "relative_humidity": raw_data["RH"],
+            "air_pressure": raw_data["P"],
+            "wind_speed": raw_data["WSi"],
+            "wind_direction": raw_data["WDi"],
+            "rainfall_rate": raw_data["rain1m"],
+        }
+        return self.format_data(data)

{cloudnetpy-1.69.7 → cloudnetpy-1.69.9}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 69
-PATCH = 7
+PATCH = 9
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.69.7 → cloudnetpy-1.69.9/cloudnetpy.egg-info}/PKG-INFO

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