1616import numpy as np
1717
1818from iris import load_cube
19- from iris .analysis ._area_weighted import AreaWeightedRegridder
19+ from iris .analysis ._area_weighted import (
20+ AreaWeightedRegridder ,
21+ _regrid_area_weighted_rectilinear_src_and_grid__prepare ,
22+ )
2023from iris .coord_systems import GeogCS
2124from iris .coords import DimCoord
2225from iris .cube import Cube
23- import iris .experimental .regrid as eregrid
2426
2527
2628class Test (tests .IrisTest ):
@@ -46,19 +48,17 @@ def extract_grid(self, cube):
4648 def check_mdtol (self , mdtol = None ):
4749 src_grid , target_grid = self .grids ()
4850 # Get _regrid_info result
49- _regrid_info = (
50- eregrid ._regrid_area_weighted_rectilinear_src_and_grid__prepare (
51- src_grid , target_grid
52- )
51+ _regrid_info = _regrid_area_weighted_rectilinear_src_and_grid__prepare (
52+ src_grid , target_grid
5353 )
5454 self .assertEqual (len (_regrid_info ), 10 )
5555 with mock .patch (
56- "iris.experimental.regrid ."
56+ "iris.analysis._area_weighted ."
5757 "_regrid_area_weighted_rectilinear_src_and_grid__prepare" ,
5858 return_value = _regrid_info ,
5959 ) as prepare :
6060 with mock .patch (
61- "iris.experimental.regrid ."
61+ "iris.analysis._area_weighted ."
6262 "_regrid_area_weighted_rectilinear_src_and_grid__perform" ,
6363 return_value = mock .sentinel .result ,
6464 ) as perform :
@@ -253,7 +253,6 @@ class TestLazy(tests.IrisTest):
253253 # Setup
254254 def setUp (self ) -> None :
255255 # Prepare a cube and a template
256-
257256 cube_file_path = tests .get_data_path (
258257 ["NetCDF" , "regrid" , "regrid_xyt.nc" ]
259258 )
0 commit comments