cloudnetpy 1.66.8__tar.gz → 1.66.10__tar.gz

{cloudnetpy-1.66.8/cloudnetpy.egg-info → cloudnetpy-1.66.10}/PKG-INFO

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

{cloudnetpy-1.66.8 → cloudnetpy-1.66.10}/cloudnetpy/instruments/cloudnet_instrument.py

@@ -78,11 +78,16 @@ class CloudnetInstrument:
         self.screen_time_indices(ind)
 
     def screen_time_indices(self, valid_indices: list | np.ndarray) -> None:
-        if len(valid_indices) == 0:
-            msg = "All timestamps screened"
-            raise ValidTimeStampError(msg)
         time = self._get_time()
         n_time = len(time)
+        if len(valid_indices) == 0 or (
+            isinstance(valid_indices, np.ndarray)
+            and valid_indices.dtype == np.bool_
+            and valid_indices.shape == time.shape
+            and not np.any(valid_indices)
+        ):
+            msg = "All timestamps screened"
+            raise ValidTimeStampError(msg)
         for cloudnet_array in self.data.values():
             array = cloudnet_array.data
             if not utils.isscalar(array) and array.shape[0] == n_time:

{cloudnetpy-1.66.8 → cloudnetpy-1.66.10}/cloudnetpy/instruments/weather_station.py

@@ -1,6 +1,7 @@
 import csv
 import datetime
 import math
+from collections.abc import Iterable
 
 import numpy as np
 from numpy import ma
@@ -109,14 +110,12 @@ class WS(CloudnetInstrument):
         self.data["rainfall_amount"] = CloudnetArray(rainfall_amount, "rainfall_amount")
 
     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:
+        dates = np.array([str(d.date()) for d in self._data["time"]])
+        valid_mask = dates == date
+        if not valid_mask.any():
             raise ValidTimeStampError
         for key in self._data:
-            self._data[key] = [
-                x for ind, x in enumerate(self._data[key]) if ind in valid_ind
-            ]
+            self._data[key] = self._data[key][valid_mask]
 
     @staticmethod
     def format_data(data: dict) -> dict:
@@ -436,15 +435,33 @@ class GalatiWS(WS):
                         except ValueError:
                             parsed_value = math.nan
                     raw_data[key].append(parsed_value)
+
+        def read_value(keys: Iterable[str]):
+            for key in keys:
+                if key in raw_data:
+                    return raw_data[key]
+            raise KeyError("Didn't find any keys: " + ", ".join(keys))
+
         data = {
-            "time": raw_data["TimeStamp"],
-            "air_temperature": raw_data["Temperature"],
-            "relative_humidity": raw_data["RH"],
-            "air_pressure": raw_data["Atmospheric_pressure"],
-            "rainfall_rate": raw_data["Precipitations"],
+            "time": read_value(["TimeStamp"]),
+            "air_temperature": read_value(["Temperature", "Temperatura"]),
+            "relative_humidity": read_value(["RH", "Umiditate_relativa"]),
+            "air_pressure": read_value(
+                ["Atmospheric_pressure", "Presiune_atmosferica"]
+            ),
+            "rainfall_rate": read_value(["Precipitations", "Precipitatii"]),
+            "wind_speed": read_value(["Wind_speed", "Viteza_vant"]),
+            "wind_direction": read_value(["Wind_direction", "Directie_vant"]),
         }
         return self.format_data(data)
 
+    def add_data(self) -> None:
+        # Skip wind measurements where range was limited to 0-180 degrees
+        if datetime.date(*map(int, self.date)) < datetime.date(2024, 10, 29):
+            del self._data["wind_speed"]
+            del self._data["wind_direction"]
+        return super().add_data()
+
     def convert_pressure(self) -> None:
         mmHg2Pa = 133.322
         self.data["air_pressure"].data = self.data["air_pressure"][:] * mmHg2Pa

{cloudnetpy-1.66.8 → cloudnetpy-1.66.10}/cloudnetpy/version.py

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

{cloudnetpy-1.66.8 → cloudnetpy-1.66.10/cloudnetpy.egg-info}/PKG-INFO

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