|
16 | 16 | parcelsv4 = True |
17 | 17 | try: |
18 | 18 | import xgcm |
19 | | - from parcels.xgrid import _XGRID_AXES |
20 | | - from parcels.application_kernels.interpolation import XLinear |
| 19 | + from parcels.interpolators import XLinear |
21 | 20 | except ImportError: |
22 | 21 | parcelsv4 = False |
23 | 22 |
|
@@ -76,7 +75,7 @@ def run_benchmark(interpolator: str, trace_memory: bool = False, surface_simulat |
76 | 75 | coords["Z"] = {"center": "deptht", "left": "depth"} |
77 | 76 | print(ds) |
78 | 77 |
|
79 | | - grid = parcels.xgrid.XGrid(xgcm.Grid(ds, coords=coords, autoparse_metadata=False, periodic=False), mesh="spherical") |
| 78 | + grid = parcels._core.xgrid.XGrid(xgcm.Grid(ds, coords=coords, autoparse_metadata=False, periodic=False), mesh="spherical") |
80 | 79 |
|
81 | 80 | U = parcels.Field("U", ds["U"], grid, interp_method=interp_method) |
82 | 81 | V = parcels.Field("V", ds["V"], grid, interp_method=interp_method) |
@@ -127,7 +126,7 @@ def run_benchmark(interpolator: str, trace_memory: bool = False, surface_simulat |
127 | 126 | else: |
128 | 127 | start = time.time() |
129 | 128 |
|
130 | | - pset.execute(parcels.AdvectionEE, runtime=runtime, dt=dt, verbose_progress=False) |
| 129 | + pset.execute(parcels.kernels.AdvectionEE, runtime=runtime, dt=dt, verbose_progress=False) |
131 | 130 |
|
132 | 131 | if trace_memory: |
133 | 132 | current, peak = tracemalloc.get_traced_memory() |
|
0 commit comments