From 2f0758a1285ed3b05aab51350243b3673e378481 Mon Sep 17 00:00:00 2001
From: joha2 <joha2@gmx.net>
Date: Wed, 12 Apr 2023 16:01:52 +0200
Subject: [PATCH] Fem: feminout: write XML/XDMF Fenics formats: fixed some
 errors in written meshs read by meshio library

* XDMF: capital "Version" in tag
* XDMF: capitalizing topology names
* XML: removed data tag throwing a warning in meshio
---
 src/Mod/Fem/feminout/writeFenicsXDMF.py | 33 ++++++-------------------
 src/Mod/Fem/feminout/writeFenicsXML.py  |  3 ++-
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/Mod/Fem/feminout/writeFenicsXDMF.py b/src/Mod/Fem/feminout/writeFenicsXDMF.py
index 72e0683999..7975fd3735 100644
--- a/src/Mod/Fem/feminout/writeFenicsXDMF.py
+++ b/src/Mod/Fem/feminout/writeFenicsXDMF.py
@@ -52,13 +52,13 @@ FreeCAD_Group_Dimensions = {
 }
 
 FreeCAD_to_Fenics_XDMF_dict = {
-    ("Node", 1): ("polyvertex", 1),
-    ("Edge", 1): ("polyline", 2),
-    ("Edge", 2): ("edge_3", 3),
-    ("Triangle", 1): ("triangle", 3),
-    ("Triangle", 2): ("tri_6", 6),
-    ("Tetra", 1): ("tetrahedron", 4),
-    ("Tetra", 2): ("tet_10", 10)
+    ("Node", 1): ("Polyvertex", 1),
+    ("Edge", 1): ("Polyline", 2),
+    ("Edge", 2): ("Edge_3", 3),
+    ("Triangle", 1): ("Triangle", 3),
+    ("Triangle", 2): ("Tri_6", 6),
+    ("Tetra", 1): ("Tetrahedron", 4),
+    ("Tetra", 2): ("Tet_10", 10)
 }
 
 # we need numpy functions to later access and process large data sets in a fast manner
@@ -265,18 +265,6 @@ def write_fenics_mesh_xdmf(
         For the export of xdmf.
     """
 
-    FreeCAD_to_Fenics_dict = {
-        "Triangle": "triangle",
-        "Tetra": "tetrahedron",
-        "Hexa": "hexahedron",
-        "Edge": "interval",
-        "Node": "point",
-        "Quadrangle": "quadrilateral",
-
-        "Polygon": "unknown", "Polyhedron": "unknown",
-        "Prism": "unknown", "Pyramid": "unknown",
-    }
-
     Console.PrintMessage("Converting " + fem_mesh_obj.Label + " to fenics XDMF File\n")
     Console.PrintMessage("Dimension of mesh: %d\n" % (get_FemMeshObjectDimension(fem_mesh_obj),))
 
@@ -284,13 +272,8 @@ def write_fenics_mesh_xdmf(
     Console.PrintMessage("Elements appearing in mesh: %s\n" % (str(elements_in_mesh),))
     celltype_in_mesh = get_MaxDimElementFromList(elements_in_mesh)
     (num_cells, cellname_fc, dim_cell) = celltype_in_mesh
-    cellname_fenics = FreeCAD_to_Fenics_dict[cellname_fc]
-    Console.PrintMessage(
-        "Celltype in mesh -> {} and its Fenics dolfin name: {}\n"
-        .format(celltype_in_mesh, cellname_fenics)
-    )
 
-    root = ET.Element("Xdmf", version="3.0")
+    root = ET.Element("Xdmf", Version="3.0")
     domain = ET.SubElement(root, "Domain")
     base_grid = ET.SubElement(domain, "Grid", Name="base_mesh", GridType="Uniform")
     base_topology = ET.SubElement(base_grid, "Topology")
diff --git a/src/Mod/Fem/feminout/writeFenicsXML.py b/src/Mod/Fem/feminout/writeFenicsXML.py
index b6bcc947da..a5879d3ba3 100644
--- a/src/Mod/Fem/feminout/writeFenicsXML.py
+++ b/src/Mod/Fem/feminout/writeFenicsXML.py
@@ -118,7 +118,8 @@ def write_fenics_mesh_xml(fem_mesh_obj, outputfile):
 
         ET.SubElement(cells, cellname_fenics, index=str(fen_ind), **cell_args)
 
-    ET.SubElement(meshchild, "data")
+    # ET.SubElement(meshchild, "data")
+    # removed to eliminate warning from meshio
 
     fp = open(outputfile, "wb")
     fp.write(ET.tostring(root))