cloudnetpy 1.97.4__tar.gz → 1.97.6__tar.gz

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6}/MANIFEST.in

@@ -1,3 +1,4 @@
 recursive-exclude tests *
+recursive-exclude docs *
 include cloudnetpy/products/mie_lu_tables.nc
 include cloudnetpy/py.typed

{cloudnetpy-1.97.4/cloudnetpy.egg-info → cloudnetpy-1.97.6}/PKG-INFO

@@ -1,37 +1,15 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.97.4
+Version: 1.97.6
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
-License: MIT License
-        
-        Copyright (c) 2019-2026 Finnish Meteorological Institute
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/actris-cloudnet/cloudnetpy
 Project-URL: Documentation, https://actris-cloudnet.github.io/cloudnetpy/
 Project-URL: Repository, https://github.com/actris-cloudnet/cloudnetpy
 Project-URL: Changelog, https://github.com/actris-cloudnet/cloudnetpy/blob/main/CHANGELOG.md
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6}/cloudnetpy/disdronator/parsivel.py

@@ -1,4 +1,5 @@
 import datetime
+import logging
 import re
 from collections.abc import Sequence
 from os import PathLike
@@ -586,11 +587,13 @@ def read_parsivel_l1(
         msg = "No raw data"
         raise ValueError(msg)
     data_raw = np.swapaxes(l0[93], 1, 2)
-    interval = (
-        l0[9]
-        if 9 in l0
-        else np.median(np.diff(time.astype("datetime64[s]"))).astype(int)
-    )
+    if 9 in l0:
+        interval = l0[9]
+    else:
+        interval = np.median(np.diff(time.astype("datetime64[s]"))).astype(int)
+        logging.warning(
+            "Interval is not available, using mean time difference: %d s", interval
+        )
     return DisdroL1(
         diameter=D,
         diameter_bins=D_BINS,

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6}/cloudnetpy/disdronator/process.py

@@ -1,3 +1,4 @@
+import datetime
 from dataclasses import dataclass
 
 import numpy as np
@@ -80,7 +81,7 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
         fall_velocity = ma.masked_where(spec == 0, np.tile(l1.velocity, (n_time, 1)))
         rain_amount = np.pi / 6 * np.sum(spec * l1.diameter**3 / area_mm2, axis=1)
         radar_refl = np.sum(
-            spec * l1.diameter**6 / (l1.velocity * area_m2 * interval_h[:, np.newaxis]),
+            spec * l1.diameter**6 / (l1.velocity * area_m2 * interval[:, np.newaxis]),
             axis=1,
         )
         energy_flux = (
@@ -167,7 +168,11 @@ def process_l2(l1: DisdroL1) -> DisdroL2:
             )
         )
     rain_rate = rain_amount / interval_h
-    rain_accum = np.cumsum(rain_amount)
+
+    # Typically time_diff matches interval, but in Bucharest time_diff is 60 s
+    # and interval is 5 s as of 2026-11-11.
+    time_diff = np.median(np.diff(time) / datetime.timedelta(hours=1))
+    rain_accum = np.cumsum(rain_rate * time_diff)
 
     min_radar_refl = -10
     radar_refl_db = 10 * ma.log10(radar_refl)

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6}/cloudnetpy/instruments/disdrometer.py

@@ -189,11 +189,14 @@ class Disdrometer(CloudnetInstrument):
         self.l0_reader = l0_reader
         self.l1_reader = l1_reader
         self.site_meta = site_meta
-        self._read_data(filenames)
+        self._read_data(filenames, expected_date)
         self._process_data()
-        self._screen_time(expected_date)
 
-    def _read_data(self, filenames: Iterable[str | PathLike]) -> None:
+    def _read_data(
+        self,
+        filenames: Iterable[str | PathLike],
+        expected_date: datetime.date | None = None,
+    ) -> None:
         times = []
         data = defaultdict(list)
         for filename in filenames:
@@ -201,11 +204,23 @@ class Disdrometer(CloudnetInstrument):
             times.append(file_time)
             for key, value in file_data.items():
                 data[key].append(value)
-        self.l0_time = np.concatenate(times)
-        if len(self.l0_time) == 0:
+        all_times = np.concatenate(times)
+        if len(all_times) == 0:
             msg = "No data found"
             raise DisdrometerDataError(msg)
-        self.l0_data = {key: np.concatenate(value) for key, value in data.items()}
+        all_times, time_ind = np.unique(all_times, return_index=True)
+        if expected_date is None:
+            expected_date = all_times[0].date()
+        valid_ind = [t.date() == expected_date for t in all_times]
+        if not np.any(valid_ind):
+            msg = "No data found for expected date"
+            raise DisdrometerDataError(msg)
+        self.l0_time = all_times[valid_ind]
+        self.l0_data = {
+            key: np.concatenate(value)[time_ind][valid_ind]
+            for key, value in data.items()
+        }
+        self.date = expected_date
 
     def _process_data(self) -> None:
         l1 = self.l1_reader(self.l0_time, self.l0_data)
