From 24190035636144cf4da5db287f6df1c301f1da06 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 25 Aug 2020 23:29:22 -0500
Subject: [PATCH] Require explicit kw labeling of TracePair constructor int/ext
arguments
---
examples/wave/wave-eager-mpi.py | 2 +-
examples/wave/wave-eager-var-velocity.py | 2 +-
examples/wave/wave-eager.py | 2 +-
grudge/eager.py | 2 +-
grudge/symbolic/primitives.py | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/examples/wave/wave-eager-mpi.py b/examples/wave/wave-eager-mpi.py
index 40ddbb7b..a2c9b14b 100644
--- a/examples/wave/wave-eager-mpi.py
+++ b/examples/wave/wave-eager-mpi.py
@@ -87,7 +87,7 @@ def wave_operator(discr, c, w):
discr.face_mass(
wave_flux(discr, c=c, w_tpair=interior_trace_pair(discr, w))
+ wave_flux(discr, c=c, w_tpair=TracePair(
- BTAG_ALL, dir_bval, dir_bc))
+ BTAG_ALL, interior=dir_bval, exterior=dir_bc))
+ sum(
wave_flux(discr, c=c, w_tpair=tpair)
for tpair in cross_rank_trace_pairs(discr, w))
diff --git a/examples/wave/wave-eager-var-velocity.py b/examples/wave/wave-eager-var-velocity.py
index 9ac8a4c4..741d38ec 100644
--- a/examples/wave/wave-eager-var-velocity.py
+++ b/examples/wave/wave-eager-var-velocity.py
@@ -102,7 +102,7 @@ def wave_operator(discr, c, w):
dd_allfaces_quad,
wave_flux(discr, c=c, w_tpair=interior_trace_pair(discr, w))
+ wave_flux(discr, c=c, w_tpair=TracePair(
- BTAG_ALL, dir_bval, dir_bc))
+ BTAG_ALL, interior=dir_bval, exterior=dir_bc))
))
)
diff --git a/examples/wave/wave-eager.py b/examples/wave/wave-eager.py
index 52ab0824..a7b11fbe 100644
--- a/examples/wave/wave-eager.py
+++ b/examples/wave/wave-eager.py
@@ -85,7 +85,7 @@ def wave_operator(discr, c, w):
discr.face_mass(
wave_flux(discr, c=c, w_tpair=interior_trace_pair(discr, w))
+ wave_flux(discr, c=c, w_tpair=TracePair(
- BTAG_ALL, dir_bval, dir_bc))
+ BTAG_ALL, interior=dir_bval, exterior=dir_bc))
))
)
diff --git a/grudge/eager.py b/grudge/eager.py
index 4cff62c5..3cf9368e 100644
--- a/grudge/eager.py
+++ b/grudge/eager.py
@@ -354,7 +354,7 @@ def interior_trace_pair(discrwb, vec):
lambda el: discrwb.opposite_face_connection()(el),
i)
- return TracePair("int_faces", i, e)
+ return TracePair("int_faces", interior=i, exterior=e)
# {{{ distributed-memory functionality
diff --git a/grudge/symbolic/primitives.py b/grudge/symbolic/primitives.py
index 1daf063a..53768658 100644
--- a/grudge/symbolic/primitives.py
+++ b/grudge/symbolic/primitives.py
@@ -690,7 +690,7 @@ class TracePair:
an expression representing the exterior value to
be used for the flux.
"""
- def __init__(self, dd, interior, exterior):
+ def __init__(self, dd, *, interior, exterior):
"""
"""
@@ -734,7 +734,7 @@ def int_tpair(expression, qtag=None):
else:
q_dd = "int_faces"
- return TracePair(q_dd, i, e)
+ return TracePair(q_dd, interior=i, exterior=e)
def bdry_tpair(dd, interior, exterior):
@@ -746,7 +746,7 @@ def bdry_tpair(dd, interior, exterior):
representing the exterior value to be used
for the flux.
"""
- return TracePair(dd, interior, exterior)
+ return TracePair(dd, interior=interior, exterior=exterior)
def bv_tpair(dd, interior, exterior):
@@ -760,7 +760,7 @@ def bv_tpair(dd, interior, exterior):
"""
from grudge.symbolic.operators import project
interior = cse(project("vol", dd)(interior))
- return TracePair(dd, interior, exterior)
+ return TracePair(dd, interior=interior, exterior=exterior)
# }}}
--
GitLab