diff --git a/lib/iris/tests/unit/experimental/ugrid/cf/test_CFUGridReader.py b/lib/iris/tests/unit/experimental/ugrid/cf/test_CFUGridReader.py index 8f029c1b7b..e44aee730a 100644 --- a/lib/iris/tests/unit/experimental/ugrid/cf/test_CFUGridReader.py +++ b/lib/iris/tests/unit/experimental/ugrid/cf/test_CFUGridReader.py @@ -16,8 +16,6 @@ from unittest import mock -import numpy as np - from iris.experimental.ugrid.cf import ( CFUGridAuxiliaryCoordinateVariable, CFUGridConnectivityVariable, @@ -56,17 +54,17 @@ class Test_build_cf_groups(tests.IrisTest): @classmethod def setUpClass(cls): # Replicating syntax from test_CFReader.Test_build_cf_groups__formula_terms. - cls.mesh = netcdf_ugrid_variable("mesh", "", np.int) - cls.node_x = netcdf_ugrid_variable("node_x", "node", np.float) - cls.node_y = netcdf_ugrid_variable("node_y", "node", np.float) - cls.face_x = netcdf_ugrid_variable("face_x", "face", np.float) - cls.face_y = netcdf_ugrid_variable("face_y", "face", np.float) + cls.mesh = netcdf_ugrid_variable("mesh", "", int) + cls.node_x = netcdf_ugrid_variable("node_x", "node", float) + cls.node_y = netcdf_ugrid_variable("node_y", "node", float) + cls.face_x = netcdf_ugrid_variable("face_x", "face", float) + cls.face_y = netcdf_ugrid_variable("face_y", "face", float) cls.face_nodes = netcdf_ugrid_variable( - "face_nodes", "face vertex", np.int + "face_nodes", "face vertex", int ) - cls.levels = netcdf_ugrid_variable("levels", "levels", np.int) + cls.levels = netcdf_ugrid_variable("levels", "levels", int) cls.data = netcdf_ugrid_variable( - "data", "levels face", np.float, coordinates="face_x face_y" + "data", "levels face", float, coordinates="face_x face_y" ) # Add necessary attributes for mesh recognition. diff --git a/lib/iris/tests/unit/fileformats/cf/test_CFReader.py b/lib/iris/tests/unit/fileformats/cf/test_CFReader.py index 70173bb2ac..dee28e98cc 100644 --- a/lib/iris/tests/unit/fileformats/cf/test_CFReader.py +++ b/lib/iris/tests/unit/fileformats/cf/test_CFReader.py @@ -83,13 +83,13 @@ def setUp(self): "delta", "height", np.float64, bounds="delta_bnds" ) self.delta_bnds = netcdf_variable( - "delta_bnds", "height bnds", np.float + "delta_bnds", "height bnds", np.float64 ) self.sigma = netcdf_variable( "sigma", "height", np.float64, bounds="sigma_bnds" ) self.sigma_bnds = netcdf_variable( - "sigma_bnds", "height bnds", np.float + "sigma_bnds", "height bnds", np.float64 ) self.orography = netcdf_variable("orography", "lat lon", np.float64) formula_terms = "a: delta b: sigma orog: orography" @@ -185,13 +185,13 @@ def setUp(self): "delta", "height", np.float64, bounds="delta_bnds" ) self.delta_bnds = netcdf_variable( - "delta_bnds", "height bnds", np.float + "delta_bnds", "height bnds", np.float64 ) self.sigma = netcdf_variable( "sigma", "height", np.float64, bounds="sigma_bnds" ) self.sigma_bnds = netcdf_variable( - "sigma_bnds", "height bnds", np.float + "sigma_bnds", "height bnds", np.float64 ) self.orography = netcdf_variable("orography", "lat lon", np.float64) formula_terms = "a: delta b: sigma orog: orography"