cloudnetpy 1.46.2__tar.gz → 1.46.4__tar.gz

{cloudnetpy-1.46.2/cloudnetpy.egg-info → cloudnetpy-1.46.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.46.2
+Version: 1.46.4
 Summary: Python package for Cloudnet processing
 Home-page: https://github.com/actris-cloudnet/cloudnetpy
 Author: Finnish Meteorological Institute

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/categorize/melting.py

@@ -62,7 +62,6 @@ def find_melting_layer(obs: ClassData, smooth: bool = True) -> np.ndarray:
     t_range = _find_model_temperature_range(obs.model_type)
 
     for ind, t_prof in enumerate(obs.tw):
-
         temp_indices = _get_temp_indices(t_prof, t_range)
         if len(temp_indices) <= 1:
             continue

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/categorize/radar.py

@@ -127,7 +127,7 @@ class Radar(DataSource):
             data, 0, min_coverage=0.3, z_limit=-30, distance=3, n_blocks=20
         )
         if n_vertical > 0 or n_horizontal > 0:
-            logging.info(
+            logging.debug(
                 f"Filtered {n_vertical} vertical and {n_horizontal} horizontal stripes "
                 f"from radar data using {variable}"
             )
@@ -141,7 +141,6 @@ class Radar(DataSource):
         distance: float,
         n_blocks: int,
     ) -> int:
-
         if axis == 0:
             data = data.T
             echo = self.data["Z"][:].T

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/cloudnetarray.py

@@ -94,7 +94,6 @@ class CloudnetArray:
                 setattr(self, key, data)
 
     def _init_data(self) -> np.ndarray:
-
         if isinstance(self.variable, netCDF4.Variable):
             return self.variable[:]
         if isinstance(self.variable, np.ndarray):

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/instruments/ceilometer.py

@@ -144,7 +144,7 @@ class NoisyData:
             else self.noise_param.noise_min
         )
         noise_below_threshold = noise < noise_min
-        logging.info(f"Adjusted noise of {sum(noise_below_threshold)} profiles")
+        logging.debug(f"Adjusted noise of {sum(noise_below_threshold)} profiles")
         noise[noise_below_threshold] = noise_min
         return noise
 
@@ -164,7 +164,7 @@ class NoisyData:
             profile = data[time_ind, alt_ind:]
             profile[profile < threshold] = ma.masked
         cleaned_time_indices = np.unique(time_indices)
-        logging.info(
+        logging.debug(
             f"Cleaned {len(cleaned_time_indices)} profiles with negative filter"
         )
         return cleaned_time_indices
@@ -181,7 +181,7 @@ class NoisyData:
         )
         variance = _calc_var_from_top_gates(self.data["beta_raw"])
         is_fog = (signal_sum > signal_sum_threshold) | (variance < variance_threshold)
-        logging.info(f"Cleaned {sum(is_fog)} profiles with fog filter")
+        logging.debug(f"Cleaned {sum(is_fog)} profiles with fog filter")
         return is_fog
 
     def _remove_noise(

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/instruments/cloudnet_instrument.py

@@ -24,7 +24,7 @@ class CloudnetInstrument:
             elif isinstance(self.dataset, netCDF4.Dataset) and hasattr(
                 self.dataset, key.capitalize()
             ):
-                value = float(getattr(self.dataset, key.capitalize()).split()[0])
+                value = self.parse_global_attribute_numeral(key.capitalize())
             # From source data (BASTA / RPG):
             elif (
                 isinstance(self.dataset, netCDF4.Dataset)
@@ -35,6 +35,13 @@ class CloudnetInstrument:
                 value = float(ma.mean(value))
                 self.data[key] = CloudnetArray(value, key)
 
+    def parse_global_attribute_numeral(self, key: str) -> float:
+        new_str = ""
+        for char in getattr(self.dataset, key):
+            if char.isdigit() or char == ".":
+                new_str += char
+        return float(new_str)
+
     def add_height(self) -> None:
         try:
             zenith_angle = ma.median(self.data["zenith_angle"].data)

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/instruments/mira.py

@@ -69,7 +69,7 @@ def mira2nc(
                 valid_filenames,
                 mmclx_filename,
                 variables=variables,
-                allow_difference=["nave"],
+                allow_difference=["nave", "ovl"],
             )
         else:
             mmclx_filename = raw_mira

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/instruments/nc_radar.py

@@ -71,7 +71,10 @@ class NcRadar(DataSource, CloudnetInstrument):
         time indices."""
         if "azimuth_velocity" in self.data:
             azimuth = self.data["azimuth_velocity"].data
-            azimuth_reference = 0
+            if np.all(azimuth == azimuth[0]):
+                azimuth_reference = azimuth[0]
+            else:
+                azimuth_reference = 0
             azimuth_tolerance = 1e-6
         else:
             azimuth = self.data["azimuth_angle"].data
@@ -85,6 +88,8 @@ class NcRadar(DataSource, CloudnetInstrument):
             azimuth, azimuth_reference, atol=azimuth_tolerance
         )
         is_stable_profile = is_stable_zenith & is_stable_azimuth
+        if ma.isMaskedArray(is_stable_profile):
+            is_stable_profile[is_stable_profile.mask] = False
         n_removed = np.count_nonzero(~is_stable_profile)
         if n_removed >= len(zenith) - 1:
             raise ValidTimeStampError(

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/instruments/pollyxt.py

@@ -109,7 +109,7 @@ class PollyXt(Ceilometer):
         calibration_factors: np.ndarray = np.array([])
         beta_channel = self._get_valid_beta_channel(bsc_files)
         bsc_key = f"attenuated_backscatter_{beta_channel}nm"
-        for (bsc_file, depol_file) in zip(bsc_files, depol_files):
+        for bsc_file, depol_file in zip(bsc_files, depol_files):
             with (
                 netCDF4.Dataset(bsc_file, "r") as nc_bsc,
                 netCDF4.Dataset(depol_file, "r") as nc_depol,

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/output.py

@@ -312,7 +312,6 @@ def update_attributes(cloudnet_variables: dict, attributes: dict) -> None:
 def _write_vars2nc(nc: netCDF4.Dataset, cloudnet_variables: dict) -> None:
     """Iterates over Cloudnet instances and write to netCDF file."""
     for obj in cloudnet_variables.values():
-
         if ma.isMaskedArray(obj.data):
             fill_value = netCDF4.default_fillvals[obj.data_type]
         else:

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/utils.py

@@ -180,7 +180,7 @@ def rebin_2d(
             masked_result[ind, :] = ma.masked
             empty_indices.append(ind)
     if len(empty_indices) > 0:
-        logging.info(f"No radar data in {len(empty_indices)} bins")
+        logging.debug(f"No radar data in {len(empty_indices)} bins")
 
     return masked_result, empty_indices
 

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4}/cloudnetpy/version.py

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

{cloudnetpy-1.46.2 → cloudnetpy-1.46.4/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.46.2
+Version: 1.46.4
 Summary: Python package for Cloudnet processing
 Home-page: https://github.com/actris-cloudnet/cloudnetpy
 Author: Finnish Meteorological Institute