cloudnetpy 1.73.1__py3-none-any.whl → 1.74.0__py3-none-any.whl

cloudnetpy/categorize/categorize.py

@@ -166,6 +166,7 @@ def generate_categorize(
             except DisdrometerDataError as err:
                 logging.warning("Unable to use disdrometer: %s", err)
         time, height = _define_dense_grid()
+        data.radar.add_location(time)
         valid_ind = _interpolate_to_cloudnet_grid()
         if len(valid_ind) < 2:
             msg = "Less than 2 overlapping radar, lidar and model timestamps found"

cloudnetpy/categorize/radar.py

@@ -316,11 +316,25 @@ class Radar(DataSource):
 
     def add_meta(self) -> None:
         """Copies misc. metadata from the input file."""
-        for key in ("latitude", "longitude", "altitude"):
-            self.append_data(np.array(self.getvar(key)), key)
         for key in ("time", "height", "radar_frequency"):
             self.append_data(np.array(getattr(self, key)), key)
 
+    def add_location(self, time_new: np.ndarray):
+        """Add latitude, longitude and altitude from nearest timestamp."""
+        idx = np.searchsorted(self.time, time_new)
+        idx_left = np.clip(idx - 1, 0, len(self.time) - 1)
+        idx_right = np.clip(idx, 0, len(self.time) - 1)
+        diff_left = np.abs(time_new - self.time[idx_left])
+        diff_right = np.abs(time_new - self.time[idx_right])
+        idx_closest = np.where(diff_left < diff_right, idx_left, idx_right)
+        for key in ("latitude", "longitude", "altitude"):
+            data = self.getvar(key)
+            if not utils.isscalar(data):
+                data = data[idx_closest]
+            if not np.any(ma.getmaskarray(data)):
+                data = np.array(data)
+            self.append_data(data, key)
+
     def _init_data(self) -> None:
         self.append_data(self.getvar("Zh"), "Z", units="dBZ")
         for key in ("v", "ldr", "width", "sldr", "rainfall_rate"):

cloudnetpy/products/mwr_tools.py

@@ -89,7 +89,6 @@ class Mwr:
 
     def harmonize(self, product: Literal["multi", "single"]) -> str:
         self._truncate_global_attributes()
-        self._copy_variable_values()
         self._copy_global_attributes()
         self._fix_variable_attributes()
         self._write_missing_global_attributes(product)
@@ -99,12 +98,6 @@ class Mwr:
         for attr in self.nc_l2.ncattrs():
             delattr(self.nc_l2, attr)
 
-    def _copy_variable_values(self):
-        keys = ("latitude", "longitude", "altitude")
-        for var in keys:
-            if var in self.nc_l2.variables:
-                self.nc_l2.variables[var][:] = self.nc_l1c.variables[var][:]
-
     def _copy_global_attributes(self):
         keys = ("year", "month", "day", "location", "source")
         output.copy_global(self.nc_l1c, self.nc_l2, keys)

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 73
-PATCH = 1
+MINOR = 74
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.73.1.dist-info → cloudnetpy-1.74.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.73.1
+Version: 1.74.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.73.1.dist-info → cloudnetpy-1.74.0.dist-info}/RECORD

