cloudnetpy 1.61.10__py3-none-any.whl → 1.61.12__py3-none-any.whl

cloudnetpy/instruments/weather_station.py

@@ -8,6 +8,7 @@ from numpy import ma
 from cloudnetpy import output
 from cloudnetpy.categorize import atmos_utils
 from cloudnetpy.cloudnetarray import CloudnetArray
+from cloudnetpy.constants import MM_H_TO_M_S, SEC_IN_HOUR
 from cloudnetpy.exceptions import ValidTimeStampError, WeatherStationDataError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
@@ -60,6 +61,7 @@ def ws2nc(
         ws.add_site_geolocation()
         ws.add_data()
         ws.convert_units()
+        ws.calculate_rainfall_amount()
         attributes = output.add_time_attribute(ATTRIBUTES, ws.date)
         output.update_attributes(ws.data, attributes)
     except ValueError as err:
@@ -85,6 +87,13 @@ class WS(CloudnetInstrument):
     def convert_units(self) -> None:
         pass
 
+    def calculate_rainfall_amount(self) -> None:
+        if "rainfall_amount" 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)
+        self.data["rainfall_amount"] = CloudnetArray(rainfall_amount, "rainfall_amount")
+
 
 class PalaiseauWS(WS):
     def __init__(self, filenames: list[str], site_meta: dict):
@@ -256,9 +265,6 @@ class GranadaWS(WS):
         for key, value in self._data.items():
             parsed = datetime2decimal_hours(value) if key == "time" else np.array(value)
             self.data[key] = CloudnetArray(parsed, key)
-        self.data["rainfall_amount"] = CloudnetArray(
-            np.cumsum(self._data["rainfall_rate"]), "rainfall_amount"
-        )
 
     def convert_units(self) -> None:
         temperature_kelvins = atmos_utils.c2k(self.data["air_temperature"][:])
@@ -267,9 +273,6 @@ class GranadaWS(WS):
         self.data["air_pressure"].data = self.data["air_pressure"][:] * 100  # hPa -> Pa
         rainfall_rate = self.data["rainfall_rate"][:]
         self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
-        self.data["rainfall_amount"].data = (
-            self.data["rainfall_amount"][:] / 1000
-        )  # mm -> m
 
 
 class KenttarovaWS(WS):
@@ -344,20 +347,15 @@ class KenttarovaWS(WS):
         for key, value in self._data.items():
             parsed = datetime2decimal_hours(value) if key == "time" else ma.array(value)
             self.data[key] = CloudnetArray(parsed, key)
-        self.data["rainfall_amount"] = CloudnetArray(
-            ma.cumsum(self._data["rainfall_rate"]), "rainfall_amount"
-        )
 
     def convert_units(self) -> None:
         temperature_kelvins = atmos_utils.c2k(self.data["air_temperature"][:])
         self.data["air_temperature"].data = temperature_kelvins
         self.data["relative_humidity"].data = self.data["relative_humidity"][:] / 100
         self.data["air_pressure"].data = self.data["air_pressure"][:] * 100  # hPa -> Pa
+        # Rainfall rate is 10-minute averaged in mm h-1
         rainfall_rate = self.data["rainfall_rate"][:]
