Skip to content
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.

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

Fix dispatching issues with get_basis on cartesian coordinates #294

Merged
merged 1 commit into from
Jun 18, 2024
Merged
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
12 changes: 9 additions & 3 deletions dedalus/core/operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -3415,8 +3415,8 @@ class CartesianDivergence(Divergence):
@classmethod
def _preprocess_args(cls, operand, index=0, out=None):
coordsys = operand.tensorsig[index]
if operand.domain.get_basis(coordsys) is None:
raise SkipDispatchException(output=0)
if not any([operand.domain.get_basis(cs) for cs in coordsys.coords]):
raise SkipDispatchException(output=0)
return [operand], {'index': index, 'out': out}

def __init__(self, operand, index=0, out=None):
Expand Down Expand Up @@ -3964,7 +3964,13 @@ def _preprocess_args(cls, operand, coordsys=None, out=None):
coordsys = operand.dist.single_coordsys
if coordsys is False:
raise ValueError("coordsys must be specified.")
elif not isinstance(coordsys, coords.DirectProduct) and operand.domain.get_basis(coordsys) is None:
elif isinstance(coordsys, coords.DirectProduct):
if not any([operand.domain.get_basis(cs) for cs in coordsys.coordsystems]):
raise SkipDispatchException(output=0)
elif isinstance(coordsys, coords.CartesianCoordinates):
if not any([operand.domain.get_basis(cs) for cs in coordsys.coords]):
raise SkipDispatchException(output=0)
elif operand.domain.get_basis(coordsys) is None:
raise SkipDispatchException(output=0)
return [operand, coordsys], {'out': out}

Expand Down