From c7495a07e606c0872b8026affbc8a5819196b863 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 5 Jan 2016 20:08:45 -0600
Subject: [PATCH] Hook up interpolation and opposite-swap execution
---
grudge/discretization.py | 17 ++++-
grudge/execution.py | 134 +++++++++++++++------------------------
2 files changed, 67 insertions(+), 84 deletions(-)
diff --git a/grudge/discretization.py b/grudge/discretization.py
index c992e471..e9e123e2 100644
--- a/grudge/discretization.py
+++ b/grudge/discretization.py
@@ -116,12 +116,24 @@ class Discretization(object):
def interior_faces_discr(self, quadrature_tag=None):
return self.interior_faces_connection(quadrature_tag).to_discr
+ @memoize_method
+ def opposite_face_connection(self, quadrature_tag):
+ if quadrature_tag is not sym.QTAG_NONE:
+ # FIXME
+ raise NotImplementedError("quadrature")
+
+ from meshmode.discretization.connection import \
+ make_opposite_face_connection
+
+ return make_opposite_face_connection(
+ self.interior_faces_connection(quadrature_tag))
+
# }}}
# {{{ all-faces
@memoize_method
- def all_faces_discr(self, quadrature_tag=None):
+ def all_faces_volume_connection(self, quadrature_tag=None):
if quadrature_tag is not sym.QTAG_NONE:
# FIXME
raise NotImplementedError("quadrature")
@@ -140,6 +152,9 @@ class Discretization(object):
# types.
per_face_groups=False)
+ def all_faces_discr(self, quadrature_tag=None):
+ return self.all_faces_volume_connection(quadrature_tag).to_discr
+
@memoize_method
def all_faces_connection(self, boundary_tag, quadrature_tag=None):
"""Return a
diff --git a/grudge/execution.py b/grudge/execution.py
index 7531698f..75f8f8ec 100644
--- a/grudge/execution.py
+++ b/grudge/execution.py
@@ -64,7 +64,7 @@ class ExecutionMapper(mappers.Evaluator,
elif dd.domain_tag is sym.FRESTR_INTERIOR_FACES:
return self.discr.interior_faces_discr(qtag)
elif dd.is_boundary():
- return self.discr.boundary_connection(dd.domain_tag, qtag)
+ return self.discr.boundary_discr(dd.domain_tag, qtag)
else:
raise ValueError("DOF desc tag not understood: " + str(dd))
@@ -144,7 +144,7 @@ class ExecutionMapper(mappers.Evaluator,
knl = lp.split_iname(knl, "i", 16, inner_tag="l.0")
return lp.tag_inames(knl, dict(k="g.0"))
- discr = self.discr.volume_discr
+ discr = self.get_discr(op.dd_in)
# FIXME: This shouldn't really assume that it's dealing with a volume
# input. What about quadrature? What about boundaries?
@@ -170,104 +170,72 @@ class ExecutionMapper(mappers.Evaluator,
return result
- def map_ref_quad_mass(self, op, field_expr):
- field = self.rec(field_expr)
-
- from grudge.tools import is_zero
- if is_zero(field):
- return 0
-
- qtag = op.quadrature_tag
-
- from grudge._internal import perform_elwise_operator
-
- out = self.discr.volume_zeros()
- for eg in self.discr.element_groups:
- eg_quad_info = eg.quadrature_info[qtag]
-
- perform_elwise_operator(eg_quad_info.ranges, eg.ranges,
- eg_quad_info.ldis_quad_info.mass_matrix(),
- field, out)
- return out
-
- def map_quad_grid_upsampler(self, op, field_expr):
+ def map_elementwise_max(self, op, field_expr):
+ from grudge._internal import perform_elwise_max
field = self.rec(field_expr)
- from grudge.tools import is_zero
- if is_zero(field):
- return 0
-
- qtag = op.quadrature_tag
-
- from grudge._internal import perform_elwise_operator
- quad_info = self.discr.get_quadrature_info(qtag)
-
- out = np.zeros(quad_info.node_count, field.dtype)
+ out = self.discr.volume_zeros(dtype=field.dtype)
for eg in self.discr.element_groups:
- eg_quad_info = eg.quadrature_info[qtag]
-
- perform_elwise_operator(eg.ranges, eg_quad_info.ranges,
- eg_quad_info.ldis_quad_info.volume_up_interpolation_matrix(),
- field, out)
+ perform_elwise_max(eg.ranges, field, out)
return out
- def map_quad_int_faces_grid_upsampler(self, op, field_expr):
- field = self.rec(field_expr)
-
- from grudge.tools import is_zero
- if is_zero(field):
- return 0
-
- qtag = op.quadrature_tag
-
- from grudge._internal import perform_elwise_operator
- quad_info = self.discr.get_quadrature_info(qtag)
-
- out = np.zeros(quad_info.int_faces_node_count, field.dtype)
- for eg in self.discr.element_groups:
- eg_quad_info = eg.quadrature_info[qtag]
+ def map_interpolation(self, op, field_expr):
+ if op.dd_in.quadrature_tag not in [None, sym.QTAG_NONE]:
+ raise ValueError("cannot interpolate *from* a quadrature grid")
- perform_elwise_operator(eg.ranges, eg_quad_info.el_faces_ranges,
- eg_quad_info.ldis_quad_info.volume_to_face_up_interpolation_matrix()
- .copy(),
- field, out)
+ dd_in = op.dd_in
+ dd_out = op.dd_out
- return out
+ qtag = dd_out.quadrature_tag
+ if qtag is None:
+ # FIXME: Remove once proper quadrature support arrives
+ qtag = sym.QTAG_NONE
- def map_quad_bdry_grid_upsampler(self, op, field_expr):
- field = self.rec(field_expr)
+ if dd_in.is_volume():
+ if dd_out.domain_tag is sym.FRESTR_ALL_FACES:
+ conn = self.discr.all_faces_connection(qtag)
+ elif dd_out.domain_tag is sym.FRESTR_INTERIOR_FACES:
+ conn = self.discr.interior_faces_connection(qtag)
+ elif dd_out.is_boundary():
+ conn = self.discr.boundary_connection(dd_out.domain_tag, qtag)
+ else:
+ raise ValueError("cannot interpolate from volume to: " + str(dd_out))
- from grudge.tools import is_zero
- if is_zero(field):
- return 0
+ elif dd_in.domain_tag is sym.FRESTR_INTERIOR_FACES:
+ if dd_out.domain_tag is sym.FRESTR_ALL_FACES:
+ conn = self.discr.all_faces_connection(None, qtag)
+ else:
+ raise ValueError(
+ "cannot interpolate from interior faces to: "
+ + str(dd_out))
- bdry = self.discr.get_boundary(op.boundary_tag)
- bdry_q_info = bdry.get_quadrature_info(op.quadrature_tag)
+ elif dd_in.is_boundary():
+ if dd_out.domain_tag is sym.FRESTR_ALL_FACES:
+ conn = self.discr.all_faces_connection(dd_in.domain_tag, qtag)
+ else:
+ raise ValueError(
+ "cannot interpolate from interior faces to: "
+ + str(dd_out))
- out = np.zeros(bdry_q_info.node_count, field.dtype)
+ else:
+ raise ValueError("cannot interpolate from: " + str(dd_in))
- from grudge._internal import perform_elwise_operator
- for fg, from_ranges, to_ranges, ldis_quad_info in zip(
- bdry.face_groups,
- bdry.fg_ranges,
- bdry_q_info.fg_ranges,
- bdry_q_info.fg_ldis_quad_infos):
- perform_elwise_operator(from_ranges, to_ranges,
- ldis_quad_info.face_up_interpolation_matrix(),
- field, out)
+ return conn(self.queue, self.rec(field_expr)).with_queue(self.queue)
- return out
+ def map_opposite_interior_face_swap(self, op, field_expr):
+ dd = op.dd_in
- def map_elementwise_max(self, op, field_expr):
- from grudge._internal import perform_elwise_max
- field = self.rec(field_expr)
+ qtag = dd.quadrature_tag
+ if qtag is None:
+ # FIXME: Remove once proper quadrature support arrives
+ qtag = sym.QTAG_NONE
- out = self.discr.volume_zeros(dtype=field.dtype)
- for eg in self.discr.element_groups:
- perform_elwise_max(eg.ranges, field, out)
+ return self.discr.opposite_face_connection(qtag)(
+ self.queue, self.rec(field_expr)).with_queue(self.queue)
- return out
+ def map_face_mass_operator(self, op, field_expr):
+ raise NotImplementedError
# }}}
--
GitLab