diff --git a/src/Mod/Fem/feminout/importFenicsMesh.py b/src/Mod/Fem/feminout/importFenicsMesh.py index 5781e0b95c..2156a9101f 100644 --- a/src/Mod/Fem/feminout/importFenicsMesh.py +++ b/src/Mod/Fem/feminout/importFenicsMesh.py @@ -1,5 +1,5 @@ # *************************************************************************** -# * Copyright (c) 2017-2023 Johannes Hartung * +# * Copyright (c) 2017-2023 Johannes Hartung * # * * # * This file is part of the FreeCAD CAx development system. * # * * @@ -54,6 +54,7 @@ if FreeCAD.GuiUp: This task panel is used to write mesh groups with user defined values. It will called if there are mesh groups detected. Else it will be bypassed. """ + def __init__(self, fem_mesh_obj, fileString): self.form = FreeCADGui.PySideUic.loadUi(os.path.join( FreeCAD.getHomePath(), @@ -176,8 +177,8 @@ def export(objectslist, fileString, group_values_dict_nogui=None): if fileExtension.lower() == ".xml": if obj.ElementOrder != "1st": Console.PrintWarning( - "XML is not designed to save higher order elements.\n" + - "Reducing order for second order mesh.\n" + + "XML is not designed to save higher order elements.\n" + + "Reducing order for second order mesh.\n" + "Tri6 -> Tri3, Tet10 -> Tet4, etc.\n") writeFenicsXML.write_fenics_mesh_xml(obj, fileString) elif fileExtension.lower() == ".xdmf": diff --git a/src/Mod/Fem/feminout/readFenicsXML.py b/src/Mod/Fem/feminout/readFenicsXML.py index 981876717e..2c9fdec0c0 100644 --- a/src/Mod/Fem/feminout/readFenicsXML.py +++ b/src/Mod/Fem/feminout/readFenicsXML.py @@ -105,8 +105,8 @@ def read_fenics_mesh_xml(xmlfilename): ind = int(cell.get("index")) if cell.tag.lower() != cell_type.lower(): - Console.PrintWarning("Strange mismatch between cell type " + - f"{cell_type} and " + + Console.PrintWarning("Strange mismatch between cell type " + + f"{cell_type} and " + f"cell tag {cell.tag.lower()}\n") num_vertices = cells_parts_dim[cell_type][0] diff --git a/src/Mod/Fem/feminout/writeFenicsXDMF.py b/src/Mod/Fem/feminout/writeFenicsXDMF.py index 961b2e1bde..f9d38e9f26 100644 --- a/src/Mod/Fem/feminout/writeFenicsXDMF.py +++ b/src/Mod/Fem/feminout/writeFenicsXDMF.py @@ -171,7 +171,7 @@ def write_fenics_mesh_codim_xdmf( fc_topo = fem_mesh_obj.FemMesh.Nodes else: fc_topo = [] - Console.PrintError("Dimension of mesh incompatible with export" + + Console.PrintError("Dimension of mesh incompatible with export" + f" XDMF function: {dim_topo}\n") nodeindices = [( @@ -307,8 +307,8 @@ def write_fenics_mesh_xdmf( mesh_function_codim = dim_cell - FreeCAD_Group_Dimensions[mesh_function_type] mesh_function_name = fem_mesh.getGroupName(g) - Console.PrintMessage(f"group id: {g} (label: {mesh_function_name})" + - f" with element type {mesh_function_type} and" + + Console.PrintMessage(f"group id: {g} (label: {mesh_function_name})" + + f" with element type {mesh_function_type} and" + " codim {mesh_function_codim}\n") mesh_function_grid = ET.SubElement( @@ -325,7 +325,7 @@ def write_fenics_mesh_xdmf( codim=mesh_function_codim, encoding=encoding ) - mesh_function_geometry = ET.SubElement(mesh_function_grid, "Geometry", + mesh_function_geometry = ET.SubElement(mesh_function_grid, "Geometry", Reference="XML") mesh_function_geometry.text = "/Xdmf/Domain/Grid/Geometry" mesh_function_attribute = ET.SubElement(mesh_function_grid, "Attribute") diff --git a/src/Mod/Fem/feminout/writeFenicsXML.py b/src/Mod/Fem/feminout/writeFenicsXML.py index fbcec5fe65..c58257acbe 100644 --- a/src/Mod/Fem/feminout/writeFenicsXML.py +++ b/src/Mod/Fem/feminout/writeFenicsXML.py @@ -80,7 +80,7 @@ def write_fenics_mesh_xml(fem_mesh_obj, outputfile): (num_cells, cellname_fc, dim_cell) = celltype_in_mesh cellname_fenics = FreeCAD_to_Fenics_dict[cellname_fc] num_verts_cell = XML_Number_of_Nodes_dict[cellname_fenics] - Console.PrintMessage(f"Celltype in mesh -> {str(celltype_in_mesh)} " + + Console.PrintMessage(f"Celltype in mesh -> {str(celltype_in_mesh)} " + f"and its Fenics name: {cellname_fenics}\n") root = ET.Element("dolfin", dolfin="http://fenicsproject.org")