cloudnetpy 1.68.1__tar.gz → 1.69.1__tar.gz

{cloudnetpy-1.68.1/cloudnetpy.egg-info → cloudnetpy-1.69.1}/PKG-INFO

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

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1}/cloudnetpy/categorize/model.py

@@ -164,11 +164,11 @@ def _calc_mean_height(model_heights: np.ndarray) -> np.ndarray:
 
 def _find_model_type(file_name: str) -> str:
     """Finds model type from the model filename."""
-    possible_keys = ("gdas1", "icon", "ecmwf", "harmonie", "era5")
+    possible_keys = ("gdas1", "icon", "ecmwf", "harmonie", "era5", "arpege")
     for key in possible_keys:
         if key in file_name:
             return key
-    msg = "Unknown model type"
+    msg = f"Unknown model type: {file_name}"
     raise ValueError(msg)
 
 

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1}/cloudnetpy/instruments/copernicus.py

@@ -97,7 +97,7 @@ def copernicus2nc(
             copernicus.add_nyquist_velocity(keymap)
             copernicus.add_site_geolocation()
             valid_indices = copernicus.add_zenith_and_azimuth_angles(
-                elevation_threshold=1,
+                elevation_threshold=1.1,
                 elevation_diff_threshold=0.1,
                 azimuth_diff_threshold=0.1,
             )

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1}/cloudnetpy/instruments/galileo.py

@@ -93,7 +93,7 @@ def galileo2nc(
             galileo.add_nyquist_velocity(keymap)
             galileo.add_site_geolocation()
             valid_indices = galileo.add_zenith_and_azimuth_angles(
-                elevation_threshold=1,
+                elevation_threshold=1.1,
                 elevation_diff_threshold=0.1,
                 azimuth_diff_threshold=0.1,
             )

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1}/cloudnetpy/instruments/mira.py

@@ -87,9 +87,11 @@ def mira2nc(
             mira.add_site_geolocation()
             mira.add_radar_specific_variables()
             valid_indices = mira.add_zenith_and_azimuth_angles(
-                elevation_threshold=1,
+                elevation_threshold=1.1,
                 elevation_diff_threshold=1e-6,
                 azimuth_diff_threshold=1e-3,
+                zenith_offset=site_meta.get("zenith_offset"),
+                azimuth_offset=site_meta.get("azimuth_offset"),
             )
             mira.screen_time_indices(valid_indices)
             mira.add_height()
@@ -298,4 +300,14 @@ ATTRIBUTES = {
         long_name="Pulse Repetition Frequency",
         units="Hz",
     ),
+    "zenith_offset": MetaData(
+        long_name="Zenith offset of the instrument",
+        units="degrees",
+        comment="Zenith offset applied.",
+    ),
+    "azimuth_offset": MetaData(
+        long_name="Azimuth offset of the instrument (positive clockwise from north)",
+        units="degrees",
+        comment="Azimuth offset applied.",
+    ),
 }

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1}/cloudnetpy/instruments/nc_radar.py

@@ -95,12 +95,21 @@ class NcRadar(DataSource, CloudnetInstrument):
         elevation_threshold: float,
         elevation_diff_threshold: float,
         azimuth_diff_threshold: float,
+        zenith_offset: float | None = None,
+        azimuth_offset: float | None = None,
     ) -> list:
         """Adds non-varying instrument zenith and azimuth angles and returns valid
         time indices.
         """
         elevation = self.data["elevation"].data
+        if zenith_offset is not None:
+            self.append_data(zenith_offset, "zenith_offset")
+            elevation -= zenith_offset
+
         azimuth = self.data["azimuth_angle"].data
+        if azimuth_offset is not None:
+            self.append_data(azimuth_offset, "azimuth_offset")
+            azimuth += azimuth_offset
 
         elevation_diff = ma.diff(elevation, prepend=elevation[1])
         azimuth_diff = ma.diff(azimuth, prepend=azimuth[1])

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1}/cloudnetpy/instruments/weather_station.py

@@ -57,6 +57,8 @@ def ws2nc(
             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
@@ -87,7 +89,7 @@ class WS(CSVFile):
     date: list[str]
 
     def calculate_rainfall_amount(self) -> None:
-        if "rainfall_amount" in self.data:
+        if "rainfall_amount" in self.data or "rainfall_rate" not in self.data:
             return
         resolution = np.median(np.diff(self.data["time"].data)) * SEC_IN_HOUR
         rainfall_amount = ma.cumsum(self.data["rainfall_rate"].data * resolution)
@@ -116,6 +118,8 @@ class WS(CSVFile):
         self.data["relative_humidity"].data = self.data["relative_humidity"][:] / 100
 
     def convert_rainfall_rate(self) -> None:
+        if "rainfall_rate" not in self.data:
+            return
         rainfall_rate = self.data["rainfall_rate"][:]
         self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
 
@@ -438,3 +442,47 @@ class GalatiWS(WS):
     def convert_pressure(self) -> None:
         mmHg2Pa = 133.322
         self.data["air_pressure"].data = self.data["air_pressure"][:] * mmHg2Pa
+
+
+class JuelichWS(WS):
+    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:
+        keymap = {
+            "TIMESTAMP": "time",
+            "AirTC_Avg": "air_temperature",
+            "RH": "relative_humidity",
+            "BV_BP_Avg": "air_pressure",
+            "WS_ms_S_WVT": "wind_speed",
+            "WindDir_D1_WVT": "wind_direction",
+        }
+        expected_units = {
+            "AirTC_Avg": "Deg C",
+            "RH": "%",
+            "BV_BP_Avg": "hPa",
+            "WS_ms_S_WVT": "meters/Second",
+            "WindDir_D1_WVT": "Deg",
+        }
+        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 self.format_data(data)

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1}/cloudnetpy/version.py

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

{cloudnetpy-1.68.1 → cloudnetpy-1.69.1/cloudnetpy.egg-info}/PKG-INFO

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