branch: devel-tetsuo-xml-binary commit e7cf0ce4e2c0ce9f861d1386ee62afd05d6d2829 Author: Tetsuo Koyama <tkoyama...@gmail.com> AuthorDate: Fri Sep 4 00:55:59 2020 +0900
convert test from vtk to pyvista --- interface/tests/python/check_export_vtu.py | 35 +++++++++++++++--------------- requirements.txt | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/interface/tests/python/check_export_vtu.py b/interface/tests/python/check_export_vtu.py index e0ec891..dfdd7cb 100644 --- a/interface/tests/python/check_export_vtu.py +++ b/interface/tests/python/check_export_vtu.py @@ -26,28 +26,29 @@ $Id$ """ -import vtk import getfem as gf +import numpy as np +import pyvista as pv -m0 = gf.Mesh("cartesian", [0, 1]) +convex_connectivity = np.array([0, 1]) +mesh = gf.Mesh("cartesian", convex_connectivity * 2) +pts = mesh.pts()[0] -filenames = ["check_m0_ascii.vtu", "check_m0_binary.vtu"] -m0.export_to_vtu(filenames[0], "ascii") -filenames.append(filenames[0]) +filenames = ["check_mesh_ascii.vtu", "check_mesh_binary.vtu"] -m0.export_to_vtu(filenames[1]) -filenames.append(filenames[1]) +mesh.export_to_vtu(filenames[0], "ascii") + +mesh.export_to_vtu(filenames[1]) for filename in filenames: print(filename) - reader = vtk.vtkXMLUnstructuredGridReader() - reader.SetFileName(filename) - reader.Update() - output = reader.GetOutput() - cell_data = output.GetCellData() - nbpts = output.GetNumberOfPoints() - nbcvs = output.GetNumberOfCells() - array_name = cell_data.GetArrayName(0) - assert nbpts == m0.nbpts(), "Number of points is not correct." - assert nbcvs == m0.nbcvs(), "Number of cells is not correct." + unstructured_grid = pv.read(filename) + + expected = pts + actual = unstructured_grid.points[:, 0] + np.testing.assert_equal(expected, actual, "export of mesh pts is not correct.") + + expected = convex_connectivity + actual = unstructured_grid.cell_connectivity + np.testing.assert_equal(expected, actual, "export of mesh convex is not correct.") diff --git a/requirements.txt b/requirements.txt index 13536d5..5b55979 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ numpy scipy Sphinx -vtk +pyvista