Skip to content

Improve compute_extrema to cover 1D and simplify logic #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorgensd merged 2 commits into from
May 26, 2026
+9 −8
Merged

Improve compute_extrema to cover 1D and simplify logic #220

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a72c49
Extend extrema to 1D and simplify if-test
jorgensd May 26, 2026
3c71e72
Simplify if-else with is in
jorgensd May 26, 2026
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
17 changes: 9 additions & 8 deletions src/scifem/eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,18 +209,19 @@ def eval_dJ(x_ref):
# In SciPy, 'ineq' means the function must be >= 0.
# So, x + y <= 1 becomes 1 - x - y >= 0.
cell_type = mesh.topology.cell_type
if cell_type == dolfinx.mesh.CellType.triangle:
if cell_type in (dolfinx.mesh.CellType.triangle, dolfinx.mesh.CellType.tetrahedron):
method = method or "SLSQP"
constraint = {"type": "ineq", "fun": lambda x: 1.0 - x[0] - x[1]}
elif (
cell_type == dolfinx.mesh.CellType.quadrilateral
or cell_type == dolfinx.mesh.CellType.hexahedron
constraint = {
"type": "ineq",
"fun": lambda x: 1.0 - sum(x[i] for i in range(mesh.topology.dim)),
}
elif cell_type in (
dolfinx.mesh.CellType.interval,
dolfinx.mesh.CellType.quadrilateral,
dolfinx.mesh.CellType.hexahedron,
):
method = method or "L-BFGS-B"
constraint = {}
elif cell_type == dolfinx.mesh.CellType.tetrahedron:
method = method or "SLSQP"
constraint = {"type": "ineq", "fun": lambda x: 1.0 - x[0] - x[1] - x[2]}
else:
raise RuntimeError(f"Unsupported {cell_type=}")

Expand Down
Loading