[WIP] Implement 1D to ND interpolation

xarray/tests/test_interp.py

@@ -662,3 +662,68 @@ def test_datetime_interp_noerror():
         coords={"time": pd.date_range("01-01-2001", periods=50, freq="H")},
     )
     a.interp(x=xi, time=xi.time)  # should not raise an error
+
+
+def interp_1d(data, dim, vals):
+    selectors = {dim: vals}
+
+    old_coord = data[dim]
+
+    lower = data.sel(**selectors, method='ffill')
+    upper = data.sel(**selectors, method='bfill')
+    lower_x = data[dim].sel(**selectors, method='ffill')
+    upper_x = data[dim].sel(**selectors, method='bfill')
+    weight = np.abs(vals - lower_x)/np.abs(upper_x-lower_x)
+    # needed if upper and lower coordinates are identical
+    weight = weight.fillna(1.0)
+    ans = lower * (1-weight) + upper * weight
+    return ans
+
+
+def interp_nd(data, coords):
+    for dim in coords:
+        data = interp_1d(data, dim, coords[dim])
+    return data
+
+
+def test_interp_nd():
+    assert False
+
+
+@pytest.mark.parametrize('dim',[
+    'x', 'y'
+])
+def test_new_interp(dim):
+
+    data = xr.DataArray(np.arange(10), dims=[dim]).assign_coords({dim: np.arange(10)})
+    new_x = xr.DataArray(np.arange(9) + .5, dims=['xp'])
+    ans = interp_1d(data, dim, new_x)
+    np.testing.assert_allclose(new_x, ans.values)
+
+
+def test_interp_1d_nd_targ():
+    data = xr.DataArray(np.arange(10), dims=['x'], coords={'x': np.arange(10)})
+    new_x_2d = xr.DataArray(np.tile(np.r_[:9] + .5, (3, 1)), dims=['y', 'xp'])
+    ans = interp_1d(data, 'x', new_x_2d)
+    np.testing.assert_allclose(new_x_2d, ans.values)
+
+
+def test_interp_1d_nd_targ():
+    # interp with actual coords should be an isel.
+    data = xr.DataArray(np.arange(10), dims=['x'], coords={'x': np.arange(10)})
+    new_x_2d = xr.DataArray(np.tile(np.r_[:9], (3, 1)), dims=['y', 'xp'])
+    ans = interp_1d(data, 'x', new_x_2d)
+    np.testing.assert_allclose(new_x_2d, ans.values)
+
+def test_sel_nd():
+    npdata = np.tile(np.arange(10), (5, 1))
+    data = xr.DataArray(npdata, dims=['y', 'x'],
+                        coords={'x': np.r_[:10], 'y': np.r_[:5]})
+    idx = xr.DataArray(npdata, dims=['z', 'xp'])
+
+    ans = data.sel(x=idx)
+    assert set(ans.dims) == {'z', 'y', 'xp'}
+    print(ans)
+
+
+