@@ -9,11 +9,11 @@ cloudnetpy/metadata.py,sha256=lO7BCbVAzFoH3Nq-VuezYX0f7MnbG1Zp11g5GSiuQwM,6189
 cloudnetpy/output.py,sha256=l0LoOhcGCBrg2EJ4NT1xZ7-UKWdV7X7yQ0fJmhkwJVc,15829
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=ui6sq8g1HlgfOQO644iNHsRGqpDwS3q-5uGR2y2tOAk,33325
-cloudnetpy/version.py,sha256=rvARV3v_Ikvuo3dtTDySv9IDxv3ulpF2u_dwfzI6_hk,72
+cloudnetpy/version.py,sha256=NyE8VYDVST3jInl97hnM5B9JXFGdkILThRQ42YmU1wA,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=RcmbKxm2COkE7WEya0mK3yX5rzUbrewRVh3ekm01RtM,10598
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
-cloudnetpy/categorize/categorize.py,sha256=HtttmUlnLE4Cw3QLdz-DRfRpd8sVr_Tp4A62XI67x24,20739
+cloudnetpy/categorize/categorize.py,sha256=PzkgQ63MtEHlz_0govFkoM6F41OKgQLsxDh7GLQHyrs,20777
 cloudnetpy/categorize/classify.py,sha256=qovHgHsMku5kpl3cJxKteNBsG8GAkfI3Zo8QhJwZSFQ,8512
 cloudnetpy/categorize/containers.py,sha256=evqVQOoUycBtaFeKpms7_NuM9z8jKWq37nLIhoDxa8k,5278
 cloudnetpy/categorize/disdrometer.py,sha256=sRSt2B932lrrkvycKoSaKEIaDVfq9Z7uU-4iHRr-fC0,1893
@@ -26,7 +26,7 @@ cloudnetpy/categorize/lidar.py,sha256=YQrM_LOz8NQrrD9l9HyujV1GSGwkQ8LMqXN13bEJRW
 cloudnetpy/categorize/melting.py,sha256=ZnLeL_qWmiCdjXVOm9iBYHdo29Brqxu_DEErZPqUloQ,6217
 cloudnetpy/categorize/model.py,sha256=QFRCY0TvM2fzGRyP8BNkqbvu13XcQjt7TsN5fhjI_Uc,6654
 cloudnetpy/categorize/mwr.py,sha256=F7cquERWL6mBkgboqeaCIPf9gOlKI-NWUQIBdQXGT_I,1635
-cloudnetpy/categorize/radar.py,sha256=0Wg5u2aLXRVhHiFiXb4fSqY_iGgSwcCMMVshM3wBoo0,14149
+cloudnetpy/categorize/radar.py,sha256=PmriTnrHbgZrau1RTNKpPI_-h5Uu0kGIMrMOaoMuROY,14821
 cloudnetpy/categorize/attenuations/__init__.py,sha256=CWFHVWeTIe2hrZtgkJaX2HGftbuffsFc39Mzv5B0Lw0,1037
 cloudnetpy/categorize/attenuations/gas_attenuation.py,sha256=emr-RCxQT0i2N8k6eBNhRsmsCBPHJzQsWJfjC4fVSTo,975
 cloudnetpy/categorize/attenuations/liquid_attenuation.py,sha256=0p0G79BPkw1itCXHMwbvkNHtJGBocJzow3gNHAirChI,3036
@@ -114,12 +114,12 @@ cloudnetpy/products/ier.py,sha256=XW4gg_H-JWMWKToMqLVl6v8kx1S65GBwclWDCn1EfSk,59
 cloudnetpy/products/iwc.py,sha256=WcPdAZx3zW0zaNJNp2vpAD4JnG0NJjFmCUAhDWzNxMg,9459
 cloudnetpy/products/lwc.py,sha256=sl6Al2tuH3KkCBrPbWTmuz3jlD5UQJ4D6qBsn1tt2CQ,18962
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
-cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
+cloudnetpy/products/mwr_tools.py,sha256=1SRaQRW6-1svfnUk25sMyWXSwRJ1fg7v48TsMENZQpg,5103
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
-cloudnetpy-1.73.1.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.74.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.73.1.dist-info/METADATA,sha256=XUqHEX3wWJGCJubVV_lBR__4JEG_uPl3TBF1D6ZY31k,5796
-cloudnetpy-1.73.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cloudnetpy-1.73.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.73.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.73.1.dist-info/RECORD,,
+cloudnetpy-1.74.0.dist-info/METADATA,sha256=YopNoTclJY-YXuOMqKereaBmfE4KyID0PAwfmzs_wMU,5796
+cloudnetpy-1.74.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cloudnetpy-1.74.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.74.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.74.0.dist-info/RECORD,,