Merge branch 'add_polygon_support_for_vtu' into 'develop'

Add polygon support for vtu See merge request ricos/simulation/femio!88
ricosjp · Nov 10, 2023 · b4dc498 · b4dc498
2 parents c9e117c + ca229f1
commit b4dc498
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1 deletion.
diff --git a/femio/config.py b/femio/config.py
@@ -195,6 +195,7 @@
     1: 'pt',
     3: 'line',
     5: 'tri',
+    7: 'polygon',
     9: 'quad',
     10: 'tet',
     11: 'voxel',

diff --git a/femio/io.py b/femio/io.py
@@ -146,7 +146,7 @@ def convert_to_2d_if_needed(x):
 
 
 def stack_if_needed(type_id, data):
-    if type_id == 42:
+    if type_id in [42, 7]:
         return data
     else:
         return np.stack(data)
diff --git a/tests/data/vtu/polygons/mesh.vtu b/tests/data/vtu/polygons/mesh.vtu
diff --git a/tests/format/polyvtk/test_polyvtk.py b/tests/format/polyvtk/test_polyvtk.py
@@ -266,3 +266,15 @@ def test_read_vtk_voxel(self):
                 [1, 8, 9, 3, 5, 10, 11, 7],
             ])
         )
+
+    def test_read_vtk_polygon(self):
+        file_name = pathlib.Path('tests/data/vtu/polygons/mesh.vtu')
+        fem_data = FEMData.read_files('vtu', [file_name])
+
+        ref_file_name = pathlib.Path('tests/data/vtp/polys/mesh.vtp')
+        ref_fem_data = FEMData.read_files('vtp', [ref_file_name])
+
+        np.testing.assert_almost_equal(
+            fem_data.nodes.data, ref_fem_data.nodes.data)
+        for d, r in zip(fem_data.elements.data, ref_fem_data.elements.data):
+            np.testing.assert_array_equal(d, r)