Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/SWIG_files/common/ArrayMacros.i
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@
def eval_numpy_array(self, u_arr):
return self.evalNumpy(u_arr, len(u_arr) * 3, 3).reshape(-1, 3)

def eval_derivative_numpy_array(self, u_arr, n_u):
return self.evalDerivativeNumpy(u_arr, len(u_arr) * 3, 3, n_u).reshape(-1, 3)
def eval_derivative_numpy_array(self, u_arr, n_u, n_v):
return self.evalDerivativeNumpy(u_arr, len(u_arr) * 3, 3, n_u, n_v).reshape(-1, 3)
}

};
Expand Down
30 changes: 30 additions & 0 deletions test/test_core_numpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,33 @@ def test_surface_eval():
res = u[:, None, None] * u_vec + v[None, :, None] * v_vec

assert np.all(res == arr_out)


@pytest.mark.parametrize(
"line,ndim",
(
(Geom2d_Line(gp_Pnt2d(0.0, 0.0), gp_Dir2d(1.0, 0.15)), 2),
(Geom_Line(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(1.0, 0.15, 0.0)), 3),
),
)
def test_curve_derivative_eval(line, ndim):
u = np.arange(5, dtype=float)
vectors = line.eval_derivative_numpy_array(u, 1)

gp_line = line.Lin() if isinstance(line, Geom_Line) else line.Lin2d()

direction = np.array([gp_line.Direction().Coord(i + 1) for i in range(ndim)])
assert np.all(vectors == direction)


def test_surface_derivative_eval():
n_vec = np.array([1.0, 0.15, 0.0])
u = np.arange(5, dtype=float)
v = np.arange(6, dtype=float)

plane = Geom_Plane(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(*n_vec))
uv = np.dstack(np.meshgrid(u, v, indexing="ij")).reshape(-1, 2)
arr_out = plane.eval_derivative_numpy_array(uv, 0, 1).reshape(len(u), len(v), -1)
assert np.all(arr_out @ n_vec == 0.0)
arr_out = plane.eval_derivative_numpy_array(uv, 1, 0).reshape(len(u), len(v), -1)
assert np.all(arr_out @ n_vec == 0.0)