branch: devel-tkoyama-fix-python-error commit d5201a21398e6db0bcb679cd50c0c32e82d800be Author: Tetsuo Koyama <tkoyama...@gmail.com> AuthorDate: Sat Jul 15 03:23:34 2023 -0500
Fix Python error in new third package version --- interface/src/gf_mesh_fem_get.cc | 2 +- interface/tests/python/check_export_vtu.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/src/gf_mesh_fem_get.cc b/interface/src/gf_mesh_fem_get.cc index 8a179b1e..c1936652 100644 --- a/interface/src/gf_mesh_fem_get.cc +++ b/interface/src/gf_mesh_fem_get.cc @@ -1002,7 +1002,7 @@ void gf_mesh_fem_get(getfemint::mexargs_in& m_in, P = P[:,Ind] nbd = P.shape[1] vars = ('x','y','z','u','v','w') - nbvars = min(P.shape[0],len(vars)) + nbvars = min([P.shape[0],len(vars)]) for i in range(0,nbvars): gl[vars[i]] = P[i,0] lo[vars[i]] = P[i,0] diff --git a/interface/tests/python/check_export_vtu.py b/interface/tests/python/check_export_vtu.py index 0f203327..38cbe276 100644 --- a/interface/tests/python/check_export_vtu.py +++ b/interface/tests/python/check_export_vtu.py @@ -90,28 +90,28 @@ file_name = "check_meshfem_ascii.vtk" mfu.export_to_vtk(file_name, "ascii", U1, "U1") unstructured_grid = pv.read(file_name) expected = U1 -actual = unstructured_grid.point_arrays["U1"] +actual = unstructured_grid.point_data["U1"] np.testing.assert_equal(expected, actual, "export of U1 is not correct.") file_name = "check_meshfem_binary.vtk" mfu.export_to_vtk(file_name, U1, "U1") unstructured_grid = pv.read(file_name) expected = U1 -actual = unstructured_grid.point_arrays["U1"] +actual = unstructured_grid.point_data["U1"] np.testing.assert_equal(expected, actual, "export of U1 is not correct.") file_name = "check_meshfem_ascii.vtu" mfu.export_to_vtu(file_name, "ascii", U1, "U1") unstructured_grid = pv.read(file_name) expected = U1 -actual = unstructured_grid.point_arrays["U1"] +actual = unstructured_grid.point_data["U1"] np.testing.assert_equal(expected, actual, "export of U1 is not correct.") file_name = "check_meshfem_binary.vtu" mfu.export_to_vtu(file_name, U1, "U1") unstructured_grid = pv.read(file_name) expected = U1 -actual = unstructured_grid.point_arrays["U1"] +actual = unstructured_grid.point_data["U1"] np.testing.assert_equal(expected, actual, "export of U1 is not correct.") sl = gf.Slice(("boundary",), mesh, 1) @@ -121,26 +121,26 @@ file_name = "check_slice_ascii.vtk" sl.export_to_vtk(file_name, "ascii", U2, "U2") unstructured_grid = pv.read(file_name) expected = U2 -actual = unstructured_grid.point_arrays["U2"] +actual = unstructured_grid.point_data["U2"] np.testing.assert_equal(expected, actual, "export of U2 is not correct.") file_name = "check_slice_binary.vtk" sl.export_to_vtk(file_name, U2, "U2") unstructured_grid = pv.read(file_name) expected = U2 -actual = unstructured_grid.point_arrays["U2"] +actual = unstructured_grid.point_data["U2"] np.testing.assert_equal(expected, actual, "export of U2 is not correct.") file_name = "check_slice_ascii.vtu" sl.export_to_vtu(file_name, "ascii", U2, "U2") unstructured_grid = pv.read(file_name) expected = U2 -actual = unstructured_grid.point_arrays["U2"] +actual = unstructured_grid.point_data["U2"] np.testing.assert_equal(expected, actual, "export of U2 is not correct.") file_name = "check_slice_binary.vtu" sl.export_to_vtu(file_name, U2, "U2") unstructured_grid = pv.read(file_name) expected = U2 -actual = unstructured_grid.point_arrays["U2"] +actual = unstructured_grid.point_data["U2"] np.testing.assert_equal(expected, actual, "export of U2 is not correct.")