cloudnetpy 1.49.9__py3-none-any.whl → 1.87.3__py3-none-any.whl

cloudnetpy/model_evaluation/tests/e2e/process_cf/main.py

@@ -15,11 +15,15 @@ test_file_model = (
 test_file_product = f"{ROOT_PATH}/cloudnetpy/model_evaluation/tests/data/20190517_mace-head_categorize.nc"
 
 
-def _process():
+def _process() -> None:
     tmp_dir = TemporaryDirectory()
     temp_file = f"{tmp_dir.name}/xx.nc"
     product_resampling.process_L3_day_product(
-        "ecmwf", "cf", [test_file_model], test_file_product, temp_file
+        "ecmwf",
+        "cf",
+        [test_file_model],
+        test_file_product,
+        temp_file,
     )
     try:
         subprocess.call(
@@ -29,20 +33,20 @@ def _process():
                 f"{SCRIPT_PATH}/tests.py",
                 "--full_path",
                 temp_file,
-            ]
+            ],
         )
     except subprocess.CalledProcessError:
         raise
     tmp_dir.cleanup()
 
 
-def main():
+def main() -> None:
     _process()
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description="Model evaluation Cloud fraction processing e2e test."
+        description="Model evaluation Cloud fraction processing e2e test.",
     )
     ARGS = parser.parse_args()
     main()

cloudnetpy/model_evaluation/tests/e2e/process_cf/tests.py

@@ -6,18 +6,18 @@ class TestCloudFractionProcessing:
     product = "cf"
 
     @pytest.fixture(autouse=True)
-    def _fetch_params(self, params):
+    def _fetch_params(self, params) -> None:
         self.full_path = params["full_path"]
 
-    @pytest.mark.reprocess
-    def test_that_has_correct_attributes(self):
+    @pytest.mark.reprocess()
+    def test_that_has_correct_attributes(self) -> None:
         nc = netCDF4.Dataset(self.full_path)
         assert nc.location == "Mace-Head"
         assert nc.year == "2019"
         assert nc.month == "05"
         assert nc.day == "17"
         assert nc.title == "Downsampled Cf of ecmwf from Mace-Head"
-        assert nc.cloudnet_file_type == "cf_ecmwf"
+        assert nc.cloudnet_file_type == "l3-cf"
         assert nc.Conventions == "CF-1.8"
         assert (
             nc.source
@@ -25,31 +25,32 @@ class TestCloudFractionProcessing:
         )
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
-        "key", ["cf_V_ecmwf", "cf_A_ecmwf", "cf_V_adv_ecmwf", "cf_A_adv_ecmwf"]
+        "key",
+        ["cf_V_ecmwf", "cf_A_ecmwf", "cf_V_adv_ecmwf", "cf_A_adv_ecmwf"],
     )
-    def test_that_has_correct_product_variables(self, key):
+    def test_that_has_correct_product_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
         "key",
         ["time", "level", "latitude", "longitude", "horizontal_resolution"],
     )
-    def test_that_has_correct_model_variables(self, key):
+    def test_that_has_correct_model_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
         "key",
         ["ecmwf_forecast_time", "ecmwf_height", "ecmwf_cf", "ecmwf_cf_cirrus"],
     )
-    def test_that_has_correct_cycle_variables(self, key):
+    def test_that_has_correct_cycle_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()

cloudnetpy/model_evaluation/tests/e2e/process_iwc/main.py

@@ -19,11 +19,15 @@ test_file_model = (
 test_file_product = f"{ROOT_PATH}/cloudnetpy/model_evaluation/tests/data/20190517_mace-head_iwc-Z-T-method.nc"
 
 
-def _process():
+def _process() -> None:
     tmp_dir = TemporaryDirectory()
     temp_file = f"{tmp_dir.name}/xx.nc"
     product_resampling.process_L3_day_product(
-        "ecmwf", "iwc", [test_file_model], test_file_product, temp_file
+        "ecmwf",
+        "iwc",
+        [test_file_model],
+        test_file_product,
+        temp_file,
     )
     try:
         subprocess.call(
@@ -33,20 +37,20 @@ def _process():
                 f"{SCRIPT_PATH}/tests.py",
                 "--full_path",
                 temp_file,
-            ]
+            ],
         )
     except subprocess.CalledProcessError:
         raise
     tmp_dir.cleanup()
 
 
-def main():
+def main() -> None:
     _process()
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description="Model evaluation Ice water content processing e2e test."
+        description="Model evaluation Ice water content processing e2e test.",
     )
     ARGS = parser.parse_args()
     main()

cloudnetpy/model_evaluation/tests/e2e/process_iwc/tests.py

@@ -6,18 +6,18 @@ class TestCloudFractionProcessing:
     product = "iwc"
 
     @pytest.fixture(autouse=True)
