cloudnetpy 1.58.7__py3-none-any.whl → 1.59.0__py3-none-any.whl

cloudnetpy/datasource.py

@@ -84,6 +84,7 @@ class DataSource:
         key: str,
         name: str | None = None,
         units: str | None = None,
+        dtype: str | None = None,
     ) -> None:
         """Adds new CloudnetVariable or RadarVariable into `data` attribute.
 
@@ -95,7 +96,7 @@ class DataSource:
             units: CloudnetArray.units attribute.
 
         """
-        self.data[key] = CloudnetArray(variable, name or key, units)
+        self.data[key] = CloudnetArray(variable, name or key, units, data_type=dtype)
 
     def get_date(self) -> list:
         """Returns date components.

cloudnetpy/exceptions.py

@@ -56,3 +56,10 @@ class MissingInputFileError(CloudnetException):
 
     def __init__(self, msg: str = "Missing required input files"):
         super().__init__(msg)
+
+
+class HatproDataError(CloudnetException):
+    """Internal exception class."""
+
+    def __init__(self, msg: str = "Invalid HATPRO file"):
+        super().__init__(msg)

cloudnetpy/instruments/basta.py

@@ -54,7 +54,7 @@ def basta2nc(
         if date is not None:
             basta.validate_date(date)
         basta.screen_data(keymap)
-        basta.add_time_and_range()
+        basta.add_time_and_range(time_dtype="f8")
         basta.add_site_geolocation()
         basta.add_zenith_angle()
         basta.add_radar_specific_variables()

cloudnetpy/instruments/disdrometer/common.py

@@ -171,6 +171,8 @@ class Disdrometer(CloudnetInstrument):
         )
         for time_ind, row in enumerate(self._file_data["spectra"]):
             values = _parse_int(row)
+            if len(values) != self.n_diameter * self.n_velocity:
+                continue
             array[time_ind, :, :] = np.reshape(
                 values,
                 (self.n_diameter, self.n_velocity),

cloudnetpy/instruments/hatpro.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 import netCDF4
 import numpy as np
+from mwrpy.exceptions import MissingInputData
 from mwrpy.level1.lev1_meta_nc import ATTRIBUTES_1B01
 from mwrpy.level1.write_lev1_nc import lev1_to_nc
 from mwrpy.version import __version__ as mwrpy_version
@@ -13,7 +14,7 @@ from numpy import ma
 
 from cloudnetpy import output, utils
 from cloudnetpy.cloudnetarray import CloudnetArray
-from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.exceptions import HatproDataError, ValidTimeStampError
 from cloudnetpy.instruments import rpg
 from cloudnetpy.instruments.instruments import HATPRO
 from cloudnetpy.instruments.rpg_reader import (
@@ -45,13 +46,16 @@ def hatpro2l1c(
     """
     coeff_files = site_meta.get("coefficientFiles", None)
 
-    hatpro_raw = lev1_to_nc(
-        "1C01",
-        mwr_dir,
-        output_file=output_file,
-        coeff_files=coeff_files,
-        instrument_config=site_meta,
-    )
+    try:
+        hatpro_raw = lev1_to_nc(
+            "1C01",
+            mwr_dir,
+            output_file=output_file,
+            coeff_files=coeff_files,
+            instrument_config=site_meta,
+        )
+    except MissingInputData as err:
+        raise HatproDataError from err
 
     hatpro = HatproL1c(hatpro_raw, site_meta)
 
@@ -68,6 +72,9 @@ def hatpro2l1c(
         if len(set(dates)) != 1:
             msg = f"Several dates, something is wrong: {set(dates)}"
             raise RuntimeError(msg)
+        if date != dates[0]:
+            msg = f"Expected date {date}, got {dates[0]}"
+            raise RuntimeError(msg)
 
     decimal_hours = utils.seconds2hours(timestamps)
     hatpro.data["time"] = CloudnetArray(decimal_hours, "time", data_type="f8")

cloudnetpy/instruments/nc_radar.py

@@ -46,14 +46,14 @@ class NcRadar(DataSource, CloudnetInstrument):
             array[~np.isfinite(array)] = ma.masked
             self.append_data(array, name)
 
-    def add_time_and_range(self) -> None:
+    def add_time_and_range(self, time_dtype: str | None = None) -> None:
         """Adds time and range."""
         range_instru = np.array(
             self.getvar("range", "height"),
         )  # "height" in old BASTA files
         time = np.array(self.time)
         self.append_data(range_instru, "range")
-        self.append_data(time, "time")
+        self.append_data(time, "time", dtype=time_dtype)
 
     def screen_by_snr(self, snr_limit: float = -17) -> None:
         """Mask values where SNR smaller than threshold."""

cloudnetpy/instruments/vaisala.py

@@ -94,13 +94,15 @@ class VaisalaCeilo(Ceilometer):
             raise RuntimeError(msg)
 
         def _parse_data_lines(data: list, starting_indices: list) -> list:
+            iterator = range(number_of_data_lines)
+            n_lines = max(iterator)
             return [
                 [
                     data[n + line_number]
                     for n in starting_indices
-                    if (n + line_number) < len(data)
+                    if (n + n_lines) < len(data)
                 ]
-                for line_number in range(number_of_data_lines)
+                for line_number in iterator
             ]
 
         valid_lines = _filter_lines(data_in)

cloudnetpy/plotting/plot_meta.py

@@ -276,10 +276,18 @@ ATTRIBUTES = {
             cmap="RdBu_r",
             plot_range=(-50, 50),
         ),
+        "uwind_raw": PlotMeta(
+            cmap="RdBu_r",
+            plot_range=(-50, 50),
+        ),
         "vwind": PlotMeta(
             cmap="RdBu_r",
             plot_range=(-50, 50),
         ),
+        "vwind_raw": PlotMeta(
+            cmap="RdBu_r",
+            plot_range=(-50, 50),
+        ),
         "temperature": PlotMeta(
             cmap="RdBu_r",
             plot_range=(223.15, 323.15),

cloudnetpy/plotting/plotting.py

@@ -818,6 +818,7 @@ def _get_max_gap_in_minutes(figure_data: FigureData) -> float:
         "model": 181 if "gdas1" in source else 61,
         "mwr-multi": 21,
         "weather-station": 12,
+        "doppler-lidar-wind": 75,
     }
     return max_allowed_gap.get(file_type, 10)
 

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 58
-PATCH = 7
+MINOR = 59
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.58.7.dist-info → cloudnetpy-1.59.0.dist-info}/METADATA

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

