From 3ad5ff77a6894ff0774ece701385e4bc55cf654f Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 14 Jul 2020 07:29:35 +0200 Subject: [PATCH] FEM: in out, improve imports --- src/Mod/Fem/feminout/importCcxDatResults.py | 3 ++- src/Mod/Fem/feminout/importCcxFrdResults.py | 5 +++-- src/Mod/Fem/feminout/importFenicsMesh.py | 1 + src/Mod/Fem/feminout/importInpMesh.py | 3 ++- src/Mod/Fem/feminout/importPyMesh.py | 1 + src/Mod/Fem/feminout/importVTKResults.py | 2 ++ src/Mod/Fem/feminout/importYamlJsonMesh.py | 1 + src/Mod/Fem/feminout/importZ88O2Results.py | 3 ++- src/Mod/Fem/feminout/readFenicsXML.py | 4 ++-- src/Mod/Fem/feminout/writeFenicsXDMF.py | 17 +++++++++-------- src/Mod/Fem/feminout/writeFenicsXML.py | 4 +++- 11 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/Mod/Fem/feminout/importCcxDatResults.py b/src/Mod/Fem/feminout/importCcxDatResults.py index 99b0722758..72c319a94d 100644 --- a/src/Mod/Fem/feminout/importCcxDatResults.py +++ b/src/Mod/Fem/feminout/importCcxDatResults.py @@ -30,9 +30,10 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD Calculix DAT reader for FEM workbench +import os + import FreeCAD from FreeCAD import Console -import os EIGENVALUE_OUTPUT_SECTION = " E I G E N V A L U E O U T P U T" diff --git a/src/Mod/Fem/feminout/importCcxFrdResults.py b/src/Mod/Fem/feminout/importCcxFrdResults.py index b5d1ffa86c..2316dd8e6c 100644 --- a/src/Mod/Fem/feminout/importCcxFrdResults.py +++ b/src/Mod/Fem/feminout/importCcxFrdResults.py @@ -31,9 +31,10 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD Calculix FRD Reader for FEM workbench +import os + import FreeCAD from FreeCAD import Console -import os # ********* generic FreeCAD import and export methods ********* @@ -70,8 +71,8 @@ def importFrd( analysis=None, result_name_prefix="" ): - from . import importToolsFem import ObjectsFem + from . import importToolsFem if analysis: doc = analysis.Document diff --git a/src/Mod/Fem/feminout/importFenicsMesh.py b/src/Mod/Fem/feminout/importFenicsMesh.py index 4c4fd8643e..93fffefc9e 100644 --- a/src/Mod/Fem/feminout/importFenicsMesh.py +++ b/src/Mod/Fem/feminout/importFenicsMesh.py @@ -33,6 +33,7 @@ import os import FreeCAD from FreeCAD import Console + from . import importToolsFem from . import readFenicsXML from . import writeFenicsXML diff --git a/src/Mod/Fem/feminout/importInpMesh.py b/src/Mod/Fem/feminout/importInpMesh.py index 22a269f1f2..e4de5dde0f 100644 --- a/src/Mod/Fem/feminout/importInpMesh.py +++ b/src/Mod/Fem/feminout/importInpMesh.py @@ -31,9 +31,10 @@ __date__ = "04/08/2016" # \ingroup FEM # \brief FreeCAD INP file reader for FEM workbench +import os + import FreeCAD from FreeCAD import Console -import os # ********* generic FreeCAD import and export methods ********* diff --git a/src/Mod/Fem/feminout/importPyMesh.py b/src/Mod/Fem/feminout/importPyMesh.py index 7c64bec66a..a06fb003ce 100644 --- a/src/Mod/Fem/feminout/importPyMesh.py +++ b/src/Mod/Fem/feminout/importPyMesh.py @@ -30,6 +30,7 @@ __url__ = "http://www.freecadweb.org" # \brief FreeCAD Python Mesh reader and writer for FEM workbench import FreeCAD + from femmesh import meshtools # ************************************************************************************************ diff --git a/src/Mod/Fem/feminout/importVTKResults.py b/src/Mod/Fem/feminout/importVTKResults.py index 2355a2969c..d6023998a2 100644 --- a/src/Mod/Fem/feminout/importVTKResults.py +++ b/src/Mod/Fem/feminout/importVTKResults.py @@ -31,8 +31,10 @@ __url__ = "http://www.freecadweb.org" # \brief FreeCAD Result import and export VTK file library import os + import FreeCAD from FreeCAD import Console + import Fem diff --git a/src/Mod/Fem/feminout/importYamlJsonMesh.py b/src/Mod/Fem/feminout/importYamlJsonMesh.py index 02882e272d..784d1ba4af 100644 --- a/src/Mod/Fem/feminout/importYamlJsonMesh.py +++ b/src/Mod/Fem/feminout/importYamlJsonMesh.py @@ -34,6 +34,7 @@ import os import FreeCAD from FreeCAD import Console + from . import importToolsFem has_yaml = True diff --git a/src/Mod/Fem/feminout/importZ88O2Results.py b/src/Mod/Fem/feminout/importZ88O2Results.py index 42777c5d2c..2b4618e49f 100644 --- a/src/Mod/Fem/feminout/importZ88O2Results.py +++ b/src/Mod/Fem/feminout/importZ88O2Results.py @@ -29,9 +29,10 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD Z88 Disp Reader for FEM workbench +import os + import FreeCAD from FreeCAD import Console -import os # ********* generic FreeCAD import and export methods ********* diff --git a/src/Mod/Fem/feminout/readFenicsXML.py b/src/Mod/Fem/feminout/readFenicsXML.py index 021bbf13b6..421cc5e021 100644 --- a/src/Mod/Fem/feminout/readFenicsXML.py +++ b/src/Mod/Fem/feminout/readFenicsXML.py @@ -29,11 +29,11 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD Fenics Mesh XML reader for FEM workbench +import itertools +from xml.etree import ElementTree as ET import FreeCAD from FreeCAD import Console -from xml.etree import ElementTree as ET -import itertools def read_fenics_mesh_xml(xmlfilename): diff --git a/src/Mod/Fem/feminout/writeFenicsXDMF.py b/src/Mod/Fem/feminout/writeFenicsXDMF.py index 4d82b2007a..8f626c481c 100644 --- a/src/Mod/Fem/feminout/writeFenicsXDMF.py +++ b/src/Mod/Fem/feminout/writeFenicsXDMF.py @@ -29,15 +29,16 @@ __url__ = "http://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD Fenics Mesh XDMF writer for FEM workbench -from FreeCAD import Console -from .importToolsFem import \ - get_FemMeshObjectDimension,\ - get_FemMeshObjectElementTypes,\ - get_MaxDimElementFromList,\ - get_FemMeshObjectOrder,\ - get_FemMeshObjectMeshGroups -from xml.etree import ElementTree as ET # parsing xml files and exporting import numpy as np +from xml.etree import ElementTree as ET # parsing xml files and exporting + +from FreeCAD import Console + +from .importToolsFem import get_FemMeshObjectDimension +from .importToolsFem import get_FemMeshObjectElementTypes +from .importToolsFem import get_FemMeshObjectOrder +from .importToolsFem import get_FemMeshObjectMeshGroups +from .importToolsFem import get_MaxDimElementFromList ENCODING_ASCII = "ASCII" diff --git a/src/Mod/Fem/feminout/writeFenicsXML.py b/src/Mod/Fem/feminout/writeFenicsXML.py index a2ce526a9f..4067e7b864 100644 --- a/src/Mod/Fem/feminout/writeFenicsXML.py +++ b/src/Mod/Fem/feminout/writeFenicsXML.py @@ -30,11 +30,13 @@ __url__ = "http://www.freecadweb.org" # \brief FreeCAD Fenics Mesh XML writer for FEM workbench +from xml.etree import ElementTree as ET # parsing xml files and exporting + from FreeCAD import Console + from .importToolsFem import get_FemMeshObjectDimension from .importToolsFem import get_FemMeshObjectElementTypes from .importToolsFem import get_MaxDimElementFromList -from xml.etree import ElementTree as ET # parsing xml files and exporting def write_fenics_mesh_xml(fem_mesh_obj, outputfile):