cloudnetpy 1.67.5__py3-none-any.whl → 1.67.7__py3-none-any.whl

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/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/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/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/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/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/version.py

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

{cloudnetpy-1.67.5.dist-info → cloudnetpy-1.67.7.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.67.7.dist-info}/RECORD

@@ -5,11 +5,11 @@ cloudnetpy/concat_lib.py,sha256=jcLppqAmVHVkykcXBcpwUr8MS_k8v2Xl2xBLmVRE_DI,1262
 cloudnetpy/constants.py,sha256=jjW1eO5BwmLjtCKXKGXtKF_BoKpvSNrRfpgW43fWT_0,824
 cloudnetpy/datasource.py,sha256=FcWS77jz56gIzwnbafDLdj-HjAyu0P_VtY7gkeVZThU,7952
 cloudnetpy/exceptions.py,sha256=ns48useL9RN3mPh7CqIiLA19VI9OmVbyRsKTkwbThF8,1760
-cloudnetpy/metadata.py,sha256=QhmwRDzIqT6qAceocwpNx_CZVHAb1MUVoAmihybVkIM,5631
+cloudnetpy/metadata.py,sha256=gEHwqEMY9gfaqVxx2_CobLg3i5gFXAumXLwnnW4BqtU,5840
 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=1kieuJxeVgwMXQUtOdo25ewj0bWtAJPCVKU_wHSvJ5M,72
+cloudnetpy/version.py,sha256=7yE3lBEcymz1KTStwm6vVywUwyVXXXVaFW5yotGJnmM,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
@@ -32,7 +32,7 @@ cloudnetpy/categorize/attenuations/gas_attenuation.py,sha256=emr-RCxQT0i2N8k6eBN
 cloudnetpy/categorize/attenuations/liquid_attenuation.py,sha256=0p0G79BPkw1itCXHMwbvkNHtJGBocJzow3gNHAirChI,3036
 cloudnetpy/categorize/attenuations/melting_attenuation.py,sha256=9c9xoZHtGUbjFYJxkVc3UUDHLDy0UbNUZ32ITtnsj5w,2333
 cloudnetpy/categorize/attenuations/rain_attenuation.py,sha256=qazJzRyXf9vbjJhh4yiFmABI4L57j5W_6YZ-6qjRiBI,2839
-cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1IRRwTI,398
+cloudnetpy/instruments/__init__.py,sha256=0ffYMCJoqXfwYY8LUjhZowJ6X_pGyqJRXHTSy-9p2bA,434
 cloudnetpy/instruments/basta.py,sha256=_OTnySd36ktvxk_swWBzbv_H4AVGlkF_Ce3KtPGD1rE,3758
 cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3Dn0WbvoAppFOMbA8,5270
 cloudnetpy/instruments/ceilo.py,sha256=xrI7iYNftKvGZf-3C_ESUNsu-QhXV43iWkDuKp3biZU,9552
@@ -42,7 +42,7 @@ cloudnetpy/instruments/cloudnet_instrument.py,sha256=NQZ_FMXh8iyzXYSCKQSpIdp0MZF
 cloudnetpy/instruments/copernicus.py,sha256=he15ncH6SDCidBhr0BkOJc6Rg8cMvLWN0vGmpui6nGQ,6611
 cloudnetpy/instruments/galileo.py,sha256=qABO3IUdRpGFDgqKsN0Pl4TQ-CWHQz8s13PxnwdIUnU,4828
 cloudnetpy/instruments/hatpro.py,sha256=DzCWzTJxTc5BSOgoeyM8RjYkSXX6NDi3QXgKRp0uxlI,8759