-    def _fetch_params(self, params):
+    def _fetch_params(self, params) -> None:
         self.full_path = params["full_path"]
 
-    @pytest.mark.reprocess
-    def test_that_has_correct_attributes(self):
+    @pytest.mark.reprocess()
+    def test_that_has_correct_attributes(self) -> None:
         nc = netCDF4.Dataset(self.full_path)
         assert nc.location == "Mace-Head"
         assert nc.year == "2019"
         assert nc.month == "05"
         assert nc.day == "17"
         assert nc.title == "Downsampled Iwc of ecmwf from Mace-Head"
-        assert nc.cloudnet_file_type == "iwc_ecmwf"
+        assert nc.cloudnet_file_type == "l3-iwc"
         assert nc.Conventions == "CF-1.8"
         assert (
             nc.source
@@ -25,7 +25,7 @@ class TestCloudFractionProcessing:
         )
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
         "key",
         [
@@ -37,26 +37,27 @@ class TestCloudFractionProcessing:
             "iwc_rain_adv_ecmwf",
         ],
     )
-    def test_that_has_correct_product_variables(self, key):
+    def test_that_has_correct_product_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
         "key",
         ["time", "level", "latitude", "longitude", "horizontal_resolution"],
     )
-    def test_that_has_correct_model_variables(self, key):
+    def test_that_has_correct_model_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
-        "key", ["ecmwf_forecast_time", "ecmwf_height", "ecmwf_iwc"]
+        "key",
+        ["ecmwf_forecast_time", "ecmwf_height", "ecmwf_iwc"],
     )
-    def test_that_has_correct_cycle_variables(self, key):
+    def test_that_has_correct_cycle_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()

cloudnetpy/model_evaluation/tests/e2e/process_lwc/main.py

@@ -15,11 +15,15 @@ test_file_model = (
 test_file_product = f"{ROOT_PATH}/cloudnetpy/model_evaluation/tests/data/20190517_mace-head_lwc-scaled-adiabatic.nc"
 
 
-def _process():
+def _process() -> None:
     tmp_dir = TemporaryDirectory()
     temp_file = f"{tmp_dir.name}/xx.nc"
     product_resampling.process_L3_day_product(
-        "ecmwf", "lwc", [test_file_model], test_file_product, temp_file
+        "ecmwf",
+        "lwc",
+        [test_file_model],
+        test_file_product,
+        temp_file,
     )
     try:
         subprocess.call(
@@ -29,20 +33,20 @@ def _process():
                 f"{SCRIPT_PATH}/tests.py",
                 "--full_path",
                 temp_file,
-            ]
+            ],
         )
     except subprocess.CalledProcessError:
         raise
     tmp_dir.cleanup()
 
 
-def main():
+def main() -> None:
     _process()
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description="Model evaluation liquid water content processing e2e test."
+        description="Model evaluation liquid water content processing e2e test.",
     )
     ARGS = parser.parse_args()
     main()

cloudnetpy/model_evaluation/tests/e2e/process_lwc/tests.py

@@ -6,18 +6,18 @@ class TestCloudFractionProcessing:
     product = "lwc"
 
     @pytest.fixture(autouse=True)
-    def _fetch_params(self, params):
+    def _fetch_params(self, params) -> None:
         self.full_path = params["full_path"]
 
-    @pytest.mark.reprocess
-    def test_that_has_correct_attributes(self):
+    @pytest.mark.reprocess()
+    def test_that_has_correct_attributes(self) -> None:
         nc = netCDF4.Dataset(self.full_path)
         assert nc.location == "Mace-Head"
         assert nc.year == "2019"
         assert nc.month == "05"
         assert nc.day == "17"
         assert nc.title == "Downsampled Lwc of ecmwf from Mace-Head"
-        assert nc.cloudnet_file_type == "lwc_ecmwf"
+        assert nc.cloudnet_file_type == "l3-lwc"
         assert nc.Conventions == "CF-1.8"
         assert (
             nc.source
@@ -25,28 +25,29 @@ class TestCloudFractionProcessing:
         )
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize("key", ["lwc_ecmwf", "lwc_adv_ecmwf"])
-    def test_that_has_correct_product_variables(self, key):
+    def test_that_has_correct_product_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
         "key",
         ["time", "level", "latitude", "longitude", "horizontal_resolution"],
     )
-    def test_that_has_correct_model_variables(self, key):
+    def test_that_has_correct_model_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()
 
-    @pytest.mark.reprocess
+    @pytest.mark.reprocess()
     @pytest.mark.parametrize(
-        "key", ["ecmwf_forecast_time", "ecmwf_height", "ecmwf_lwc"]
+        "key",
+        ["ecmwf_forecast_time", "ecmwf_height", "ecmwf_lwc"],
     )
