Skip to content

conditions: Improve robustness of derivative parsing #29

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
EdCaunt merged 2 commits into from
Apr 22, 2024
Merged

conditions: Improve robustness of derivative parsing #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e8776a
conditions: Improve robustness of derivative parsing
EdCaunt Apr 19, 2024
b862428
tests: Add tests for various derivative specifications in BCs
EdCaunt Apr 22, 2024
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
18 changes: 12 additions & 6 deletions schism/conditions/boundary_conditions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,19 @@ def sub_basis(self, basis_map):
except KeyError:
# Should never end up here
raise ValueError("No basis generated for required function")
if type(deriv.deriv_order) != dv.types.utils.DimensionTuple:
d_o = (deriv.deriv_order,)

if type(deriv.deriv_order) is int:
# Derivative taken wrt single dimension.
b_derivs = [(deriv.dims[0], deriv.deriv_order)]
else:
d_o = deriv.deriv_order
# Derivs to take of the basis
b_derivs = tuple([(deriv.dims[i], d_o[i])
for i in range(len(deriv.dims))])
d_order = tuple(o for o in deriv.deriv_order if o != 0)
if len(deriv.dims) != len(d_order):
raise ValueError("Derivatives specified as"
" Derivative(f, x, x) are not compatible"
" with Schism. Use the"
" Derivative(f, (x, 2)) or f.dx2"
" conventions instead")
b_derivs = [(d, o) for d, o in zip(deriv.dims, d_order)]
reps[deriv] = basis.deriv(b_derivs)
return sp.simplify(self._mod_lhs.subs(reps))

Expand Down
12 changes: 11 additions & 1 deletion tests/test_boundary_conditions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,19 @@ def test_derivative_dims(self, bc, ans):
'x**2*d_f_2d(2, 0)/2 + x*y*d_f_2d(1, 1) '
+ '+ x*d_f_2d(1, 0) + y**2*d_f_2d(0, 2)/2 '
+ '+ y*d_f_2d(0, 1) + d_f_2d(0, 0)'),
(dv.Eq(dv.Derivative(f, x, y), 0), {f: basisf2D},
'd_f_2d(1, 1)'),
(dv.Eq(dv.Derivative(f, y, x), 0), {f: basisf2D},
'd_f_2d(1, 1)'),
(dv.Eq(dv.Derivative(f, (x, 1), (y, 1)), 0),
{f: basisf2D},
'd_f_2d(1, 1)'),
(dv.Eq(f.laplace, 0), {f: basisf2D},
'd_f_2d(0, 2) + d_f_2d(2, 0)'),
(dv.Eq(dv.Derivative(f, (x, 2))
+ dv.Derivative(f, (y, 2)), 0),
{f: basisf2D},
'd_f_2d(0, 2) + d_f_2d(2, 0)'),
(dv.Eq(dv.div(v), 0),
{v[0]: basisvx, v[1]: basisvy},
'x*d_vx(2, 0) + x*d_vy(1, 1) + y*d_vx(1, 1) '
Expand Down Expand Up @@ -215,7 +226,6 @@ def test_basis_substitution(self, bc, basis_map, ans):
"""
condition = SingleCondition(bc)
expr = condition.sub_basis(basis_map)
print(expr)
assert str(expr) == ans

@pytest.mark.parametrize('bc, funcs',
Expand Down