From 5ed91ce0f3694f4db35c918cd17d6eeece1156e1 Mon Sep 17 00:00:00 2001
From: Ben Sepanski <ben_sepanski@baylor.edu>
Date: Mon, 1 Jun 2020 18:03:16 -0500
Subject: [PATCH] renamed to fix flake8 errors
---
meshmode/interop/firedrake/mesh_geometry.py | 13 +++++++------
meshmode/interop/firedrake/mesh_topology.py | 19 +++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meshmode/interop/firedrake/mesh_geometry.py b/meshmode/interop/firedrake/mesh_geometry.py
index 715e2336..735bbc6a 100644
--- a/meshmode/interop/firedrake/mesh_geometry.py
+++ b/meshmode/interop/firedrake/mesh_geometry.py
@@ -133,13 +133,14 @@ class FiredrakeMeshGeometryImporter(ExternalImportHandler):
coordinates_fs_importer = \
self._coordinates_importer.function_space_importer()
- V_importer = FiredrakeWithGeometryImporter(cl_ctx,
- coordinates_fs,
- coordinates_fs_importer,
- self)
- f = Function(V_importer.data, val=self._coordinates_a.data)
+ fspace_importer = \
+ FiredrakeWithGeometryImporter(cl_ctx,
+ coordinates_fs,
+ coordinates_fs_importer,
+ self)
+ f = Function(fspace_importer.data, val=self._coordinates_a.data)
self._coordinates_function_importer = \
- FiredrakeFunctionImporter(f, V_importer)
+ FiredrakeFunctionImporter(f, fspace_importer)
del self._callback
diff --git a/meshmode/interop/firedrake/mesh_topology.py b/meshmode/interop/firedrake/mesh_topology.py
index 1b16df9f..3a5d7a2c 100644
--- a/meshmode/interop/firedrake/mesh_topology.py
+++ b/meshmode/interop/firedrake/mesh_topology.py
@@ -157,39 +157,38 @@ class FiredrakeMeshTopologyImporter(ExternalImportHandler):
# TODO... not sure how to get around the private access
plex = self.data._plex
- # variable names follow a dmplex naming convention for
- # cell Start/end and vertex Start/end.
- cStart, cEnd = plex.getHeightStratum(0)
- vStart, vEnd = plex.getDepthStratum(0)
+ # dmplex cell Start/end and vertex Start/end.
+ c_start, c_end = plex.getHeightStratum(0)
+ v_start, v_end = plex.getDepthStratum(0)
# TODO... not sure how to get around the private access
to_fd_id = np.vectorize(self.data._cell_numbering.getOffset)(
- np.arange(cStart, cEnd, dtype=np.int32))
+ np.arange(c_start, c_end, dtype=np.int32))
element_to_neighbors = {}
verts_checked = set() # dmplex ids of vertex checked
# If using all cells, loop over them all
if self.icell_to_fd is None:
- range_ = range(cStart, cEnd)
+ range_ = range(c_start, c_end)
# Otherwise, just the ones you're using
else:
isin = np.isin(to_fd_id, self.icell_to_fd)
- range_ = np.arange(cStart, cEnd, dtype=np.int32)[isin]
+ range_ = np.arange(c_start, c_end, dtype=np.int32)[isin]
# For each cell
for cell_id in range_:
# For each vertex touching the cell (that haven't already seen)
for vert_id in plex.getTransitiveClosure(cell_id)[0]:
- if vStart <= vert_id < vEnd and vert_id not in verts_checked:
+ if v_start <= vert_id < v_end and vert_id not in verts_checked:
verts_checked.add(vert_id)
cells = []
# Record all cells touching that vertex
support = plex.getTransitiveClosure(vert_id,
useCone=False)[0]
for other_cell_id in support:
- if cStart <= other_cell_id < cEnd:
- cells.append(to_fd_id[other_cell_id - cStart])
+ if c_start <= other_cell_id < c_end:
+ cells.append(to_fd_id[other_cell_id - c_start])
# If only using some cells, clean out extraneous ones
# and relabel them to new id
--
GitLab