-cloudnetpy/instruments/instruments.py,sha256=cHP0RN-Z8Jl9yoDHdvaOflTrzuogDTGmd-nxSOk8Uq4,3568
+cloudnetpy/instruments/instruments.py,sha256=97hHMjp8fp2IKihr0XJYY3BrOlBArU7gYwYmt3OxqvU,4124
 cloudnetpy/instruments/lufft.py,sha256=ugXF6pssHAAz1Y_hqPdpKuluAjxxHSR88xBmQuS6RlI,3705
 cloudnetpy/instruments/mira.py,sha256=un7qcoJrIeZmKWmVFCV84rmYCZkyJtvYnYXEhkENrY4,10407
 cloudnetpy/instruments/mrr.py,sha256=eeAzCp3CiHGauywjwvMUAFwZ4vBOZMcd3IlF8KsrLQo,5711
@@ -50,11 +50,11 @@ cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wf
 cloudnetpy/instruments/nc_radar.py,sha256=AjPn3mkq5a1mE7YzKtZnxX5suNju9NhUq-TDvs7T_uU,6911
 cloudnetpy/instruments/pollyxt.py,sha256=ra7sYQ_cmkC0T9TBYrMN6iiQEZimmWGdW9Ilv61JB-Q,10027
 cloudnetpy/instruments/radiometrics.py,sha256=ySG4a042XkgjMTG8d20oAPNvFvw9bMwwiqS3zv-JF_w,11825
-cloudnetpy/instruments/rpg.py,sha256=IozvBJ8_qXTPqtp58FQwRsoI5_aI3-kycpXugZkS0d4,17462
+cloudnetpy/instruments/rpg.py,sha256=vfs_eGahPOxFjOIBczNywRwtdutOsJpSNeXZm99SIOo,17438
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
 cloudnetpy/instruments/vaisala.py,sha256=GGuA_v4S7kR9yApSr1-d0ETzNj4ehEZ7-pD1-AdPYRE,14662
-cloudnetpy/instruments/weather_station.py,sha256=p0JoKuh0Rce9WcQNtvwaxehieBoGWnE1cKotx_ClXPs,18259
+cloudnetpy/instruments/weather_station.py,sha256=bWPL5dvsxumc0-0JP81i-2c0oWy7_ds8VGOWsn8Qt3c,17982
 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
@@ -101,7 +101,7 @@ cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=Ra3r4V
 cloudnetpy/model_evaluation/tests/unit/test_tools.py,sha256=Ia_VrLdV2NstX5gbx_3AZTOAlrgLAy_xFZ8fHYVX0xI,3817
 cloudnetpy/plotting/__init__.py,sha256=lg9Smn4BI0dVBgnDLC3JVJ4GmwoSnO-qoSd4ApvwV6Y,107
 cloudnetpy/plotting/plot_meta.py,sha256=d7CIT4ltUsjKw0HNnOXPkaLdZbkSmTuq6AbKdbODfZE,16730
-cloudnetpy/plotting/plotting.py,sha256=bO-y1xAW0UvHFDGy5-5RxHbslF8UVPvlp-ARDpFpz6M,37321
+cloudnetpy/plotting/plotting.py,sha256=exrnu539ZDouLyyEe6wcWT0YOZDMl8BpJQitlWiwBXw,37422
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=KwAiBSgFwDqhM114NIgYiUjj8HoYc7gAlc8E1QgcSig,8207
 cloudnetpy/products/der.py,sha256=soypE7uSEP4uHUCCQVEhyXsKY6e9mzV9B_2S5GUizqk,12729
@@ -115,9 +115,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.67.5.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.67.5.dist-info/METADATA,sha256=FEyHXhhROX3iv-iXHFwVrR7XtS0C3uCa7wfsr-sACNA,5793
-cloudnetpy-1.67.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-cloudnetpy-1.67.5.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.67.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.67.5.dist-info/RECORD,,
+cloudnetpy-1.67.7.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.67.7.dist-info/METADATA,sha256=xNcuNlUWkAJs_Af5JUd0jF_qjspra799qxdHYeyyD0E,5793
+cloudnetpy-1.67.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cloudnetpy-1.67.7.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.67.7.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.67.7.dist-info/RECORD,,

{cloudnetpy-1.67.5.dist-info → cloudnetpy-1.67.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any