{cloudnetpy-1.58.7.dist-info → cloudnetpy-1.59.0.dist-info}/RECORD

@@ -2,13 +2,13 @@ cloudnetpy/__init__.py,sha256=X_FqY-4yg5GUj5Edo14SToLEos6JIsC3fN-v1FUgQoA,43
 cloudnetpy/cloudnetarray.py,sha256=HT6bLtjnimOVbGrdjQBqD0F8GW0KWkn2qhaIGFMKLAY,6987
 cloudnetpy/concat_lib.py,sha256=YK5ho5msqwNxpPtPT8f2OewIJ8hTrbhCkaxHaBKLTI0,9809
 cloudnetpy/constants.py,sha256=l7_ohQgLEQ6XEG9AMBarTPKp9OM8B1ElJ6fSN0ScdmM,733
-cloudnetpy/datasource.py,sha256=-6oLC5bsn9sIoaN0glV88owFyTeGRsW1ZVJSV8rM5rE,7813
-cloudnetpy/exceptions.py,sha256=nA6YieylwKSp5KQOh3DhhcTmUBsd0tBZnedgmlWck-w,1415
+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/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=0TlHm71YtSrKXBsRKctitnhQrvZPE-ulEVeAQW-oK58,27398
-cloudnetpy/version.py,sha256=fCzCKWKXQ8ynaDbE6paHMwP1PHAclXkxoRdpRVx8GL0,72
+cloudnetpy/version.py,sha256=DkkxQi_uj1U2LdUPcX5cgnaQF9gFRAyTNo0STBHjTXc,72
 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
@@ -26,7 +26,7 @@ cloudnetpy/categorize/model.py,sha256=xWB6XOSz9p0h4b4m6ImMmzcTImOmz54d093WmsLogd
 cloudnetpy/categorize/mwr.py,sha256=-KMoYlch_C79bqgcEiRDCTRCcQf1ZsYxU90GQ8hzMgs,1435
 cloudnetpy/categorize/radar.py,sha256=S3561FVK6J4NUjqPi2S6fKnjnOm0oLwbIC54J64AN4Y,13659
 cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1IRRwTI,398
-cloudnetpy/instruments/basta.py,sha256=OeWBP_5b2xjOzPaFWEFC0irgLhSqX1YdcPkVBRbxd4c,3742
+cloudnetpy/instruments/basta.py,sha256=0zUztUJBXT2nrBTAl3-NLowxu_CYwTU5TgdBq4etj7E,3757
 cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3Dn0WbvoAppFOMbA8,5270
 cloudnetpy/instruments/ceilo.py,sha256=eF9Pp3KbYg3I_6gQcgCeobVkHzbbK9T5uH2tUys7RG8,8882
 cloudnetpy/instruments/ceilometer.py,sha256=SVp3Ego8JIjoTFK0FRvc2Xgq7U9a9iM1n-gL0Z90dv0,11928
@@ -34,21 +34,21 @@ cloudnetpy/instruments/cl61d.py,sha256=ycJGvUqNU2KHhECbrSehtWRnvg1vKFHhvMeQpjpdC
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=RG5HJxGM6p0F-IGyr85fvOizcMmgx48OeD_XeIsrgSU,3367
 cloudnetpy/instruments/copernicus.py,sha256=AT0AtMhGSKzPWEqXsfAda6zeaw4g0Jr5dqIyfeu4FP0,6327
 cloudnetpy/instruments/galileo.py,sha256=FyFYh1JhWed1d6yvpsv3rdBzHUTjkfOPw5HEQz4Wssw,4545
