cloudnetpy 1.61.11__tar.gz → 1.61.12__tar.gz

{cloudnetpy-1.61.11/cloudnetpy.egg-info → cloudnetpy-1.61.12}/PKG-INFO

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

{cloudnetpy-1.61.11 → cloudnetpy-1.61.12}/cloudnetpy/instruments/weather_station.py

@@ -8,7 +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 SEC_IN_HOUR
+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
@@ -353,10 +353,9 @@ class KenttarovaWS(WS):
         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 / 3600 / 10 / 1000
-        )  # not sure about units
+        self.data["rainfall_rate"].data = rainfall_rate * MM_H_TO_M_S / 10
 
 
 ATTRIBUTES = {

{cloudnetpy-1.61.11 → cloudnetpy-1.61.12}/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-1.61.11 → cloudnetpy-1.61.12}/cloudnetpy/version.py

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

{cloudnetpy-1.61.11 → cloudnetpy-1.61.12/cloudnetpy.egg-info}/PKG-INFO

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