From af2b38d1a35c61674bb3ef46678d25ad1f44d4b0 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 31 Jan 2018 00:56:52 -0600
Subject: [PATCH] Fixes for interface changes after merging master into
mpi-communication
---
grudge/execution.py | 9 ++++++---
test/test_mpi_communication.py | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/grudge/execution.py b/grudge/execution.py
index 1f7e60b..56ae7c1 100644
--- a/grudge/execution.py
+++ b/grudge/execution.py
@@ -249,11 +249,12 @@ class ExecutionMapper(mappers.Evaluator,
from mpi4py import MPI
mpi_comm = MPI.COMM_WORLD
- grp_factory = self.discr.get_group_factory_for_quadrature_tag(sym.QTAG_NONE)
+ grp_factory = self.discrwb.group_factory_for_quadrature_tag(sym.QTAG_NONE)
+ volume_discr = self.discrwb.discr_from_dd("vol")
from meshmode.distributed import MPIBoundaryCommunicator
bdry_conn_future = MPIBoundaryCommunicator(mpi_comm, self.queue,
- self.discr.volume_discr,
+ volume_discr,
grp_factory,
op.i_remote_part)
# TODO: Need to tell the future what boundary data to transfer
@@ -549,8 +550,10 @@ def process_sym_operator(discrwb, sym_operator, post_bind_mapper=None,
sym_operator = mappers.GlobalToReferenceMapper(discrwb.ambient_dim)(sym_operator)
dumper("before-distributed", sym_operator)
+
+ volume_mesh = discrwb.discr_from_dd("vol").mesh
from meshmode.distributed import get_connected_partitions
- connected_parts = get_connected_partitions(mesh)
+ connected_parts = get_connected_partitions(volume_mesh)
sym_operator = mappers.DistributedMapper(connected_parts)(sym_operator)
# Ordering restriction:
diff --git a/test/test_mpi_communication.py b/test/test_mpi_communication.py
index 6244dcc..68901da 100644
--- a/test/test_mpi_communication.py
+++ b/test/test_mpi_communication.py
@@ -32,7 +32,7 @@ import pyopencl as cl
import logging
logger = logging.getLogger(__name__)
-from grudge import sym, bind, Discretization
+from grudge import sym, bind, DGDiscretizationWithBoundaries
from grudge.shortcuts import set_up_rk4
@@ -65,7 +65,7 @@ def simple_mpi_communication_entrypoint(order):
else:
local_mesh = mesh_dist.receive_mesh_part()
- vol_discr = Discretization(cl_ctx, local_mesh, order=order)
+ vol_discr = DGDiscretizationWithBoundaries(cl_ctx, local_mesh, order=order)
sym_x = sym.nodes(local_mesh.dim)
myfunc_symb = sym.sin(np.dot(sym_x, [2, 3]))
@@ -129,7 +129,7 @@ def mpi_communication_entrypoint():
else:
local_mesh = mesh_dist.receive_mesh_part()
- vol_discr = Discretization(cl_ctx, local_mesh, order=order)
+ vol_discr = DGDiscretizationWithBoundaries(cl_ctx, local_mesh, order=order)
source_center = np.array([0.1, 0.22, 0.33])[:local_mesh.dim]
source_width = 0.05
--
GitLab