Skip to content

Commit 76660ef

Browse files
committed
fix upper case func and var names for flake
1 parent f667ef9 commit 76660ef

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

tests/unit/preprocessor/_regrid/test_extract_levels.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@ def test_fx_extraction(self):
9696
var_name='volcello',
9797
units='m3',
9898
measure='volume')
99-
ancillary_2D = iris.coords.AncillaryVariable(
99+
ancillary_2d = iris.coords.AncillaryVariable(
100100
area_data,
101101
standard_name='land_area_fraction',
102102
var_name='sftlf',
103103
units='%')
104-
ancillary_3D = iris.coords.AncillaryVariable(
104+
ancillary_3d = iris.coords.AncillaryVariable(
105105
volume_data,
106106
standard_name='height_above_reference_ellipsoid',
107107
var_name='zfull',
108108
units='m')
109109
self.cube.add_cell_measure(area_measure, (1, 2))
110110
self.cube.add_cell_measure(volume_measure, (0, 1, 2))
111-
self.cube.add_ancillary_variable(ancillary_2D, (1, 2))
112-
self.cube.add_ancillary_variable(ancillary_3D, (0, 1, 2))
111+
self.cube.add_ancillary_variable(ancillary_2d, (1, 2))
112+
self.cube.add_ancillary_variable(ancillary_3d, (0, 1, 2))
113113

114114
result = extract_levels(self.cube, levels, 'linear')
115115

@@ -123,9 +123,9 @@ def test_fx_extraction(self):
123123
coord = self.cube.coord('air_pressure').copy()
124124
expected.add_dim_coord(coord[levels], 0)
125125
expected.add_cell_measure(area_measure, (1, 2))
126-
expected.add_ancillary_variable(ancillary_2D, (1, 2))
126+
expected.add_ancillary_variable(ancillary_2d, (1, 2))
127127
expected.add_cell_measure(volume_measure[0:2, ...], (0, 1, 2))
128-
expected.add_ancillary_variable(ancillary_3D[0:2, ...], (0, 1, 2))
128+
expected.add_ancillary_variable(ancillary_3d[0:2, ...], (0, 1, 2))
129129

130130
self.assertEqual(result, expected)
131131

@@ -168,61 +168,61 @@ def test_interpolation(self):
168168
# Check the _create_cube kwargs ...
169169
self.assertEqual(kwargs, dict())
170170

171-
def test_preserve_2D_fx_interpolation(self):
171+
def test_preserve_2d_fx_interpolation(self):
172172
area_data = np.ones((2, 1))
173173
area_measure = iris.coords.CellMeasure(area_data,
174174
standard_name='cell_area',
175175
var_name='areacella',
176176
units='m2',
177177
measure='area')
178-
ancillary_2D = iris.coords.AncillaryVariable(
178+
ancillary_2d = iris.coords.AncillaryVariable(
179179
area_data,
180180
standard_name='land_area_fraction',
181181
var_name='sftlf',
182182
units='%')
183183
self.cube.add_cell_measure(area_measure, (1, 2))
184-
self.cube.add_ancillary_variable(ancillary_2D, (1, 2))
184+
self.cube.add_ancillary_variable(ancillary_2d, (1, 2))
185185
result_data = np.array([0, 1, 4, 5], dtype=self.dtype).reshape(2, 2, 1)
186186
result = _make_cube(result_data)
187187
_preserve_fx_vars(self.cube, result)
188188
self.assertEqual(self.cube.cell_measures(), result.cell_measures())
189189
self.assertEqual(self.cube.ancillary_variables(),
190190
result.ancillary_variables())
191191

192-
def test_preserve_2D_fx_interpolation_single_level(self):
192+
def test_preserve_2d_fx_interpolation_single_level(self):
193193
result = self.cube[0, :, :]
194194
area_data = np.ones((2, 1))
195195
area_measure = iris.coords.CellMeasure(area_data,
196196
standard_name='cell_area',
197197
var_name='areacella',
198198
units='m2',
199199
measure='area')
200-
ancillary_2D = iris.coords.AncillaryVariable(
200+
ancillary_2d = iris.coords.AncillaryVariable(
201201
area_data,
202202
standard_name='land_area_fraction',
203203
var_name='sftlf',
204204
units='%')
205205
self.cube.add_cell_measure(area_measure, (1, 2))
206-
self.cube.add_ancillary_variable(ancillary_2D, (1, 2))
206+
self.cube.add_ancillary_variable(ancillary_2d, (1, 2))
207207
_preserve_fx_vars(self.cube, result)
208208
self.assertEqual(self.cube.cell_measures(), result.cell_measures())
209209
self.assertEqual(self.cube.ancillary_variables(),
210210
result.ancillary_variables())
211211

212-
def test_do_not_preserve_3D_fx_interpolation(self):
212+
def test_do_not_preserve_3d_fx_interpolation(self):
213213
volume_data = np.ones(self.shape)
214214
volume_measure = iris.coords.CellMeasure(volume_data,
215215
standard_name='ocean_volume',
216216
var_name='volcello',
217217
units='m3',
218218
measure='volume')
219-
ancillary_3D = iris.coords.AncillaryVariable(
219+
ancillary_3d = iris.coords.AncillaryVariable(
220220
volume_data,
221221
standard_name='height_above_reference_ellipsoid',
222222
var_name='zfull',
223223
units='m')
224224
self.cube.add_cell_measure(volume_measure, (0, 1, 2))
225-
self.cube.add_ancillary_variable(ancillary_3D, (0, 1, 2))
225+
self.cube.add_ancillary_variable(ancillary_3d, (0, 1, 2))
226226
result_data = np.array([0, 1, 4, 5], dtype=self.dtype).reshape(2, 2, 1)
227227
result = _make_cube(result_data)
228228
with self.assertLogs(level='WARNING') as cm:

0 commit comments

Comments
 (0)