cloudnetpy 1.73.1__tar.gz → 1.74.0__tar.gz

{cloudnetpy-1.73.1/cloudnetpy.egg-info → cloudnetpy-1.74.0}/PKG-INFO

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

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