-cloudnetpy/instruments/hatpro.py,sha256=y96gMoaKW0pZRgGw1xzEx4UQ0OWeVKfKuyjNiDc2CjU,8221
+cloudnetpy/instruments/hatpro.py,sha256=tvkLfgC7YRa8aECOeN4_UaxrgX_VTKYTjTbRVo1kxLo,8519
 cloudnetpy/instruments/instruments.py,sha256=GcUEbQFPHUhRTnp300AZ2PK0O2d2EPIGtHqCX6dy99M,3133
 cloudnetpy/instruments/lufft.py,sha256=nozeiMRMz7I6q_FwmlxDGhWeJlqTuNh6ru39-M4K3BI,3629
 cloudnetpy/instruments/mira.py,sha256=TfozpYivQAThZ_rV3gLzZpz2QyJFWOF0RXdzA4521rM,9332
 cloudnetpy/instruments/mrr.py,sha256=hqknXXjJYfjWtyO50vioC3ohmH1GWU7K78-dNHh0Fss,5824
 cloudnetpy/instruments/nc_lidar.py,sha256=Q4sJJwiEPthDz0Zb-laISX32jNYzlUBMafxLJiOAN5c,1704
-cloudnetpy/instruments/nc_radar.py,sha256=LM0itIuwvhcPKSX4B7BojFwHHfAWVI9dY7G_7eVA8us,6886
+cloudnetpy/instruments/nc_radar.py,sha256=cDd20Yz-UeDQp1Gmkk-jGNZ45DangFsCaioeo_kktHQ,6935
 cloudnetpy/instruments/pollyxt.py,sha256=lbxJCKgKfgTxPm_NyYIWzSi2BbN828fNzI-Rux3wT48,8560
 cloudnetpy/instruments/radiometrics.py,sha256=oqsEW65DPYuSah58SaphtVVmt0rZqJ7DwqbOlMB-qHc,7620
 cloudnetpy/instruments/rpg.py,sha256=U8nEOlOI74f2lk2w4C4xKZCrW6AkDZpQZYE3yv7SNHE,17130
 cloudnetpy/instruments/rpg_reader.py,sha256=LAdXL3TmD5QzQbqtPOcemZji_qkXwmw6a6F8NmF6Zg8,11355
-cloudnetpy/instruments/vaisala.py,sha256=E6PaK26lHprqOJUCEDZPZQu83Qan9n_THudTFQM9wgI,14448
+cloudnetpy/instruments/vaisala.py,sha256=GzESZvboOoXzWmmr9dC-y6oM6ogc-M-zT3KmBTaD0LI,14512
 cloudnetpy/instruments/weather_station.py,sha256=gTY3Y5UATqJo9Gld4hm7WdsKBwcF8WgNTIK2nOfl3Nc,5739
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
-cloudnetpy/instruments/disdrometer/common.py,sha256=3wlI_nCE3l116anuAvKw-b9WLU2XAK4bZ9XMP4AFADQ,15753
+cloudnetpy/instruments/disdrometer/common.py,sha256=3z2pVgDuUMxM5sIJc-wYhdGYSOUsAG_Mp6MI8mPlJ5w,15843
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=TWq8VgG8U75AJQfCX-V2y8qy-nO6dKMOGd2eG8-u7to,22342
 cloudnetpy/instruments/disdrometer/thies.py,sha256=h7EwZ9tn47UUMiYqDQ68vkXv4q0rEqX1ZeFXd7XJYNg,5050
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -92,8 +92,8 @@ cloudnetpy/model_evaluation/tests/unit/test_plotting.py,sha256=h9V8JKmrO4v9bOvv-
 cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=Ra3r4V0qbqkpDuaTYvEIbaasl0nZ5gmTLR4eGC0glBQ,9724
 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=e0X6ZCuBE0eRIbGKdT7S0RzhL_ncfo7Pi0uRhXpttnQ,14868
-cloudnetpy/plotting/plotting.py,sha256=WTxuOJya9d8-wG3dZbdk8BkoVaFu7-T4i-DbpPNnSis,31754
+cloudnetpy/plotting/plot_meta.py,sha256=HkG60l_UFOCy80mu5xoDlGJgeYUcWa1y_HfugaFWZWQ,15074
+cloudnetpy/plotting/plotting.py,sha256=j1OsTDlAhS78w9CUNfPVCH2vhlA3cl3cjC2wlCywqio,31788
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=0E9OUGR3uLCsS1nORwQu0SqW0_8uX7n6LlRcVhtzKw4,7845
 cloudnetpy/products/der.py,sha256=mam6jWV7A2h8V5WC3DIeFp6ou7UD1JOw9r7h2B0su-s,12403
@@ -107,8 +107,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.58.7.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.58.7.dist-info/METADATA,sha256=qXDYbl0qTaOLAooXRoKMFM5-JZhd-LKpPQRNcKZgLtQ,5784
-cloudnetpy-1.58.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-cloudnetpy-1.58.7.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.58.7.dist-info/RECORD,,
+cloudnetpy-1.59.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.59.0.dist-info/METADATA,sha256=1tsPojx2WLeOKMm_7_RJHpCzjDc14BLU1e5m0ij7W-Q,5784
+cloudnetpy-1.59.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+cloudnetpy-1.59.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.59.0.dist-info/RECORD,,