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.

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

Allow mixing of logical and physical coordinates in expressions #125

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Allow mixing of logical and physical coordinates in expressions #125

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d48d072
process argument of DiffOperator in LogicalExpr
YzzIzzY Mar 28, 2023
0190f9b
Add missing import to mapping.py
yguclu Mar 29, 2023
793d885
Merge branch 'master' into logical_n_physical-coordinates
yguclu Oct 6, 2023
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
30 changes: 14 additions & 16 deletions sympde/topology/mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from sympy import sqrt, symbols
from sympy.core.exprtools import factor_terms
from sympy.polys.polytools import parallel_poly_from_expr
from sympy.core.compatibility import is_sequence

from sympde.core import Constant
from sympde.core.basic import BasicMapping
Expand Down Expand Up @@ -895,10 +896,10 @@ def eval(cls, expr, domain, **options):
"""."""

from sympde.expr.evaluation import TerminalExpr, DomainExpression
from sympde.expr.expr import BilinearForm, LinearForm, BasicForm, Norm
from sympde.expr.expr import Integral
from sympde.expr.expr import BilinearForm, LinearForm, Norm, Integral

types = (ScalarFunction, VectorFunction, DifferentialOperator, Trace, Integral)
types = (ScalarFunction, VectorFunction, DifferentialOperator,
Trace, Integral, DiffOperator)

mapping = domain.mapping
dim = domain.dim
Expand All @@ -909,20 +910,17 @@ def eval(cls, expr, domain, **options):
ph_coords = ['x', 'y', 'z']

if not has(expr, types):
if has(expr, DiffOperator):
return cls( expr, domain, evaluate=False)
else:
syms = symbols(ph_coords[:dim])
if isinstance(mapping, InterfaceMapping):
mapping = mapping.minus
# here we assume that the two mapped domains
# are identical in the interface so we choose one of them
Ms = [mapping[i] for i in range(dim)]
expr = expr.subs(list(zip(syms, Ms)))
syms = symbols(ph_coords[:dim])
if isinstance(mapping, InterfaceMapping):
mapping = mapping.minus
# here we assume that the two mapped domains
# are identical in the interface so we choose one of them
Ms = [mapping[i] for i in range(dim)]
expr = expr.subs(list(zip(syms, Ms)))

if mapping.is_analytical:
expr = expr.subs(list(zip(Ms, mapping.expressions)))
return expr
if mapping.is_analytical:
expr = expr.subs(list(zip(Ms, mapping.expressions)))
return expr

if isinstance(expr, Symbol) and expr.name in l_coords:
return expr
Expand Down
Loading