cloudnetpy 1.69.6__py3-none-any.whl → 1.69.8__py3-none-any.whl

cloudnetpy/instruments/hatpro.py

@@ -31,7 +31,7 @@ def hatpro2l1c(
     output_file: str,
     site_meta: dict,
     uuid: str | None = None,
-    date: str | None = None,
+    date: datetime.date | str | None = None,
 ) -> str:
     """Converts RPG HATPRO microwave radiometer data into Cloudnet Level 1c netCDF file.
 
@@ -45,7 +45,11 @@ def hatpro2l1c(
     Returns:
         UUID of the generated file.
     """
+    if isinstance(date, str):
+        date = datetime.date.fromisoformat(date)
+
     coeff_files = site_meta.get("coefficientFiles")
+    time_offset = site_meta.get("time_offset")
 
     try:
         hatpro_raw = lev1_to_nc(
@@ -54,6 +58,8 @@ def hatpro2l1c(
             output_file=output_file,
             coeff_files=coeff_files,
             instrument_config=site_meta,
+            date=date,
+            time_offset=time_offset,
         )
     except MissingInputData as err:
         raise HatproDataError(str(err)) from err
@@ -73,7 +79,7 @@ def hatpro2l1c(
             msg = "Timestamps are not increasing"
             raise RuntimeError(msg)
         dates = [
-            str(datetime.datetime.fromtimestamp(t, tz=datetime.timezone.utc).date())
+            datetime.datetime.fromtimestamp(t, tz=datetime.timezone.utc).date()
             for t in timestamps
         ]
         if len(set(dates)) != 1:
@@ -119,7 +125,7 @@ class HatproL1c:
     def __init__(self, hatpro, site_meta: dict):
         self.raw_data = hatpro.raw_data
         self.data = hatpro.data
-        self.date = hatpro.date.split("-")
+        self.date = hatpro.date.isoformat().split("-")
         self.site_meta = site_meta
         self.instrument = HATPRO
 

cloudnetpy/instruments/weather_station.py

@@ -59,6 +59,8 @@ def ws2nc(
             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)  # noqa: TRY301
@@ -486,3 +488,57 @@ 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():
+                    parsed_value: float | datetime.datetime
+                    if key == "time":
+                        parsed_value = datetime.datetime.strptime(
+                            value, "%y%m%d %H%M%S"
+                        )
+                    else:
+                        try:
+                            parsed_value = float(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/version.py

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

{cloudnetpy-1.69.6.dist-info → cloudnetpy-1.69.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.69.6
+Version: 1.69.8
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -36,13 +36,14 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cloudnetpy_qc>=1.15.0
 Requires-Dist: matplotlib
-Requires-Dist: mwrpy>=0.4.3
+Requires-Dist: mwrpy>=1.2.0
 Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5

{cloudnetpy-1.69.6.dist-info → cloudnetpy-1.69.8.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=BDEpgwZ58PHznc1gi11gtNNV4kFiMAmlHnF4huTy7nw,5982
 cloudnetpy/output.py,sha256=lq4YSeMT_d-j4rlQkKm9KIZ8boupTBBBKV1eUawpmCI,15672
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=U0iMIKPiKLrLVAfs_u9pPuoWYW1RJHcM8dbLF9a4yIA,29796
-cloudnetpy/version.py,sha256=bOMrMUm9vSvk1M_E6n6Vuivpe2UE2n6sQfRdPCJzuk0,72
+cloudnetpy/version.py,sha256=oaJd6xYmjdmgsgXNLrMDy5RnVEklJFG2LJx1HtW5UnE,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=RcmbKxm2COkE7WEya0mK3yX5rzUbrewRVh3ekm01RtM,10598
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -41,7 +41,7 @@ cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoG
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=086GJ6Nfp7sK9ZK8UygJOn-aiVPreez674_gbrOZj4I,5183
 cloudnetpy/instruments/copernicus.py,sha256=99idcn6-iKOSvSslNjwFRng3gwlTLFjKPiT1tnVytpQ,6613
 cloudnetpy/instruments/galileo.py,sha256=BjWE15_S3tTCOmAM5k--oicI3wghKaO0hv9EUBxtbl8,4830
-cloudnetpy/instruments/hatpro.py,sha256=DzCWzTJxTc5BSOgoeyM8RjYkSXX6NDi3QXgKRp0uxlI,8759
+cloudnetpy/instruments/hatpro.py,sha256=5jeONT2gBlAFr_M6mPablAiWloBYta_9nvXv6kt75LU,8969
 cloudnetpy/instruments/instruments.py,sha256=97hHMjp8fp2IKihr0XJYY3BrOlBArU7gYwYmt3OxqvU,4124
 cloudnetpy/instruments/lufft.py,sha256=nIoEKuuFGKq2dLqkX7zW-HpAifefG472tZhKfXE1yoA,4212
 cloudnetpy/instruments/mira.py,sha256=Wofp8HbiAwJce_IbOLjpEFV07H_Kh4170C9Wygiz-ew,11401
@@ -55,7 +55,7 @@ cloudnetpy/instruments/rpg.py,sha256=vfs_eGahPOxFjOIBczNywRwtdutOsJpSNeXZm99SIOo
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
 cloudnetpy/instruments/vaisala.py,sha256=MA6hAlanFrxJlF4suDxLt5FyjcSSzJg-SWRnkLQpu3E,14688
-cloudnetpy/instruments/weather_station.py,sha256=jSu9sY2LYV1ssWcuLr6kiF8EEqGW29mywE9UUZccac0,18720
+cloudnetpy/instruments/weather_station.py,sha256=3xClMqo4SV361flX7YM9psEKgF9gr8RHiAN0DKfJ0Kg,20623
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=HJZrEysQkx9MiIVPDV25CYHpXi_SjgZlgO-otoaKK34,25640
@@ -116,9 +116,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.69.6.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.69.6.dist-info/METADATA,sha256=mXbB2TSu_snLy1mvDk5TyDyYCTJ7glAFI1F3hI6eGgU,5793
-cloudnetpy-1.69.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cloudnetpy-1.69.6.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.69.6.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.69.6.dist-info/RECORD,,
+cloudnetpy-1.69.8.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.69.8.dist-info/METADATA,sha256=jNccVHKF97dDMCivFHqVVmoHQ0MQ2yU9ZnR6kz-Tfts,5844
+cloudnetpy-1.69.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cloudnetpy-1.69.8.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.69.8.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.69.8.dist-info/RECORD,,