-    def test_that_has_correct_cycle_variables(self, key):
+    def test_that_has_correct_cycle_variables(self, key) -> None:
         nc = netCDF4.Dataset(self.full_path)
-        assert key in nc.variables.keys()
+        assert key in nc.variables
         nc.close()

cloudnetpy/model_evaluation/tests/unit/conftest.py

@@ -3,10 +3,11 @@ from datetime import date
 import netCDF4
 import numpy as np
 import pytest
+from numpy import ma
 
 
 @pytest.fixture(scope="session")
-def file_metadata():
+def file_metadata() -> dict:
     year, month, day = "2019", "05", "23"
     return {
         "year": year,
@@ -19,7 +20,7 @@ def file_metadata():
 
 
 @pytest.fixture(scope="session")
-def model_file(tmpdir_factory, file_metadata):
+def model_file(tmpdir_factory, file_metadata) -> str:
     file_name = tmpdir_factory.mktemp("data").join("file.nc")
     root_grp = netCDF4.Dataset(file_name, "w", format="NETCDF4_CLASSIC")
     time = 3
@@ -28,7 +29,7 @@ def model_file(tmpdir_factory, file_metadata):
     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,30 +39,30 @@ def model_file(tmpdir_factory, file_metadata):
     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
 
 
 @pytest.fixture(scope="session")
-def obs_file(tmpdir_factory, file_metadata):
+def obs_file(tmpdir_factory, file_metadata) -> str:
     file_name = tmpdir_factory.mktemp("data").join("file.nc")
     root_grp = netCDF4.Dataset(file_name, "w", format="NETCDF4_CLASSIC")
     time = 6
@@ -70,9 +71,9 @@ def obs_file(tmpdir_factory, file_metadata):
     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):
     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],
@@ -96,10 +97,10 @@ def obs_file(tmpdir_factory, file_metadata):
             [4, 4, 0, 1],
             [0, 8, 16, 16],
             [32, 2, 8, 32],
-        ]
+        ],
     )
     var = root_grp.createVariable("quality_bits", "i4", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [0, 1, 2, 4],
             [8, 16, 32, 16],
@@ -107,10 +108,10 @@ def obs_file(tmpdir_factory, file_metadata):
             [0, 1, 2, 4],
             [8, 16, 32, 16],
             [8, 4, 2, 1],
-        ]
+        ],
     )
     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],
@@ -118,10 +119,10 @@ def obs_file(tmpdir_factory, file_metadata):
             [0.01, 0.02, 0.06, 0.01],
             [0.02, 0.06, 0.00, 0.03],
             [0.08, 0.00, 0.03, 0.08],
-        ]
+        ],
     )
     var = root_grp.createVariable("iwc_retrieval_status", "f8", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [1, 2, 6, 1],
             [2, 6, 5, 3],
@@ -129,10 +130,10 @@ def obs_file(tmpdir_factory, file_metadata):
             [1, 2, 6, 7],
             [4, 6, 5, 3],
             [7, 5, 3, 4],
-        ]
+        ],
     )
     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],
@@ -140,10 +141,10 @@ def obs_file(tmpdir_factory, file_metadata):
             [0.08, 0.04, 0.01, 0.08],
             [0.04, 0.01, 0.09, 0.07],
             [0.02, 0.09, 0.07, 0.02],
-        ]
+        ],
     )
     var = root_grp.createVariable("data", "i4", ("time", "height"))
-    var[:] = np.array(
+    var[:] = ma.array(
         [
             [2, 4, 3, 6],
             [7, 1, 9, 7],
@@ -151,14 +152,14 @@ def obs_file(tmpdir_factory, file_metadata):
             [3, 5, 1, 0],
             [2, 5, 6, 1],
             [2, 9, 7, 2],
-        ]
+        ],
     )
     root_grp.close()
     return file_name
 
 
 @pytest.fixture(scope="session")
-def regrid_file(tmpdir_factory, file_metadata):
+def regrid_file(tmpdir_factory, file_metadata) -> str:
     file_name = tmpdir_factory.mktemp("data").join("file.nc")
     root_grp = netCDF4.Dataset(file_name, "w", format="NETCDF4_CLASSIC")
     time = 3
@@ -167,7 +168,7 @@ def regrid_file(tmpdir_factory, file_metadata):
     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,27 +178,27 @@ def regrid_file(tmpdir_factory, file_metadata):
     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
 
 
-def _create_global_attributes(root_grp, meta):
+def _create_global_attributes(root_grp, meta) -> None:
     for key in ("year", "month", "day", "location"):
         setattr(root_grp, key, meta[key])