cloudnetpy 1.58.7__tar.gz → 1.59.0__tar.gz

{cloudnetpy-1.58.7/cloudnetpy.egg-info → cloudnetpy-1.59.0}/PKG-INFO

@@ -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 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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-1.58.7 → cloudnetpy-1.59.0}/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 → cloudnetpy-1.59.0/cloudnetpy.egg-info}/PKG-INFO

@@ -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