From 72886c2390d2c4571be9b159ccc203b79f31f0c3 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 5 Jun 2016 13:54:52 -0500 Subject: [PATCH] More refinement fixes --- examples/refinement-playground.py | 19 +++++++++++++++---- meshmode/discretization/visualization.py | 2 +- meshmode/mesh/refinement.py | 3 +-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/examples/refinement-playground.py b/examples/refinement-playground.py index 681c466..9ce888b 100644 --- a/examples/refinement-playground.py +++ b/examples/refinement-playground.py @@ -16,6 +16,17 @@ def get_vertex(mesh, vertex_index): return vertex +def remove_if_exists(name): + from errno import ENOENT + try: + os.remove(name) + except OSError as e: + if e.errno == ENOENT: + pass + else: + raise + + def test_refiner_connectivity(mesh): def group_and_iel_to_global_iel(igrp, iel): return mesh.groups[igrp].element_nr_base + iel @@ -340,16 +351,16 @@ def refine_and_generate_chart_function(mesh, filename, function): cl_ctx, mesh, PolynomialWarpAndBlendGroupFactory(order)) from meshmode.discretization.visualization import make_visualizer vis = make_visualizer(queue, discr, order) - os.remove("connectivity2.vtu") - os.remove("geometry2.vtu") + remove_if_exists("connectivity2.vtu") + remove_if_exists("geometry2.vtu") vis.write_vtk_file("geometry2.vtu", [ ("f", discr.nodes()[0]), ]) from meshmode.discretization.visualization import \ - write_mesh_connectivity_vtk_file + write_nodal_adjacency_vtk_file - write_mesh_connectivity_vtk_file("connectivity2.vtu", + write_nodal_adjacency_vtk_file("connectivity2.vtu", mesh) diff --git a/meshmode/discretization/visualization.py b/meshmode/discretization/visualization.py index d68ec0c..956e301 100644 --- a/meshmode/discretization/visualization.py +++ b/meshmode/discretization/visualization.py @@ -291,7 +291,7 @@ def write_nodal_adjacency_vtk_file(file_name, mesh, compressor=None,): nconnections = len(adj.neighbors) connections = np.empty((nconnections, 2), dtype=np.int32) - nb_starts = adj.neighbors_starts + nb_starts = adj.neighbor_starts for iel in range(mesh.nelements): connections[nb_starts[iel]:nb_starts[iel+1], 0] = iel diff --git a/meshmode/mesh/refinement.py b/meshmode/mesh/refinement.py index c08da6f..bd43465 100644 --- a/meshmode/mesh/refinement.py +++ b/meshmode/mesh/refinement.py @@ -769,8 +769,7 @@ class Refiner(object): lengths = [len(el_list) for el_list in element_to_element] neighbors_starts = np.cumsum( np.array([0] + lengths, dtype=self.last_mesh.element_id_dtype), - # cumsum seems to silently widen integer types - # https://github.com/numpy/numpy/issues/7708 + # cumsum silently widens integer types dtype=self.last_mesh.element_id_dtype) from pytools import flatten neighbors = np.array( -- GitLab