-        self.data["rainfall_rate"].data = rainfall_rate / 60  # m/min -> m/s
-        self.data["rainfall_amount"].data = (
-            self.data["rainfall_amount"][:] / 1000
-        )  # mm -> m
+        self.data["rainfall_rate"].data = rainfall_rate * MM_H_TO_M_S / 10
 
 
 ATTRIBUTES = {

cloudnetpy/output.py

@@ -117,9 +117,10 @@ def save_product_file(
 
 def get_l1b_source(instrument: Instrument) -> str:
     """Returns level 1b file source."""
-    return " ".join(
+    parts = [
         item for item in [instrument.manufacturer, instrument.model] if item is not None
-    )
+    ]
+    return " ".join(parts) if parts else instrument.category.capitalize()
 
 
 def get_l1b_history(instrument: Instrument) -> str:

cloudnetpy/plotting/plotting.py

@@ -4,6 +4,7 @@ import re
 import textwrap
 from dataclasses import dataclass
 from datetime import date
+from typing import Any
 
 import matplotlib.pyplot as plt
 import netCDF4
@@ -491,15 +492,28 @@ class Plot2D(Plot):
             smoothed_data = uniform_filter(self._data[valid_time_ind, :], sigma_units)
             self._data[valid_time_ind, :] = smoothed_data
 
-        image = self._ax.pcolorfast(
-            figure_data.time_including_gaps,
-            alt,
-            self._data.T[:-1, :-1],
-            cmap=plt.get_cmap(str(self._plot_meta.cmap)),
-            vmin=vmin,
-            vmax=vmax,
-            zorder=_get_zorder("data"),
-        )
+        pcolor_kwargs = {
+            "cmap": plt.get_cmap(str(self._plot_meta.cmap)),
+            "vmin": vmin,
+            "vmax": vmax,
+            "zorder": _get_zorder("data"),
+        }
+        image: Any
+        if figure_data.file.cloudnet_file_type == "model":
+            image = self._ax.pcolor(
+                figure_data.time_including_gaps,
+                alt,
+                self._data.T,
+                **pcolor_kwargs,
+                shading="nearest",
+            )
+        else:
+            image = self._ax.pcolorfast(
+                figure_data.time_including_gaps,
+                alt,
+                self._data.T[:-1, :-1],
+                **pcolor_kwargs,
+            )
         cbar = self._init_colorbar(image)
         cbar.set_label(str(self._plot_meta.clabel), fontsize=13)
 

cloudnetpy/version.py

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

{cloudnetpy-1.61.10.dist-info → cloudnetpy-1.61.12.dist-info}/METADATA

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

{cloudnetpy-1.61.10.dist-info → cloudnetpy-1.61.12.dist-info}/RECORD

@@ -5,10 +5,10 @@ cloudnetpy/constants.py,sha256=l7_ohQgLEQ6XEG9AMBarTPKp9OM8B1ElJ6fSN0ScdmM,733
 cloudnetpy/datasource.py,sha256=CSiKQGVEX459tagRjLrww6hZMZcc3r1sR2WcaTKTTWo,7864
 cloudnetpy/exceptions.py,sha256=wrI0bZTwmS5C_cqOmvlJ8XJSEFyzuD1eD4voGJc_Gjg,1584
 cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
-cloudnetpy/output.py,sha256=WoVTNuxni0DUr163vZ-_mDr1brXhY15XSlGMrq9Aoqw,14700
+cloudnetpy/output.py,sha256=UzF0w51c6-QEBj-NfCJg5zTIKVzcmq1HyQb-3_qWTgk,14767
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=-8x7LQ6WDHxf2lDZfhG50WYe2iSVLQObnVXZG46JzKI,28468
-cloudnetpy/version.py,sha256=HAuT8BUx0-n1kWtWI9imBuHkv_T3xyyM0iVTBUyqsk8,73
+cloudnetpy/version.py,sha256=TCoRUUzxjMCaerRhyUc-pmYLkL6lRFwWebWDoR3GJZw,73
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=fWW8ye_8HZASRAiYwURFKWzcGOYIA2RKeVxCq0lVOuM,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
@@ -47,7 +47,7 @@ cloudnetpy/instruments/rpg.py,sha256=yQpcKcgzRvVvkl6NhKvo4PUkv9nZ69_hzzPpS2Ei-Is
 cloudnetpy/instruments/rpg_reader.py,sha256=LAdXL3TmD5QzQbqtPOcemZji_qkXwmw6a6F8NmF6Zg8,11355
 cloudnetpy/instruments/toa5.py,sha256=1JnuYViD8c_tHJZ9lf4OU44iepEkXHsXOzDfVf_b0qc,1759
 cloudnetpy/instruments/vaisala.py,sha256=ektdXoID2X_V9H5Zp1fgHTUBapFMSyPVEWW_aoR6DEY,14655
-cloudnetpy/instruments/weather_station.py,sha256=seJi1nMsxfRr_TG0We8zjtiSVR7c6sHT90YRLnaFhSo,13814
+cloudnetpy/instruments/weather_station.py,sha256=3_urUMWE6YYPm-bLD6Q30kSz6X0Oh1JA8VuLnHCKH3Q,13822
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=WiL-vCjw9Gmb5irvW3AXddsyprp8MGOfqcVAlfy0zpc,25521
@@ -94,7 +94,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=cLdCZrhbP-gaobS_zjcf8d2xVALzl7zh2qpttxCHyrg,15983
-cloudnetpy/plotting/plotting.py,sha256=bve91iM9RcWmKaZOFWxVh2y3DPmupI1944MMYDdv17I,32459
+cloudnetpy/plotting/plotting.py,sha256=SrfAvILAFsqGQi-ELN1qd-6-EqfD3duV3kK_fsI4TaQ,32894
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=pzFQtgOKS7g_3LqiAY84EFUUste-VES7CJNgoq2Bs34,7914
 cloudnetpy/products/der.py,sha256=XZMbqDQUq0E9iBU3Axr-NfUJfRAhjsaGlyxJ4tKyGcw,12444
@@ -108,8 +108,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=RuzokxxqXlTGk7XAOrif_FDPUJdf0j_wJgNq-7a_nK8,4684
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.61.10.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.61.10.dist-info/METADATA,sha256=1t87X79T8kRt6_5_bFL0E6-aYOfa64mHdAUH78qaQag,5785
-cloudnetpy-1.61.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloudnetpy-1.61.10.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.61.10.dist-info/RECORD,,
+cloudnetpy-1.61.12.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.61.12.dist-info/METADATA,sha256=nqWjqeDzGmg9WTD827eamk9ODfjSOOnWeqRKsKB5gZA,5785
+cloudnetpy-1.61.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloudnetpy-1.61.12.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.61.12.dist-info/RECORD,,