cloudnetpy 1.67.5__tar.gz → 1.67.7__tar.gz

{cloudnetpy-1.67.5/cloudnetpy.egg-info → cloudnetpy-1.67.7}/PKG-INFO

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

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7}/cloudnetpy/instruments/__init__.py

@@ -4,6 +4,7 @@ from .copernicus import copernicus2nc
 from .disdrometer import parsivel2nc, thies2nc
 from .galileo import galileo2nc
 from .hatpro import hatpro2l1c, hatpro2nc
+from .instruments import Instrument
 from .mira import mira2nc
 from .mrr import mrr2nc
 from .pollyxt import pollyxt2nc

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7}/cloudnetpy/instruments/instruments.py

@@ -178,6 +178,34 @@ THIES = Instrument(
     model="LNM",
 )
 
+PLUVIO2 = Instrument(
+    manufacturer="OTT HydroMet",
+    domain="rain-gauge",
+    category="rain-gauge",
+    model="Pluvio2",
+)
+
+PLUVIO2S = Instrument(
+    manufacturer="OTT HydroMet",
+    domain="rain-gauge",
+    category="rain-gauge",
+    model="Pluvio2S",
+)
+
+THIES_PT = Instrument(
+    manufacturer="Thies Clima",
+    domain="rain-gauge",
+    category="rain-gauge",
+    model="Precipitation Transmitter",
+)
+
+RAIN_E_H3 = Instrument(
+    manufacturer="LAMBRECHT meteo GmbH",
+    domain="rain-gauge",
+    category="rain-gauge",
+    model="rain[e]H3",
+)
+
 GENERIC_WEATHER_STATION = Instrument(
     domain="weather-station",
     category="weather station",

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7}/cloudnetpy/instruments/rpg.py

@@ -158,7 +158,7 @@ def _mask_invalid_data(data_in: dict) -> dict:
     data = data_in.copy()
     fill_values = (-999, 1e-10)
     for name in data:
-        if np.issubdtype(data[name].dtype, np.integer) or name == "rainfall_rate":
+        if np.issubdtype(data[name].dtype, np.integer) or data[name].ndim < 2:
             continue
         data[name] = ma.masked_equal(data[name], 0)
         for value in fill_values:
@@ -333,9 +333,9 @@ class Hatpro(Rpg):
 
 def _filter_zenith_angle(zenith: ma.MaskedArray) -> np.ndarray:
     """Returns indices of profiles with stable zenith angle close to 0 deg."""
+    zenith = ma.array(zenith)
     if zenith.mask.all():
-        zenith[:] = 0
-        logging.warning("Can not determine zenith angle, assuming 0 degrees")
+        return np.zeros(zenith.shape, dtype=bool)
     limits = [-5, 15]
     ind_close_to_zenith = np.where(
         np.logical_and(zenith > limits[0], zenith < limits[1]),

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7}/cloudnetpy/instruments/weather_station.py

@@ -14,7 +14,6 @@ from cloudnetpy.exceptions import ValidTimeStampError, WeatherStationDataError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
 from cloudnetpy.instruments.toa5 import read_toa5
-from cloudnetpy.metadata import MetaData
 from cloudnetpy.utils import datetime2decimal_hours
 
 
@@ -73,7 +72,7 @@ def ws2nc(
         ws.convert_rainfall_amount()
         ws.normalize_rainfall_amount()
         ws.calculate_rainfall_amount()
-        attributes = output.add_time_attribute(ATTRIBUTES, ws.date)
+        attributes = output.add_time_attribute({}, ws.date)
         output.update_attributes(ws.data, attributes)
     except ValueError as err:
         raise WeatherStationDataError from err
@@ -465,13 +464,3 @@ class GalatiWS(WS):
     def convert_pressure(self) -> None:
         mmHg2Pa = 133.322
         self.data["air_pressure"].data = self.data["air_pressure"][:] * mmHg2Pa
-
-
-ATTRIBUTES = {
-    "rainfall_amount": MetaData(
-        long_name="Rainfall amount",
-        standard_name="thickness_of_rainfall_amount",
-        units="m",
-        comment="Cumulated precipitation since 00:00 UTC",
-    ),
-}

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7}/cloudnetpy/metadata.py

@@ -169,6 +169,12 @@ COMMON_ATTRIBUTES = {
         standard_name="rainfall_rate",
         units="m s-1",
     ),
+    "rainfall_amount": MetaData(
+        long_name="Rainfall amount",
+        standard_name="thickness_of_rainfall_amount",
+        units="m",
+        comment="Cumulated precipitation since 00:00 UTC",
+    ),
     "air_temperature": MetaData(
         long_name="Air temperature",
         standard_name="air_temperature",

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7}/cloudnetpy/plotting/plotting.py

@@ -346,6 +346,8 @@ class Plot:
             "relative_humidity": (multiply, 100, "%"),
             "rainfall_amount": (multiply, 1000, "mm"),
             "air_temperature": (add, -273.15, "\u00b0C"),
+            "r_accum_RT": (multiply, 1000, "mm"),
+            "r_accum_NRT": (multiply, 1000, "mm"),
         }
         conversion_method, conversion, units = units_conversion.get(
             self.sub_plot.variable.name, (multiply, 1, None)

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7}/cloudnetpy/version.py

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

{cloudnetpy-1.67.5 → cloudnetpy-1.67.7/cloudnetpy.egg-info}/PKG-INFO

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