Skip to content

Commit ba1bc6c

Browse files
committed
Reduce code duplication
1 parent 4293606 commit ba1bc6c

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

parcels/_interpolation.py

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -296,28 +296,17 @@ def _linear_3d(ctx: InterpolationContext3D) -> float:
296296
@register_3d_interpolator("bgrid_velocity")
297297
def _linear_3d_bgrid_velocity(ctx: InterpolationContext3D) -> float:
298298
if ctx.gridindexingtype == "mom5":
299-
zeta = 1.0
299+
ctx.zeta = 1.0
300300
else:
301-
zeta = 0.0
302-
eta = ctx.eta
303-
xsi = ctx.xsi
304-
zdim = ctx.data.shape[1]
305-
data_3d = ctx.data[ctx.ti, :, :, :]
306-
f0, f1 = get_3d_f0_f1(eta=eta, xsi=xsi, data=data_3d, zi=ctx.zi, yi=ctx.yi, xi=ctx.xi)
307-
308-
return z_layer_interp(zeta=zeta, f0=f0, f1=f1, zi=ctx.zi, zdim=zdim, gridindexingtype=ctx.gridindexingtype)
301+
ctx.zeta = 0.0
302+
return _linear_3d(ctx)
309303

310304

311305
@register_3d_interpolator("bgrid_w_velocity")
312306
def _linear_3d_bgrid_w_velocity(ctx: InterpolationContext3D) -> float:
313-
zeta = ctx.zeta
314-
eta = 1.0
315-
xsi = 1.0
316-
zdim = ctx.data.shape[1]
317-
data_3d = ctx.data[ctx.ti, :, :, :]
318-
f0, f1 = get_3d_f0_f1(eta=eta, xsi=xsi, data=data_3d, zi=ctx.zi, yi=ctx.yi, xi=ctx.xi)
319-
320-
return z_layer_interp(zeta=zeta, f0=f0, f1=f1, zi=ctx.zi, zdim=zdim, gridindexingtype=ctx.gridindexingtype)
307+
ctx.eta = 1.0
308+
ctx.xsi = 1.0
309+
return _linear_3d(ctx)
321310

322311

323312
@register_3d_interpolator("bgrid_tracer")

0 commit comments

Comments
 (0)