Skip to content

Commit

Permalink
Fix params left over from merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
f0uriest committed Jul 10, 2024
1 parent 375d87e commit 986f529
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions desc/compute/_curve.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ def _x_SplineXYZCurve(params, transforms, profiles, data, **kwargs):
units_long="meters",
description="Position vector along curve, first derivative",
dim=3,
params=["X", "Y", "Z", "knots", "rotmat"],
params=["X", "Y", "Z", "rotmat"],
transforms={"knots": []},
profiles=[],
coordinates="s",
Expand Down Expand Up @@ -673,7 +673,7 @@ def _x_s_SplineXYZCurve(params, transforms, profiles, data, **kwargs):
units_long="meters",
description="Position vector along curve, second derivative",
dim=3,
params=["X", "Y", "Z", "rotmat", "shift"],
params=["X", "Y", "Z", "rotmat"],
transforms={"knots": []},
profiles=[],
coordinates="s",
Expand Down Expand Up @@ -721,7 +721,7 @@ def _x_ss_SplineXYZCurve(params, transforms, profiles, data, **kwargs):
units_long="meters",
description="Position vector along curve, third derivative",
dim=3,
params=["X", "Y", "Z", "rotmat", "shift"],
params=["X", "Y", "Z", "rotmat"],
transforms={"knots": []},
profiles=[],
coordinates="s",
Expand Down

0 comments on commit 986f529

Please sign in to comment.