cloudnetpy 1.66.3__py3-none-any.whl → 1.66.5__py3-none-any.whl

cloudnetpy/instruments/ceilometer.py

@@ -98,6 +98,9 @@ class Ceilometer:
                 self.data[key] = float(self.site_meta[key])
 
     def get_date_and_time(self, epoch: Epoch) -> None:
+        if "time" not in self.data:
+            msg = "Time array missing from data"
+            raise ValidTimeStampError(msg)
         if self.expected_date is not None:
             self.data = utils.screen_by_time(self.data, epoch, self.expected_date)
         self.date = utils.seconds2date(self.data["time"][0], epoch=epoch)[:3]

cloudnetpy/plotting/plotting.py

@@ -21,7 +21,7 @@ from mpl_toolkits.axes_grid1 import make_axes_locatable
 from numpy import ma, ndarray
 from scipy.ndimage import uniform_filter
 
-from cloudnetpy.categorize.freezing import find_t0_alt
+from cloudnetpy.constants import T0
 from cloudnetpy.exceptions import PlottingError
 from cloudnetpy.instruments.ceilometer import calc_sigma_units
 from cloudnetpy.plotting.plot_meta import ATTRIBUTES, PlotMeta
@@ -428,22 +428,6 @@ class Plot2D(Plot):
         if figure_data.is_mwrpy_product():
             self._fill_flagged_data(figure_data)
 
-        if self.sub_plot.variable.name == "Tw":
-            tw = figure_data.file["Tw"][:]
-            height = figure_data.height
-            if height is None:
-                msg = "No height information in the file."
-                raise ValueError(msg)
-            t0_alt = find_t0_alt(tw, height)
-            t0_alt = ma.masked_where(t0_alt <= height[0], t0_alt)
-            self._ax.plot(
-                figure_data.time,
-                t0_alt,
-                color="gray",
-                linestyle="dashed",
-                zorder=_get_zorder("t0"),
-            )
-
     def _fill_flagged_data(self, figure_data: FigureData) -> None:
         flags = self._read_flagged_data(figure_data)
         batches = find_batches_of_ones(flags)
@@ -543,19 +527,36 @@ class Plot2D(Plot):
             cbar.ax.set_yticklabels(tick_labels)
 
         if self._plot_meta.contour:
-            time_length = len(figure_data.time_including_gaps)
-            step = max(1, time_length // 200)
-            ind_time = np.arange(0, time_length, step)
-            self._ax.contour(
-                figure_data.time_including_gaps[ind_time],
+            self._plot_contour(
+                figure_data,
                 alt,
-                self._data[ind_time, :].T,
                 levels=np.linspace(vmin, vmax, num=10),
                 colors="black",
                 linewidths=0.5,
-                zorder=_get_zorder("contour"),
             )
 
+        if self.sub_plot.variable.name == "Tw":
+            self._plot_contour(
+                figure_data,
+                alt,
+                levels=np.array([T0]),
+                colors="gray",
+                linewidths=1.25,
+                linestyles="dashed",
+            )
+
+    def _plot_contour(self, figure_data: FigureData, alt: np.ndarray, **options):
+        time_length = len(figure_data.time_including_gaps)
+        step = max(1, time_length // 200)
+        ind_time = np.arange(0, time_length, step)
+        self._ax.contour(
+            figure_data.time_including_gaps[ind_time],
+            alt,
+            self._data[ind_time, :].T,
+            **options,
+            zorder=_get_zorder("contour"),
+        )
+
     def _screen_data_by_max_y(self, figure_data: FigureData) -> ndarray:
         if figure_data.height is None:
             msg = "No height information in the file."
@@ -897,10 +898,10 @@ def _reformat_units(unit: str) -> str:
 
 
 def _get_max_gap_in_minutes(figure_data: FigureData) -> float:
-    source = getattr(figure_data.file, "source", "")
+    source = getattr(figure_data.file, "source", "").lower()
     file_type = getattr(figure_data.file, "cloudnet_file_type", "")
     max_allowed_gap = {
-        "model": 181 if "gdas1" in source else 61,
+        "model": 181 if "gdas1" in source or "ecmwf open" in source else 61,
         "mwr-multi": 35,
         "weather-station": 12,
         "doppler-lidar-wind": 75,

cloudnetpy/version.py

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

{cloudnetpy-1.66.3.dist-info → cloudnetpy-1.66.5.dist-info}/METADATA

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

{cloudnetpy-1.66.3.dist-info → cloudnetpy-1.66.5.dist-info}/RECORD

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=YrWRBEZg0QNZRVnd9ziAziH-eJSh7O5JuWiH4ZxM0_s,15584
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=RIqxZoB62JmMOOfYH6_fqpaudH8wqS9WDbpnR2HCcTM,29040
-cloudnetpy/version.py,sha256=zhcZNAONGXJka0B3BYGCqhzx8q3OnD5Qn1D-g_JSQh4,72
+cloudnetpy/version.py,sha256=RRwzP1UIktb7j48KlcmVNqYg-tOvF82DH-sZMh_TCHI,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=9-ymI6i1xASf-XAFyO87FaTfvq6bF89N1i_27OkUp-M,10104
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -35,7 +35,7 @@ cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1I
 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
-cloudnetpy/instruments/ceilometer.py,sha256=P33UXVQl7hLLWZc3NyNfrz6hvTyUAZRIP-g6H5Dpe9Y,11967
+cloudnetpy/instruments/ceilometer.py,sha256=pdmLVljsuciyKpaGxWxJ_f1IrJK-UrkBC0lSeuirLlU,12095
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=RG5HJxGM6p0F-IGyr85fvOizcMmgx48OeD_XeIsrgSU,3367
 cloudnetpy/instruments/copernicus.py,sha256=nmgqGOjVQFngj7BNbpcuCwA-W3yksvBbqn__iq7MyDk,6469
@@ -100,7 +100,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=ZvaKU3eXy1KFxQomnsEu3mCYpwwBYKAYk7oAwOzAGSg,16143
-cloudnetpy/plotting/plotting.py,sha256=MoZhO4uKUvNCvlDFnQ6zr81y0NeFLvsvM0MIPF5zeBw,35320
+cloudnetpy/plotting/plotting.py,sha256=5mLDRZKcpgO0V9fUdk_Xf1E8BVQGrVihiBdfifdWWPk,35208
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=AKb9GCatvhS5KR0c9LfN96nUvzi02175ZCQlvMH1Dws,8077
 cloudnetpy/products/der.py,sha256=soypE7uSEP4uHUCCQVEhyXsKY6e9mzV9B_2S5GUizqk,12729
@@ -114,8 +114,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=01Zc6xV8CSuYcIcLpchFf5POL3_c629-YMNDZJ51udA,10853
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.66.3.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.66.3.dist-info/METADATA,sha256=f7Ll3J-iSnH8OvAHj_BLVC8md7Vwa1czXPI4RHbbb2Q,5784
-cloudnetpy-1.66.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-cloudnetpy-1.66.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.66.3.dist-info/RECORD,,
+cloudnetpy-1.66.5.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.66.5.dist-info/METADATA,sha256=Fn9VQMj4YeMVPSsIKg2zuBzgrU4E_YDzXh3pcW6R4k0,5784
+cloudnetpy-1.66.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+cloudnetpy-1.66.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.66.5.dist-info/RECORD,,