@@ -237,23 +252,6 @@ class Disdrometer(CloudnetInstrument):
             "visibility": np.round(l2.visibility).astype(np.int32),
         }
 
-    def _screen_time(self, expected_date: datetime.date | None = None) -> None:
-        if expected_date is None:
-            expected_date = self.raw_time[0].date()
-        is_valid = [dt.date() == expected_date for dt in self.raw_time]
-        if not np.any(is_valid):
-            msg = "No data found for expected date"
-            raise DisdrometerDataError(msg)
-        self.raw_time = self.raw_time[is_valid]
-        for key in self.raw_data:
-            self.raw_data[key] = self.raw_data[key][is_valid]
-        self.date = expected_date
-
-    def sort_and_dedup_timestamps(self) -> None:
-        self.raw_time, time_ind = np.unique(self.raw_time, return_index=True)
-        for key in self.raw_data:
-            self.raw_data[key] = self.raw_data[key][time_ind]
-
     def add_meta(self) -> None:
         valid_keys = ("latitude", "longitude", "altitude")
         for key, value in self.site_meta.items():
@@ -345,7 +343,6 @@ def _process_disdrometer(
         input_file = [input_file]
     disdrometer = klass(l0_reader, l1_reader, input_file, site_meta, date)
     disdrometer.add_raw_data()
-    disdrometer.sort_and_dedup_timestamps()
     disdrometer.convert_to_cloudnet_arrays()
     disdrometer.add_meta()
     attributes = output.add_time_attribute(attributes, disdrometer.date)

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 97
-PATCH = 4
+PATCH = 6
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6/cloudnetpy.egg-info}/PKG-INFO

@@ -1,37 +1,15 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.97.4
+Version: 1.97.6
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
-License: MIT License
-        
-        Copyright (c) 2019-2026 Finnish Meteorological Institute
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/actris-cloudnet/cloudnetpy
 Project-URL: Documentation, https://actris-cloudnet.github.io/cloudnetpy/
 Project-URL: Repository, https://github.com/actris-cloudnet/cloudnetpy
 Project-URL: Changelog, https://github.com/actris-cloudnet/cloudnetpy/blob/main/CHANGELOG.md
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6}/cloudnetpy.egg-info/SOURCES.txt

@@ -142,5 +142,4 @@ cloudnetpy/products/iwc_weather_radar.py
 cloudnetpy/products/lwc.py
 cloudnetpy/products/mie_lu_tables.nc
 cloudnetpy/products/mwr_tools.py
-cloudnetpy/products/product_tools.py
-docs/source/conf.py
+cloudnetpy/products/product_tools.py

{cloudnetpy-1.97.4 → cloudnetpy-1.97.6}/pyproject.toml

@@ -3,12 +3,12 @@ name = "cloudnetpy"
 description = "Python package for Cloudnet processing"
 authors = [{name = "Simo Tukiainen"}]
 readme = "README.md"
-license = {file = "LICENSE"}
+license = "MIT"
+license-files = ["LICENSE"]
 requires-python = ">=3.11"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Topic :: Scientific/Engineering :: Atmospheric Science",

cloudnetpy-1.97.4/docs/source/conf.py

@@ -1,48 +0,0 @@
-# noqa: INP001
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath("../.."))
-sys.path.insert(0, os.path.abspath("../../cloudnetpy/"))
-
-# Configuration file for the Sphinx documentation builder.
-#
-# For the full list of built-in configuration values, see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-# -- Project information -----------------------------------------------------
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
-
-# -- Project information -----------------------------------------------------
-
-project = "CloudnetPy"
-copyright = "2022, Finnish Meteorological Institute"  # noqa: A001
-author = "Finnish Meteorological Institute"
-
-# -- General configuration ---------------------------------------------------
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
-
-extensions = [
-    "sphinx.ext.autodoc",
-    "sphinx.ext.doctest",
-    "sphinx.ext.imgmath",
-    "sphinx.ext.viewcode",
-    "sphinx.ext.napoleon",
-    "sphinx.ext.todo",
-    "sphinx.ext.autosummary",
-    "sphinx.ext.autosectionlabel",
-]
-
-templates_path = ["_templates"]
-exclude_patterns = ["_temp/*"]
-autodoc_member_order = "bysource"
-autosectionlabel_prefix_document = True
-
-
-# -- Options for HTML output -------------------------------------------------
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
-
-html_theme = "sphinx_rtd_theme"
-html_static_path = ["_static"]
-
-napoleon_google_docstring = True