cloudnetpy 1.60.2__py3-none-any.whl → 1.60.4__py3-none-any.whl

cloudnetpy/model_evaluation/model_metadata.py

@@ -28,7 +28,7 @@ MODELS = {
         level=88,
         cycle="1-12, 7-18",
     ),
-    "harmonie": ModelMetaData(
+    "harmonie-fmi-6-11": ModelMetaData(
         model_name="HARMONIE-AROME",
         long_name="the HIRLAM–ALADIN Research on Mesoscale Operational NWP in Euromed",  # noqa: RUF001
         level=65,

cloudnetpy/model_evaluation/plotting/plotting.py

@@ -17,7 +17,7 @@ import cloudnetpy.model_evaluation.plotting.plot_tools as p_tools
 from cloudnetpy.model_evaluation.model_metadata import MODELS
 from cloudnetpy.model_evaluation.plotting.plot_meta import ATTRIBUTES
 from cloudnetpy.model_evaluation.statistics.statistical_methods import DayStatistics
-from cloudnetpy.plotting.plotting import get_log_cbar_tick_labels, lin2log
+from cloudnetpy.plotting.plotting import Dimensions, get_log_cbar_tick_labels, lin2log
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
@@ -34,7 +34,7 @@ def generate_L3_day_plots(
     save_path: str | None = None,
     image_name: str | None = None,
     show: bool | None = False,
-) -> None:
+) -> list[Dimensions]:
     """Generate visualizations for level 3 dayscale products.
     With figure type visualizations can be subplot in group, pair, single or
     statistic of given product. In group fig_type all different methods are plot
@@ -93,7 +93,11 @@ def generate_L3_day_plots(
     model_info = MODELS[model]
     model_name = model_info.model_name
     name_set = p_tools.parse_wanted_names(nc_file, product, model, var_list)
-    for names in name_set:
+    unique_tuples = {tuple(lst) for lst in name_set}
+    name_set_unique = tuple(list(tup) for tup in unique_tuples)
+
+    dimensions = []
+    for names in name_set_unique:
         if len(names) > 0:
             try:
                 cycle_names, cycles = p_tools.sort_cycles(names, model)
@@ -120,7 +124,11 @@ def generate_L3_day_plots(
                             save_path,
                             image_name,
                         ]
-                    getattr(cls, f"get_{fig_type}_plots")(*params, **kwargs)
+                    figs, axes = getattr(cls, f"get_{fig_type}_plots")(
+                        *params, **kwargs
+                    )
+                    for fig, ax in zip(figs, axes, strict=False):
+                        dimensions.append(Dimensions(fig, ax))
             except AttributeError:
                 params = [
                     product,
@@ -143,7 +151,10 @@ def generate_L3_day_plots(
                         save_path,
                         image_name,
                     ]
-                getattr(cls, f"get_{fig_type}_plots")(*params, **kwargs)
+                figs, axes = getattr(cls, f"get_{fig_type}_plots")(*params, **kwargs)
+                for fig, ax in zip(figs, axes, strict=False):
+                    dimensions.append(Dimensions(fig, ax))
+    return dimensions
 
 
 def get_group_plots(
@@ -159,7 +170,7 @@ def get_group_plots(
     cycle: str = "",
     title: bool = True,
     include_xlimits: bool = False,
-) -> None:
+) -> tuple:
     """Group subplot visualization for both standard and advection downsampling.
     Generates group subplot figure for product with model and all different
     downsampling methods. Generates separated figures for standard and advection
@@ -204,6 +215,7 @@ def get_group_plots(
         [product, model_run, "group"],
         show=show,
     )
+    return fig, ax
 
 
 def get_pair_plots(
@@ -280,7 +292,7 @@ def get_single_plots(
     cycle: str = "",
     title: bool = True,
     include_xlimits: bool = False,
-) -> None:
+) -> tuple[list, list]:
     """Generates figures of each product variable from given file in loop.
 
     Args:
@@ -295,9 +307,13 @@ def get_single_plots(
         cycle (str): Name of cycle if exists
         title (bool): True or False if wanted to add title to subfig
     """
+    figs = []
+    axes = []
     variable_info = ATTRIBUTES[product]
-    for _, name in enumerate(names):
+    for name in names:
         fig, ax = initialize_figure(1)
+        figs.append(fig)
+        axes.append(ax)
         set_yax(ax[0], 12, ylabel=None)
         set_xax(ax[0], include_xlimits=include_xlimits)
 
@@ -318,6 +334,7 @@ def get_single_plots(
             [name, "single"],
             show=show,
         )
+    return figs, axes
 
 
 def plot_colormesh(ax, data: np.ndarray, axes: tuple, variable_info) -> None:
@@ -349,7 +366,7 @@ def get_statistic_plots(
     show: bool,
     cycle: str = "",
     title: bool = True,
-) -> None:
+) -> tuple:
     """Statistical subplots for day scale products.
     Statistical analysis can be done by day scale with relative error ('error'),
     total data area analysis ('area'), histogram ('hist') or vertical profiles
@@ -387,12 +404,16 @@ def get_statistic_plots(
         err_msg = f"No data in {model_name} or observation"
         raise ValueError(err_msg)
 
+    figs = []
+    axes = []
     for stat in stats:
         try:
             obs_missing = False
             model_missing = False
             variable_info = ATTRIBUTES[product]
             fig, ax = initialize_figure(len(names) - 1, stat)
+            figs.append(fig)
+            axes.append(ax)
             model_data, _, _ = p_tools.read_data_characters(nc_file, names[0], model)
             if np.all(model_data.mask is True):
                 model_missing = True
@@ -443,6 +464,7 @@ def get_statistic_plots(
             [name, stat, model_run],
             show=show,
         )
+    return figs, axes
 
 
 def initialize_statistic_plots(

cloudnetpy/model_evaluation/products/advance_methods.py

@@ -2,8 +2,9 @@ import importlib
 import logging
 
 import numpy as np
+import scipy.special
+import scipy.stats
 from numpy import ma
-from scipy.special import gamma
 
 import cloudnetpy.utils as cl_tools
 from cloudnetpy.datasource import DataSource
@@ -44,7 +45,7 @@ class AdvanceProductMethods(DataSource):
             name = f"get_advance_{self.product}"
             getattr(cls, name)(self)
         except AttributeError as error:
-            logging.warning("No advance method for %s: %s", self.product, error)
+            logging.debug("No advance method for %s: %s", self.product, error)
 
     def get_advance_cf(self) -> None:
         self.cf_cirrus_filter()
@@ -60,24 +61,36 @@ class AdvanceProductMethods(DataSource):
         cf_filtered = self.filter_high_iwc_low_cf(cf, iwc, lwc)
         cloud_iwc, ice_ind = self.find_ice_in_clouds(cf_filtered, iwc, lwc)
         variance_iwc = self.iwc_variance(h, ice_ind)
-        # Looks suspicious, check me:
+
         for i, ind in enumerate(zip(ice_ind[0], ice_ind[-1], strict=True)):
-            iwc_dist = self.calculate_iwc_distribution(cloud_iwc[i], variance_iwc[i])
+            try:
+                iwc_dist = self.calculate_iwc_distribution(
+                    cloud_iwc[i], variance_iwc[i]
+                )
+            except ValueError:
+                continue
+
             p_iwc = self.gamma_distribution(iwc_dist, variance_iwc[i], cloud_iwc[i])
+
+            if np.isinf(p_iwc).any():
+                cf_filtered[ind] = ma.masked
+                continue
+
             if np.sum(p_iwc) == 0 or p_iwc[-1] > 0.01 * np.sum(p_iwc):
-                cf_filtered[ind] = np.nan
+                cf_filtered[ind] = ma.masked
                 continue
-            obs_index = self.get_observation_index(
-                iwc_dist,
-                tZT,
-                tT,
-                tZ,
-                t,
-                float(t_screened[ind]),
-                float(z_sen[ind]),
+
+            min_iwc = 10 ** (
+                tZT * z_sen[ind] * t_screened[ind]
+                + tT * t_screened[ind]
+                + tZ * z_sen[ind]
+                + t
             )
+            obs_index = iwc_dist > min_iwc
             cf_filtered[ind] = self.filter_cirrus(p_iwc, obs_index, cf_filtered[ind])
+
         cf_filtered[cf_filtered < 0.05] = ma.masked
+
         self._model_obj.append_data(
             cf_filtered,
             f"{self._model_obj.model}{self._model_obj.cycle}_cf_cirrus",
@@ -132,7 +145,7 @@ class AdvanceProductMethods(DataSource):
         iwc: np.ndarray,
         lwc: np.ndarray,
     ) -> np.ndarray:
-        cf_filtered = np.copy(cf)
+        cf_filtered = ma.copy(cf)
         weird_ind = (iwc / cf > 0.5e-3) & (cf < 0.001)
         weird_ind = weird_ind | (iwc == 0) & (lwc == 0) & (cf == 0)
         cf_filtered[weird_ind] = ma.masked
@@ -199,7 +212,9 @@ class AdvanceProductMethods(DataSource):
         n_std: int = 5,
         n_dist: int = 250,
     ) -> np.ndarray:
-        finish = cloud_iwc + n_std * (np.sqrt(f_variance_iwc) * cloud_iwc)
+        finish = cloud_iwc + n_std * (ma.sqrt(f_variance_iwc) * cloud_iwc)
+        if isinstance(finish, ma.MaskedArray) and finish.mask.all():
+            raise ValueError
         iwc_dist = np.arange(0, finish, finish / (n_dist - 1))
         if cloud_iwc < iwc_dist[2]:
             finish = cloud_iwc * 10
@@ -208,40 +223,11 @@ class AdvanceProductMethods(DataSource):
 
     @staticmethod
     def gamma_distribution(
-        iwc_dist: np.ndarray,
-        f_variance_iwc: float,
-        cloud_iwc: float,
-    ) -> np.ndarray:
-        def calculate_gamma_dist() -> float:
-            alpha = 1 / f_variance_iwc
-            return (
-                1
-                / gamma(alpha)
-                * (alpha / cloud_iwc) ** alpha
-                * iwc_dist[i] ** (alpha - 1)
-                * ma.exp(-(alpha * iwc_dist[i] / cloud_iwc))
-            )
-
-        p_iwc = np.zeros(iwc_dist.shape)
-        for i in range(len(iwc_dist)):
-            p_iwc[i] = calculate_gamma_dist()
-        return p_iwc
-
-    @staticmethod
-    def get_observation_index(
-        iwc_dist: np.ndarray,
-        tZT: float,
-        tT: float,
-        tZ: float,
-        t: np.ndarray,
-        temperature: float,
-        z_sen: float,
+        iwc_dist: np.ndarray, f_variance_iwc: float, cloud_iwc: float
     ) -> np.ndarray:
-        def calculate_min_iwc() -> np.ndarray:
-            return 10 ** (tZT * z_sen * temperature + tT * temperature + tZ * z_sen + t)
-
-        iwc_min = calculate_min_iwc()
-        return iwc_dist > iwc_min
+        alpha = 1 / f_variance_iwc
+        theta = cloud_iwc / alpha
+        return scipy.stats.gamma.pdf(iwc_dist, a=alpha, scale=theta)
 
     @staticmethod
     def filter_cirrus(
@@ -249,4 +235,4 @@ class AdvanceProductMethods(DataSource):
         obs_index: np.ndarray,
         cf_filtered: np.ndarray,
     ) -> np.ndarray:
-        return (np.sum(p_iwc * obs_index) / np.sum(p_iwc)) * cf_filtered
+        return (ma.sum(p_iwc * obs_index) / ma.sum(p_iwc)) * cf_filtered

cloudnetpy/model_evaluation/products/grid_methods.py

@@ -119,56 +119,35 @@ class ProductGrid:
 
     def _cf_method_storage(self) -> tuple[dict, dict]:
         cf_dict = {
-            "cf_V": np.zeros(self._model_height.shape),
-            "cf_A": np.zeros(self._model_height.shape),
+            "cf_V": ma.zeros(self._model_height.shape),
+            "cf_A": ma.zeros(self._model_height.shape),
         }
         cf_adv_dict = {
-            "cf_V_adv": np.zeros(self._model_height.shape),
-            "cf_A_adv": np.zeros(self._model_height.shape),
+            "cf_V_adv": ma.zeros(self._model_height.shape),
+            "cf_A_adv": ma.zeros(self._model_height.shape),
         }
         return cf_dict, cf_adv_dict
 
     def _iwc_method_storage(self) -> tuple[dict, dict]:
         iwc_dict = {
-            "iwc": np.zeros(self._model_height.shape),
-            "iwc_att": np.zeros(self._model_height.shape),
-            "iwc_rain": np.zeros(self._model_height.shape),
+            "iwc": ma.zeros(self._model_height.shape),
+            "iwc_att": ma.zeros(self._model_height.shape),
+            "iwc_rain": ma.zeros(self._model_height.shape),
         }
         iwc_adv_dict = {
-            "iwc_adv": np.zeros(self._model_height.shape),
-            "iwc_att_adv": np.zeros(self._model_height.shape),
-            "iwc_rain_adv": np.zeros(self._model_height.shape),
+            "iwc_adv": ma.zeros(self._model_height.shape),
+            "iwc_att_adv": ma.zeros(self._model_height.shape),
+            "iwc_rain_adv": ma.zeros(self._model_height.shape),
         }
         return iwc_dict, iwc_adv_dict
 
     def _product_method_storage(self) -> tuple[dict, dict]:
-        product_dict = {f"{self._obs_obj.obs}": np.zeros(self._model_height.shape)}
+        product_dict = {f"{self._obs_obj.obs}": ma.zeros(self._model_height.shape)}
         product_adv_dict = {
-            f"{self._obs_obj.obs}_adv": np.zeros(self._model_height.shape),
+            f"{self._obs_obj.obs}_adv": ma.zeros(self._model_height.shape),
         }
         return product_dict, product_adv_dict
 
-    @staticmethod
-    def _regrid_cf(storage: dict, i: int, j: int, data: np.ndarray | None) -> dict:
-        """Calculates average cloud fraction value to grid point"""
-        for key, downsample in storage.items():
-            if data is not None:
-                if isinstance(data, ma.MaskedArray) and data.mask.all():
-                    downsample[i, j] = np.nan
-                elif not np.isnan(data).all():
-                    downsample[i, j] = np.nanmean(data)
-                else:
-                    downsample[i, j] = np.nan
-                if "_A" in key and (
-                    not np.isnan(data).all()
-                    and not (isinstance(data, ma.MaskedArray) and data.mask.all())
-                ):
-                    downsample[i, j] = tl.average_column_sum(data)
-            else:
-                downsample[i, j] = np.nan
-            storage[key] = downsample
-        return storage
-
     def _reshape_data_to_window(
         self,
         ind: np.ndarray,
@@ -181,6 +160,17 @@ class ProductGrid:
             return self._obs_data[ind].reshape(window_size)
         return None
 
+    @staticmethod
+    def _regrid_cf(storage: dict, i: int, j: int, data: np.ndarray) -> dict:
+        """Calculates average cloud fraction value to grid point."""
+        data_ma = ma.array(data) if not isinstance(data, ma.MaskedArray) else data
+        for key, downsample in storage.items():
+            downsample[i, j] = ma.mean(data_ma)
+            if "_A" in key and not data_ma.mask.all():
+                downsample[i, j] = tl.average_column_sum(data_ma)
+            storage[key] = downsample
+        return storage
+
     def _regrid_iwc(
         self,
         storage: dict,
@@ -189,40 +179,33 @@ class ProductGrid:
         ind_rain: np.ndarray,
         ind_no_rain: np.ndarray,
     ) -> dict:
-        """Calculates average iwc value for grid point"""
-        for key, downsample in storage.items():
-            if not self._obs_data[ind_no_rain].mask.all():
-                if np.isnan(self._obs_data[ind_no_rain]).all():
-                    downsample[i, j] = np.nan
-                else:
-                    no_rain_data = self._obs_data[ind_no_rain]
-                    if no_rain_data.size > 0:
-                        downsample[i, j] = np.nanmean(self._obs_data[ind_no_rain])
-                    else:
-                        downsample[i, j] = np.nan
-            elif "rain" in key and not self._obs_data[ind_rain].mask.all():
-                downsample[i, j] = np.nanmean(self._obs_data[ind_rain])
-            else:
-                downsample[i, j] = np.nan
+        """Calculates average iwc value for each grid point."""
+        for key, down_sample in storage.items():
+            down_sample[i, j] = ma.masked
+            if "rain" not in key:
+                no_rain_data = self._obs_data[ind_no_rain]
+                if ind_no_rain.any() and not no_rain_data.mask.all():
+                    down_sample[i, j] = ma.mean(no_rain_data)
+            if "rain" in key:
+                rain_data = self._obs_data[ind_rain]
+                if ind_rain.any() and not rain_data.mask.all():
+                    down_sample[i, j] = ma.mean(rain_data)
             if "att" in key:
-                iwc_att = self._obs_obj.data["iwc_att"][:]
-                if iwc_att[ind_no_rain].mask.all():
-                    downsample[i, j] = np.nan
-                else:
-                    downsample[i, j] = np.nanmean(iwc_att[ind_no_rain])
-            storage[key] = downsample
+                no_rain_att_data = self._obs_obj.data["iwc_att"][ind_no_rain]
+                if ind_no_rain.any() and not no_rain_att_data.mask.all():
+                    down_sample[i, j] = ma.mean(no_rain_att_data)
+            storage[key] = down_sample
         return storage
 
     def _regrid_product(self, storage: dict, i: int, j: int, ind: np.ndarray) -> dict:
-        """Calculates average of standard product value to grid point"""
+        """Calculates average of standard product value for each grid point."""
         for key, down_sample in storage.items():
-            if not self._obs_data[ind].mask.all() and ind.any():
-                if np.isnan(self._obs_data[ind]).all():
-                    down_sample[i, j] = np.nan
-                else:
-                    down_sample[i, j] = np.nanmean(self._obs_data[ind])
-            else:
-                down_sample[i, j] = np.nan
+            obs_data_selected = ma.masked_invalid(self._obs_data[ind])
+            down_sample[i, j] = (
+                ma.mean(obs_data_selected)
+                if not obs_data_selected.mask.all()
+                else ma.masked
+            )
             storage[key] = down_sample
         return storage
 

cloudnetpy/model_evaluation/tests/unit/conftest.py

@@ -3,6 +3,7 @@ from datetime import date
 import netCDF4
 import numpy as np
 import pytest
+from numpy import ma
 
 
 @pytest.fixture(scope="session")
@@ -28,7 +29,7 @@ def model_file(tmpdir_factory, file_metadata) -> str:
     root_grp.createDimension("level", level)
     _create_global_attributes(root_grp, file_metadata)
     var = root_grp.createVariable("time", "f8", "time")
-    var[:] = np.array([2, 6, 10])
+    var[:] = ma.array([2, 6, 10])
     var = root_grp.createVariable("level", "f8", "level")
     var[:] = level
     var = root_grp.createVariable("latitude", "f8")
@@ -38,24 +39,24 @@ def model_file(tmpdir_factory, file_metadata) -> str:
     var = root_grp.createVariable("horizontal_resolution", "f8")
     var[:] = 9
     var = root_grp.createVariable("height", "f8", ("time", "level"))
-    var[:] = np.array([[10, 14], [8, 14], [9, 15]])
+    var[:] = ma.array([[10, 14], [8, 14], [9, 15]])
     var.units = "km"
     var = root_grp.createVariable("forecast_time", "f8", "time")
-    var[:] = np.array([1, 5, 10])
+    var[:] = ma.array([1, 5, 10])
     var = root_grp.createVariable("cloud_fraction", "f8", ("time", "level"))
-    var[:] = np.array([[0, 2], [3, 6], [5, 8]])
+    var[:] = ma.array([[0, 2], [3, 6], [5, 8]])
     var = root_grp.createVariable("qi", "f8", ("time", "level"))
-    var[:] = np.array([[0.01, 0.00], [0.02, 0.03], [0.06, 0.08]])
+    var[:] = ma.array([[0.01, 0.00], [0.02, 0.03], [0.06, 0.08]])
     var = root_grp.createVariable("ql", "f8", ("time", "level"))
-    var[:] = np.array([[0.008, 0.09], [0.004, 0.007], [0.0001, 0.0002]])
+    var[:] = ma.array([[0.008, 0.09], [0.004, 0.007], [0.0001, 0.0002]])
     var = root_grp.createVariable("temperature", "f8", ("time", "level"))
-    var[:] = np.array([[300, 301], [302, 299], [305, 298]])
+    var[:] = ma.array([[300, 301], [302, 299], [305, 298]])
     var = root_grp.createVariable("pressure", "f8", ("time", "level"))
-    var[:] = np.array([[1000, 1001], [1010, 1003], [1020, 1005]])
+    var[:] = ma.array([[1000, 1001], [1010, 1003], [1020, 1005]])
     var = root_grp.createVariable("uwind", "f8", ("time", "level"))
-    var[:] = np.array([[1, 2], [2, 2], [3, 1]])
+    var[:] = ma.array([[1, 2], [2, 2], [3, 1]])
     var = root_grp.createVariable("vwind", "f8", ("time", "level"))
-    var[:] = np.array([[3, 1], [2, 1], [5, 2]])
+    var[:] = ma.array([[3, 1], [2, 1], [5, 2]])
     root_grp.close()
     return file_name
 
@@ -70,9 +71,9 @@ def obs_file(tmpdir_factory, file_metadata) -> str:
     root_grp.createDimension("height", height)
     _create_global_attributes(root_grp, file_metadata)
     var = root_grp.createVariable("time", "f8", "time")
-    var[:] = np.array([0, 2, 4, 6, 8, 10])
+    var[:] = ma.array([0, 2, 4, 6, 8, 10])
     var = root_grp.createVariable("height", "f8", "height")
-    var[:] = np.array([8, 9, 12, 15])
+    var[:] = ma.array([8, 9, 12, 15])
     var.units = "km"
     var = root_grp.createVariable("latitude", "f8")
     var[:] = 1
@@ -84,11 +85,11 @@ def obs_file(tmpdir_factory, file_metadata) -> str:
     var = root_grp.createVariable("radar_frequency", "f8")
     var[:] = 35.5
     var = root_grp.createVariable("rainrate", "i4", "time")
-    var[:] = np.array([1, 2, 0, 10, 5, 13])
+    var[:] = ma.array([1, 2, 0, 10, 5, 13])
     var = root_grp.createVariable("Z_sensitivity", "f8", "height")
-    var[:] = np.array([0.1, 0.2, 0.0, 1.0])
+    var[:] = ma.array([0.1, 0.2, 0.0, 1.0])
     var = root_grp.createVariable("category_bits", "i4", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [0, 1, 2, 0],
             [2, 8, 4, 1],
@@ -99,7 +100,7 @@ def obs_file(tmpdir_factory, file_metadata) -> str:
         ],
     )
     var = root_grp.createVariable("quality_bits", "i4", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [0, 1, 2, 4],
             [8, 16, 32, 16],
@@ -110,7 +111,7 @@ def obs_file(tmpdir_factory, file_metadata) -> str:
         ],
     )
     var = root_grp.createVariable("iwc", "f8", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [0.01, 0.02, 0.06, 0.01],
             [0.02, 0.06, 0.00, 0.03],
@@ -121,7 +122,7 @@ def obs_file(tmpdir_factory, file_metadata) -> str:
         ],
     )
     var = root_grp.createVariable("iwc_retrieval_status", "f8", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [1, 2, 6, 1],
             [2, 6, 5, 3],
@@ -132,7 +133,7 @@ def obs_file(tmpdir_factory, file_metadata) -> str:
         ],
     )
     var = root_grp.createVariable("lwc", "f8", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [0.08, 0.04, 0.01, 0.08],
             [0.04, 0.01, 0.09, 0.07],
@@ -143,7 +144,7 @@ def obs_file(tmpdir_factory, file_metadata) -> str:
         ],
     )
     var = root_grp.createVariable("data", "i4", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [2, 4, 3, 6],
             [7, 1, 9, 7],
@@ -167,7 +168,7 @@ def regrid_file(tmpdir_factory, file_metadata) -> str:
     root_grp.createDimension("level", level)
     _create_global_attributes(root_grp, file_metadata)
     var = root_grp.createVariable("time", "f8", "time")
-    var[:] = np.array([2, 6, 10])
+    var[:] = ma.array([2, 6, 10])
     var = root_grp.createVariable("level", "f8", "level")
     var[:] = level
     var = root_grp.createVariable("latitude", "f8")
@@ -177,23 +178,23 @@ def regrid_file(tmpdir_factory, file_metadata) -> str:
     var = root_grp.createVariable("horizontal_resolution", "f8")
     var[:] = 9
     var = root_grp.createVariable("ecmwf_height", "f8", ("time", "level"))
-    var[:] = np.array([[10, 14], [8, 14], [9, 15]])
+    var[:] = ma.array([[10, 14], [8, 14], [9, 15]])
     var = root_grp.createVariable("ecmwf_forecast_time", "f8", "time")
-    var[:] = np.array([1, 5, 10])
+    var[:] = ma.array([1, 5, 10])
     var = root_grp.createVariable("ecmwf_cf", "f8", ("time", "level"))
-    var[:] = np.array([[0, 2], [3, 6], [5, 8]])
+    var[:] = ma.array([[0, 2], [3, 6], [5, 8]])
     var = root_grp.createVariable("ecmwf_cf_cirrus", "f8", ("time", "level"))
-    var[:] = np.array([[0, 2], [3, 6], [5, 7]])
+    var[:] = ma.array([[0, 2], [3, 6], [5, 7]])
     var = root_grp.createVariable("ecmwf_cf_snow", "f8", ("time", "level"))
-    var[:] = np.array([[0, 2], [4, 6], [5, 8]])
+    var[:] = ma.array([[0, 2], [4, 6], [5, 8]])
     var = root_grp.createVariable("cf_ecmwf", "f8", ("time", "level"))
-    var[:] = np.array([[0, 2], [3, 6], [5, 8]])
+    var[:] = ma.array([[0, 2], [3, 6], [5, 8]])
     var = root_grp.createVariable("cf_adv_ecmwf", "f8", ("time", "level"))
-    var[:] = np.array([[0, 2], [3, 6], [5, 8]])
+    var[:] = ma.array([[0, 2], [3, 6], [5, 8]])
     var = root_grp.createVariable("temperature", "f8", ("time", "level"))
-    var[:] = np.array([[300, 301], [302, 299], [305, 298]])
+    var[:] = ma.array([[300, 301], [302, 299], [305, 298]])
     var = root_grp.createVariable("pressure", "f8", ("time", "level"))
-    var[:] = np.array([[1000, 1001], [1010, 1003], [1020, 1005]])
+    var[:] = ma.array([[1000, 1001], [1010, 1003], [1020, 1005]])
     root_grp.close()
     return file_name
 

cloudnetpy/model_evaluation/tests/unit/test_advance_methods.py

@@ -248,31 +248,6 @@ def test_gamma_distribution(obs_file, model_file) -> None:
     testing.assert_array_almost_equal(x, compare)
 
 
-def test_get_observation_index(obs_file, model_file) -> None:
-    obs = ObservationManager(PRODUCT, str(obs_file))
-    model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
-    adv_pro = AdvanceProductMethods(model, str(model_file), obs)
-    tZT = 0.01
-    z_sen = 0.02
-    temperature = -13
-    tT = 0.04
-    tZ = 0.05
-    t = 0.06
-    min_iwc = 10 ** (tZT * z_sen * temperature + tT * temperature + tZ * z_sen + t)
-    iwc_dist = np.array([0.1, 0.2, 0.3, 0.4, 0.5, 0.6])
-    compare = iwc_dist > min_iwc
-    x = adv_pro.get_observation_index(
-        iwc_dist,
-        tZT,
-        tT,
-        tZ,
-        np.array([t]),
-        temperature,
-        z_sen,
-    )
-    testing.assert_array_almost_equal(x, compare)
-
-
 def test_filter_cirrus(obs_file, model_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)

cloudnetpy/model_evaluation/tests/unit/test_grid_methods.py

@@ -122,7 +122,7 @@ def test_regrid_cf_area(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
     data = ma.array([[1, 1, 1], [0, 1, 1], [0, 0, 1], [0, 0, 0]])
-    d = {"cf_A": np.zeros((1, 1))}
+    d = {"cf_A": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_A"]
     assert x[0, 0] == 0.75
@@ -134,7 +134,7 @@ def test_regrid_cf_area_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     data = ma.array([[1, 1, 1], [0, 1, 1], [0, 0, 1], [0, 0, 0]])
     data[1, :] = ma.masked
-    d = {"cf_A": np.zeros((1, 1))}
+    d = {"cf_A": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_A"]
     assert round(x[0, 0], 3) == 0.667
@@ -146,18 +146,19 @@ def test_regrid_cf_area_all_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     data = ma.array([[1, 1, 1], [0, 1, 1], [0, 0, 1], [0, 0, 0]])
     data[:, :] = ma.masked
-    d = {"cf_A": np.zeros((1, 1))}
+    d = {"cf_A": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_A"]
-    testing.assert_equal(x, np.nan)
+    testing.assert_equal(x, ma.masked)
 
 
 def test_regrid_cf_area_nan(model_file, obs_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
-    data = ma.array([[1, np.nan, 1], [0, 1, 1], [np.nan, 0, 1], [0, 0, 0]])
-    d = {"cf_A": np.zeros((1, 1))}
+    data = ma.array([[1, 99, 1], [0, 1, 1], [99, 0, 1], [0, 0, 0]])
+    data = ma.masked_where(data == 99, data)
+    d = {"cf_A": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_A"]
     assert x[0, 0] == 0.75
@@ -169,18 +170,16 @@ def test_regrid_cf_area_all_nan(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     data = ma.array(
         [
-            [np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan],
-        ],
+            [1, 1, 1],
+            [1, 1, 1],
+            [1, 1, 1],
+            [1, 1, 1],
+        ], mask=True
     )
-    d = {"cf_A": np.zeros((1, 1))}
+    d = {"cf_A": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_A"]
-    # Not sure if this should be nan or 0 (Simo)
-    # testing.assert_equal(x, 0.0)
-    testing.assert_equal(x, np.nan)
+    testing.assert_equal(x, ma.masked)
 
 
 def test_regrid_cf_volume(model_file, obs_file) -> None:
@@ -188,7 +187,7 @@ def test_regrid_cf_volume(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
     data = ma.array([[1, 1, 1], [0, 1, 1], [0, 0, 1], [0, 0, 0]])
-    d = {"cf_V": np.zeros((1, 1))}
+    d = {"cf_V": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_V"]
     assert x[0, 0] == 0.5
@@ -198,8 +197,9 @@ def test_regrid_cf_volume_nan(model_file, obs_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
-    data = ma.array([[1, np.nan, 1], [0, 1, 1], [np.nan, 0, 1], [0, 0, 0]])
-    d = {"cf_V": np.zeros((1, 1))}
+    data = ma.array([[1, 99, 1], [0, 1, 1], [99, 0, 1], [0, 0, 0]])
+    data = ma.masked_where(data == 99, data)
+    d = {"cf_V": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_V"]
     assert x[0, 0] == 0.5
@@ -211,16 +211,17 @@ def test_regrid_cf_volume_all_nan(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     data = ma.array(
         [
-            [np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan],
+            [99, 99, 99],
+            [99, 99, 99],
+            [99, 99, 99],
+            [99, 99, 99],
         ],
     )
-    d = {"cf_V": np.zeros((1, 1))}
+    data = ma.masked_where(data == 99, data)
+    d = {"cf_V": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_V"]
-    testing.assert_equal(x, np.nan)
+    testing.assert_equal(x, ma.masked)
 
 
 def test_regrid_cf_volume_masked(model_file, obs_file) -> None:
@@ -229,7 +230,7 @@ def test_regrid_cf_volume_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     data = ma.array([[1, 1, 1], [0, 1, 1], [0, 0, 1], [0, 0, 0]])
     data[1, :] = ma.masked
-    d = {"cf_V": np.zeros((1, 1))}
+    d = {"cf_V": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_V"]
     assert round(x[0, 0], 3) == 0.444
@@ -241,10 +242,10 @@ def test_regrid_cf_volume_all_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     data = ma.array([[1, 1, 1], [0, 1, 1], [0, 0, 1], [0, 0, 0]])
     data[:, :] = ma.masked
-    d = {"cf_V": np.zeros((1, 1))}
+    d = {"cf_V": ma.zeros((1, 1))}
     d = obj._regrid_cf(d, 0, 0, data)
     x = d["cf_V"]
-    testing.assert_equal(x, np.nan)
+    testing.assert_equal(x, ma.masked)
 
 
 def test_reshape_data_to_window(model_file, obs_file) -> None:
@@ -338,7 +339,7 @@ def test_regrid_iwc(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 3]])
-    d = {"iwc": np.zeros((1, 1))}
+    d = {"iwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]],
@@ -354,9 +355,10 @@ def test_regrid_iwc_nan(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array(
-        [[1, 1, np.nan, 1], [2, np.nan, 2, 2], [3, 3, 3, 3], [4, 4, 4, np.nan]],
+        [[1, 1, 99, 1], [2, 99, 2, 2], [3, 3, 3, 3], [4, 4, 4, 99]],
     )
-    d = {"iwc": np.zeros((1, 1))}
+    obj._obs_data = ma.masked_where(obj._obs_data == 99, obj._obs_data)
+    d = {"iwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]],
@@ -373,21 +375,21 @@ def test_regrid_iwc_all_nan(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array(
         [
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
         ],
     )
-    d = {"iwc": np.zeros((1, 1))}
+    obj._obs_data = ma.masked_where(obj._obs_data == 99, obj._obs_data)
+    d = {"iwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]],
         dtype=bool,
     )
     d = obj._regrid_iwc(d, 0, 0, ind, no_rain)
-    x = d["iwc"]
-    testing.assert_almost_equal(x[0, 0], np.nan)
+    assert d["iwc"][0, 0].mask == True
 
 
 def test_regrid_iwc_masked(model_file, obs_file) -> None:
@@ -396,7 +398,7 @@ def test_regrid_iwc_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
     obj._obs_data[1, :] = ma.masked
-    d = {"iwc": np.zeros((1, 1))}
+    d = {"iwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]],
@@ -411,17 +413,15 @@ def test_regrid_iwc_all_masked(model_file, obs_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
-    obj._obs_data = ma.array([[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
-    obj._obs_data[:, :] = ma.masked
-    d = {"iwc": np.zeros((1, 1))}
+    obj._obs_data = ma.array([[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]], mask=True)
+    d = {"iwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]],
         dtype=bool,
     )
     d = obj._regrid_iwc(d, 0, 0, ind, no_rain)
-    x = d["iwc"]
-    testing.assert_almost_equal(x[0, 0], np.nan)
+    assert d["iwc"][0, 0].mask == True
 
 
 def test_regrid_iwc_none(model_file, obs_file) -> None:
@@ -429,22 +429,21 @@ def test_regrid_iwc_none(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
-    d = {"iwc": np.zeros((1, 1))}
+    d = {"iwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]],
         dtype=bool,
     )
     d = obj._regrid_iwc(d, 0, 0, ind, no_rain)
-    x = d["iwc"]
-    testing.assert_equal(x[0, 0], np.nan)
+    assert d["iwc"][0, 0].mask == True
 
 
 def test_regrid_iwc_att(model_file, obs_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
-    d = {"iwc_att": np.zeros((1, 1))}
+    d = {"iwc_att": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [
@@ -477,7 +476,7 @@ def test_regrid_iwc_att_masked(model_file, obs_file) -> None:
         ],
         dtype=bool,
     )
-    d = {"iwc_att": np.zeros((1, 1))}
+    d = {"iwc_att": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [
@@ -510,7 +509,7 @@ def test_regrid_iwc_att_all_masked(model_file, obs_file) -> None:
         ],
         dtype=bool,
     )
-    d = {"iwc_att": np.zeros((1, 1))}
+    d = {"iwc_att": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [
@@ -525,14 +524,15 @@ def test_regrid_iwc_att_all_masked(model_file, obs_file) -> None:
     )
     d = obj._regrid_iwc(d, 0, 0, ind, no_rain)
     x = d["iwc_att"]
-    testing.assert_almost_equal(x[0, 0], np.nan)
+    # Simo: not sure if this should be masked or not
+    assert x[0, 0] == 0.01
 
 
 def test_regrid_iwc_att_none(model_file, obs_file) -> None:
     obs = ObservationManager(PRODUCT, str(obs_file))
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
-    d = {"iwc_att": np.zeros((1, 1))}
+    d = {"iwc_att": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [
@@ -547,7 +547,7 @@ def test_regrid_iwc_att_none(model_file, obs_file) -> None:
     )
     d = obj._regrid_iwc(d, 0, 0, ind, no_rain)
     x = d["iwc_att"]
-    assert np.isnan(x[0, 0])
+    assert x[0, 0].mask == True
 
 
 def test_regrid_iwc_rain(model_file, obs_file) -> None:
@@ -555,7 +555,7 @@ def test_regrid_iwc_rain(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, PRODUCT)
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 3]])
-    d = {"iwc_rain": np.zeros((1, 1))}
+    d = {"iwc_rain": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]],
@@ -572,13 +572,14 @@ def test_regrid_iwc_rain_nan(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array(
         [
-            [1, np.nan, 1, 1],
-            [2, 2, 2, np.nan],
+            [1, 99, 1, 1],
+            [2, 2, 2, 99],
             [3, 3, 3, 3],
-            [np.nan, 4, 4, np.nan],
+            [99, 4, 4, 99],
         ],
     )
-    d = {"iwc_rain": np.zeros((1, 1))}
+    obj._obs_data = ma.masked_where(obj._obs_data == 99, obj._obs_data)
+    d = {"iwc_rain": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]],
@@ -595,13 +596,14 @@ def test_regrid_iwc_rain_all_nan(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array(
         [
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
         ],
     )
-    d = {"iwc_rain": np.zeros((1, 1))}
+    obj._obs_data = ma.masked_where(obj._obs_data == 99, obj._obs_data)
+    d = {"iwc_rain": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]],
@@ -609,7 +611,7 @@ def test_regrid_iwc_rain_all_nan(model_file, obs_file) -> None:
     )
     d = obj._regrid_iwc(d, 0, 0, ind, no_rain)
     x = d["iwc_rain"]
-    testing.assert_almost_equal(x[0, 0], np.nan)
+    assert x[0, 0].mask == True
 
 
 def test_regrid_iwc_rain_masked(model_file, obs_file) -> None:
@@ -618,7 +620,7 @@ def test_regrid_iwc_rain_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
     obj._obs_data[2, :] = ma.masked
-    d = {"iwc_rain": np.zeros((1, 1))}
+    d = {"iwc_rain": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]],
@@ -635,7 +637,7 @@ def test_regrid_iwc_rain_all_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 3, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
     obj._obs_data[:, :] = ma.masked
-    d = {"iwc_rain": np.zeros((1, 1))}
+    d = {"iwc_rain": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]], dtype=bool)
     no_rain = ma.array(
         [[0, 1, 1, 1], [0, 0, 1, 1], [0, 1, 1, 1], [0, 0, 1, 1]],
@@ -643,7 +645,7 @@ def test_regrid_iwc_rain_all_masked(model_file, obs_file) -> None:
     )
     d = obj._regrid_iwc(d, 0, 0, ind, no_rain)
     x = d["iwc_rain"]
-    testing.assert_equal(x[0, 0], np.nan)
+    assert x[0, 0].mask == True
 
 
 def test_regrid_product(model_file, obs_file) -> None:
@@ -651,7 +653,7 @@ def test_regrid_product(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, "lwc")
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 1, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
-    d = {"lwc": np.zeros((1, 1))}
+    d = {"lwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]], dtype=bool)
     d = obj._regrid_product(d, 0, 0, ind)
     x = d["lwc"]
@@ -664,13 +666,14 @@ def test_regrid_product_nan(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array(
         [
-            [1, np.nan, 1, 1],
-            [np.nan, 1, 2, 2],
-            [3, 3, np.nan, 3],
-            [4, np.nan, 4, 4],
+            [1, 99, 1, 1],
+            [99, 1, 2, 2],
+            [3, 3, 99, 3],
+            [4, 99, 4, 4],
         ],
     )
-    d = {"lwc": np.zeros((1, 1))}
+    obj._obs_data = ma.masked_where(obj._obs_data == 99, obj._obs_data)
+    d = {"lwc": ma.zeros((1, 1))}
     ind = ma.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]], dtype=bool)
     d = obj._regrid_product(d, 0, 0, ind)
     x = d["lwc"]
@@ -681,19 +684,19 @@ def test_regrid_product_all_nan(model_file, obs_file) -> None:
     obs = ObservationManager("lwc", str(obs_file))
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, "lwc")
     obj = ProductGrid(model, obs)
-    obj._obs_data = ma.array(
+    data = ma.array(
         [
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
-            [np.nan, np.nan, np.nan, np.nan],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
+            [99, 99, 99, 99],
         ],
     )
-    d = {"lwc": np.zeros((1, 1))}
+    obj._obs_data = ma.masked_where(data == 99, data)
+    d = {"lwc": ma.zeros((1, 1))}
     ind = np.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]], dtype=bool)
     d = obj._regrid_product(d, 0, 0, ind)
-    x = d["lwc"]
-    testing.assert_almost_equal(x[0, 0], np.nan)
+    assert d["lwc"][0, 0].mask == True
 
 
 def test_regrid_product_masked(model_file, obs_file) -> None:
@@ -702,7 +705,7 @@ def test_regrid_product_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 1, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
     obj._obs_data[2, :] = ma.masked
-    d = {"lwc": np.zeros((1, 1))}
+    d = {"lwc": ma.zeros((1, 1))}
     ind = np.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]], dtype=bool)
     d = obj._regrid_product(d, 0, 0, ind)
     x = d["lwc"]
@@ -715,11 +718,11 @@ def test_regrid_product_all_masked(model_file, obs_file) -> None:
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 1, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
     obj._obs_data[:, :] = ma.masked
-    d = {"lwc": np.zeros((1, 1))}
+    d = {"lwc": ma.zeros((1, 1))}
     ind = np.array([[0, 1, 1, 1], [0, 0, 1, 1], [0, 0, 0, 0], [0, 0, 0, 0]], dtype=bool)
     d = obj._regrid_product(d, 0, 0, ind)
     x = d["lwc"]
-    testing.assert_almost_equal(x, np.nan)
+    testing.assert_almost_equal(x, ma.masked)
 
 
 def test_regrid_product_none(model_file, obs_file) -> None:
@@ -727,11 +730,11 @@ def test_regrid_product_none(model_file, obs_file) -> None:
     model = ModelManager(str(model_file), MODEL, OUTPUT_FILE, "lwc")
     obj = ProductGrid(model, obs)
     obj._obs_data = ma.array([[1, 1, 1, 1], [2, 1, 2, 2], [3, 3, 3, 3], [4, 4, 4, 4]])
-    d = {"lwc": np.zeros((1, 1))}
+    d = {"lwc": ma.zeros((1, 1))}
     ind = np.array([[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]], dtype=bool)
     d = obj._regrid_product(d, 0, 0, ind)
     x = d["lwc"]
-    testing.assert_almost_equal(x[0, 0], np.nan)
+    assert x[0, 0].mask == True
 
 
 @pytest.mark.parametrize("product", ["cf_A", "cf_V", "cf_A_adv", "cf_V_adv"])

cloudnetpy/plotting/plotting.py

@@ -281,10 +281,11 @@ class SubPlot:
 
     def _read_plot_meta(self, file_type: str | None) -> PlotMeta:
         if self.options.plot_meta is not None:
-            return self.options.plot_meta
-        fallback = ATTRIBUTES["fallback"].get(self.variable.name, PlotMeta())
-        file_attributes = ATTRIBUTES.get(file_type or "", {})
-        plot_meta = file_attributes.get(self.variable.name, fallback)
+            plot_meta = self.options.plot_meta
+        else:
+            fallback = ATTRIBUTES["fallback"].get(self.variable.name, PlotMeta())
+            file_attributes = ATTRIBUTES.get(file_type or "", {})
+            plot_meta = file_attributes.get(self.variable.name, fallback)
         if plot_meta.clabel is None:
             plot_meta = plot_meta._replace(clabel=_reformat_units(self.variable.units))
         return plot_meta

cloudnetpy/version.py

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

{cloudnetpy-1.60.2.dist-info → cloudnetpy-1.60.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.60.2
+Version: 1.60.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.60.2.dist-info → cloudnetpy-1.60.4.dist-info}/RECORD

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=WoVTNuxni0DUr163vZ-_mDr1brXhY15XSlGMrq9Aoqw,14700
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=0TlHm71YtSrKXBsRKctitnhQrvZPE-ulEVeAQW-oK58,27398
-cloudnetpy/version.py,sha256=1gcGyZ8fdho4zB9yztNBgWbkx81LMd52wmB8PPeX75Y,72
+cloudnetpy/version.py,sha256=06fW2hQK7Jbkp2HWa_QZu8yzkaZk1XNjYTDo93YsO94,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=fWW8ye_8HZASRAiYwURFKWzcGOYIA2RKeVxCq0lVOuM,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
@@ -54,15 +54,15 @@ cloudnetpy/instruments/disdrometer/thies.py,sha256=h7EwZ9tn47UUMiYqDQ68vkXv4q0rE
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=oUGIblcEWLLv16YKUch-M5KA-dGRAcuHa-9anP3xtX4,6447
 cloudnetpy/model_evaluation/metadata.py,sha256=7ZL87iDbaQJIMu8wfnMvb01cGVPkl8RtvEm_tt9uIHE,8413
-cloudnetpy/model_evaluation/model_metadata.py,sha256=JXbYIxX0wAptoETDqZihsm_Ksk1COa_QCJ9QFwToi6k,1427
+cloudnetpy/model_evaluation/model_metadata.py,sha256=CxpY6RPm7GOTBBmPhcNVVpm9ateUmHSUwGtFXTLq3To,1436
 cloudnetpy/model_evaluation/utils.py,sha256=Z9VqYVdtY9yTr2JeVfBn4nccIVWCN5Fd-BCyB_qYI-A,154
 cloudnetpy/model_evaluation/plotting/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/plotting/plot_meta.py,sha256=K18Ugohh24uVAIxjZgJsmK80YwsMstm6B7ptVafONAw,3557
 cloudnetpy/model_evaluation/plotting/plot_tools.py,sha256=0CU9glFeYPCLhrUjvJXPL75DC-aG0dXzmcbfld5TVww,5031
-cloudnetpy/model_evaluation/plotting/plotting.py,sha256=gtGEN5ymf3dlmBWVNgiHzvZbxN3n-YOZFTgrKP4Mzdg,30138
+cloudnetpy/model_evaluation/plotting/plotting.py,sha256=h3iouEKrJncPDGOMmD34hLMnrHOIsDHXpkc1yvVD63k,30877
 cloudnetpy/model_evaluation/products/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy/model_evaluation/products/advance_methods.py,sha256=QUeGQlu4k0YKLAvzqDxIu6hC84-0u-Lk0ABUGSEPacY,9032
-cloudnetpy/model_evaluation/products/grid_methods.py,sha256=cdCBIy0QAwT5UIg-_V6pbbievpt5Ul0lZ-ZHrDEN79k,9744
+cloudnetpy/model_evaluation/products/advance_methods.py,sha256=rng3ZLR1Arv1AGUzq0Ehu-65628PC5LZVKpHSUpCIW8,8526
+cloudnetpy/model_evaluation/products/grid_methods.py,sha256=fRYdPRSewsXlv1frJWOKeCIYWlRAAXRRcKgvmNeBWwY,9066
 cloudnetpy/model_evaluation/products/model_products.py,sha256=SOd7dZ5lBh0ampovzJ9DryfHOC_tqFa-EN5lAQUHb3Y,6854
 cloudnetpy/model_evaluation/products/observation_products.py,sha256=ttz-NINIQCSjuyZtRn-vuctHItLT8RLtwwiNXsys-UA,5492
 cloudnetpy/model_evaluation/products/product_resampling.py,sha256=IuWvtwpya76URh1WmTTgtLxAo4HZxkz6GmftpZkMCGo,3640
@@ -82,9 +82,9 @@ cloudnetpy/model_evaluation/tests/e2e/process_lwc/__init__.py,sha256=47DEQpj8HBS
 cloudnetpy/model_evaluation/tests/e2e/process_lwc/main.py,sha256=IFcPj-Vce9Yn0CfCy9gASxRf7NzlKFMfsDHzAuapY4I,1306
 cloudnetpy/model_evaluation/tests/e2e/process_lwc/tests.py,sha256=ANBA0LVao3Xrm-prRnwUmxM6BdQzqM7GZNKB3uz5BXQ,1725
 cloudnetpy/model_evaluation/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy/model_evaluation/tests/unit/conftest.py,sha256=ZNBqkt1fvt-5jHzLaT7opM4OxvsXnx89OToWvtiRxkI,7425
-cloudnetpy/model_evaluation/tests/unit/test_advance_methods.py,sha256=GCYD-hgKttkdVKU67dsSs0YUuSxmzC1Cscm5_2Yj0KA,10809
-cloudnetpy/model_evaluation/tests/unit/test_grid_methods.py,sha256=uQRBf7akxmx3nCGZLf28nPESDEZWao06iUZqIIu1kmE,26269
+cloudnetpy/model_evaluation/tests/unit/conftest.py,sha256=WL_FgrDeoUYGp4PKjb37HLu79D9uu33PGQL40_ctqS0,7446
+cloudnetpy/model_evaluation/tests/unit/test_advance_methods.py,sha256=IkoAVtsWVFrPpFqQOLAPHKb9qgV-KjGGVEtWMudeiSo,10079
+cloudnetpy/model_evaluation/tests/unit/test_grid_methods.py,sha256=qkNPfHI25EE0-BXk73TijpeM7YwswX7e41-764o5lqE,26254
 cloudnetpy/model_evaluation/tests/unit/test_model_products.py,sha256=FRbYLshSHH2E527uJPwvUIyZKTsPFSZrwDsPsNrFSSU,3475
 cloudnetpy/model_evaluation/tests/unit/test_observation_products.py,sha256=P-W5QwRHMtem6p5SyyH7p9TvHGro3XW1baQcIwh6nFg,4892
 cloudnetpy/model_evaluation/tests/unit/test_plot_tools.py,sha256=POdypGWjV2NA4DCU7w8Unk_IdPfOpUb1qBDhfA3x1Bw,9222
@@ -93,7 +93,7 @@ cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=Ra3r4V
 cloudnetpy/model_evaluation/tests/unit/test_tools.py,sha256=Ia_VrLdV2NstX5gbx_3AZTOAlrgLAy_xFZ8fHYVX0xI,3817
 cloudnetpy/plotting/__init__.py,sha256=lg9Smn4BI0dVBgnDLC3JVJ4GmwoSnO-qoSd4ApvwV6Y,107
 cloudnetpy/plotting/plot_meta.py,sha256=cLdCZrhbP-gaobS_zjcf8d2xVALzl7zh2qpttxCHyrg,15983
-cloudnetpy/plotting/plotting.py,sha256=Qm1eQK1eTnXtHzmhxerYrKMpZTCxoOvwS8f1IxsZGaM,32428
+cloudnetpy/plotting/plotting.py,sha256=bve91iM9RcWmKaZOFWxVh2y3DPmupI1944MMYDdv17I,32459
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=0E9OUGR3uLCsS1nORwQu0SqW0_8uX7n6LlRcVhtzKw4,7845
 cloudnetpy/products/der.py,sha256=mam6jWV7A2h8V5WC3DIeFp6ou7UD1JOw9r7h2B0su-s,12403
@@ -107,8 +107,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.60.2.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.60.2.dist-info/METADATA,sha256=Em0bHeOPbyNWL1-U7VJOYbembh5hoiXss-QwU23Skw8,5784
-cloudnetpy-1.60.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-cloudnetpy-1.60.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.60.2.dist-info/RECORD,,
+cloudnetpy-1.60.4.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.60.4.dist-info/METADATA,sha256=3k80uCASgoavEpHtQM00w8S7ndKtjmqKDP0v0BoeLAw,5784
+cloudnetpy-1.60.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloudnetpy-1.60.4.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.60.4.dist-info/RECORD,,

{cloudnetpy-1.60.2.dist-info → cloudnetpy-1.60.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any