From 792ad0da1332159fc2f65c63e1ffc52bf743542a Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 15 Dec 2017 19:59:06 +0100 Subject: [PATCH] FEM: fem interface package, rename it to inout --- src/Mod/Fem/CMakeLists.txt | 34 +++++++++---------- src/Mod/Fem/FemToolsCcx.py | 4 +-- src/Mod/Fem/Init.py | 20 +++++------ .../{feminterface => feminout}/__init__.py | 0 .../convert2TetGen.py | 0 .../importCcxDatResults.py | 0 .../importCcxFrdResults.py | 0 .../importFenicsMesh.py | 0 .../importInpMesh.py | 0 .../importToolsFem.py | 0 .../importVTKResults.py | 0 .../importZ88Mesh.py | 0 .../importZ88O2Results.py | 2 +- .../readFenicsXDMF.py | 0 .../readFenicsXML.py | 0 .../writeFenicsXDMF.py | 0 .../writeFenicsXML.py | 0 src/Mod/Fem/femsolver/calculix/tasks.py | 4 +-- src/Mod/Fem/femsolver/z88/tasks.py | 2 +- src/Mod/Fem/femsolver/z88/writer.py | 2 +- src/Mod/Fem/femtest/testfemcommon.py | 2 +- 21 files changed, 35 insertions(+), 35 deletions(-) rename src/Mod/Fem/{feminterface => feminout}/__init__.py (100%) rename src/Mod/Fem/{feminterface => feminout}/convert2TetGen.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importCcxDatResults.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importCcxFrdResults.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importFenicsMesh.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importInpMesh.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importToolsFem.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importVTKResults.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importZ88Mesh.py (100%) rename src/Mod/Fem/{feminterface => feminout}/importZ88O2Results.py (98%) rename src/Mod/Fem/{feminterface => feminout}/readFenicsXDMF.py (100%) rename src/Mod/Fem/{feminterface => feminout}/readFenicsXML.py (100%) rename src/Mod/Fem/{feminterface => feminout}/writeFenicsXDMF.py (100%) rename src/Mod/Fem/{feminterface => feminout}/writeFenicsXML.py (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 9b254d056c..0e3644f7ee 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -35,21 +35,21 @@ SET(FemCommand_SRCS femcommand/manager.py ) -SET(FemInterface_SRCS - feminterface/__init__.py - feminterface/convert2TetGen.py - feminterface/importCcxDatResults.py - feminterface/importCcxFrdResults.py - feminterface/importFenicsMesh.py - feminterface/importInpMesh.py - feminterface/importToolsFem.py - feminterface/importVTKResults.py - feminterface/importZ88Mesh.py - feminterface/importZ88O2Results.py - feminterface/readFenicsXDMF.py - feminterface/readFenicsXML.py - feminterface/writeFenicsXDMF.py - feminterface/writeFenicsXML.py +SET(FemInOut_SRCS + feminout/__init__.py + feminout/convert2TetGen.py + feminout/importCcxDatResults.py + feminout/importCcxFrdResults.py + feminout/importFenicsMesh.py + feminout/importInpMesh.py + feminout/importToolsFem.py + feminout/importVTKResults.py + feminout/importZ88Mesh.py + feminout/importZ88O2Results.py + feminout/readFenicsXDMF.py + feminout/readFenicsXML.py + feminout/writeFenicsXDMF.py + feminout/writeFenicsXML.py ) SET(FemMesh_SRCS @@ -201,7 +201,7 @@ SET(FemObjectsScripts_SRCS SET(FemAllScripts ${FemScripts_SRCS} ${FemCommand_SRCS} - ${FemInterface_SRCS} + ${FemInOut_SRCS} ${FemMesh_SRCS} ${FemResult_SRCS} ${FemSolver_SRCS} @@ -228,7 +228,7 @@ fc_copy_sources(FemScriptsTarget "${CMAKE_BINARY_DIR}/Mod/Fem" ${FemAllScripts}) # install Python packages (for make install) INSTALL(FILES ${FemScripts_SRCS} DESTINATION Mod/Fem) INSTALL(FILES ${FemCommand_SRCS} DESTINATION Mod/Fem/femcommand) -INSTALL(FILES ${FemInterface_SRCS} DESTINATION Mod/Fem/feminterface) +INSTALL(FILES ${FemInOut_SRCS} DESTINATION Mod/Fem/feminout) INSTALL(FILES ${FemMesh_SRCS} DESTINATION Mod/Fem/femmesh) INSTALL(FILES ${FemResult_SRCS} DESTINATION Mod/Fem/femresult) INSTALL(FILES ${FemSolver_SRCS} DESTINATION Mod/Fem/femsolver) diff --git a/src/Mod/Fem/FemToolsCcx.py b/src/Mod/Fem/FemToolsCcx.py index c6368f3a0b..cd33505317 100644 --- a/src/Mod/Fem/FemToolsCcx.py +++ b/src/Mod/Fem/FemToolsCcx.py @@ -761,7 +761,7 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject): # @param self The python object self def load_results_ccxfrd(self): import os - import feminterface.importCcxFrdResults as importCcxFrdResults + import feminout.importCcxFrdResults as importCcxFrdResults frd_result_file = os.path.splitext(self.inp_file_name)[0] + '.frd' if os.path.isfile(frd_result_file): result_name_prefix = 'CalculiX_' + self.solver.AnalysisType + '_' @@ -779,7 +779,7 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject): # @param self The python object self def load_results_ccxdat(self): import os - import feminterface.importCcxDatResults as importCcxDatResults + import feminout.importCcxDatResults as importCcxDatResults dat_result_file = os.path.splitext(self.inp_file_name)[0] + '.dat' if os.path.isfile(dat_result_file): mode_frequencies = importCcxDatResults.import_dat(dat_result_file, self.analysis) diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py index 0840c83555..aa20ef7978 100644 --- a/src/Mod/Fem/Init.py +++ b/src/Mod/Fem/Init.py @@ -27,19 +27,19 @@ import FreeCAD -FreeCAD.addExportType("TetGen file (*.poly)", "feminterface.convert2TetGen") +FreeCAD.addExportType("TetGen file (*.poly)", "feminout.convert2TetGen") FreeCAD.addImportType("FEM formats (*.unv *.med *.dat *.bdf)", "Fem") if("BUILD_FEM_VTK" in FreeCAD.__cmake__): FreeCAD.addImportType("FEM CFD Unstructure Mesh (*.vtk *.vtu)", "Fem") FreeCAD.addExportType("FEM CFD Unstructure Mesh (*.vtk *.vtu)", "Fem") - FreeCAD.addImportType("FEM results (*.vtk *.vtu)", "feminterface.importVTKResults") - FreeCAD.addExportType("FEM CFD Result in VTK format (*.vtk *.vtu)", "feminterface.importVTKResults") + FreeCAD.addImportType("FEM results (*.vtk *.vtu)", "feminout.importVTKResults") + FreeCAD.addExportType("FEM CFD Result in VTK format (*.vtk *.vtu)", "feminout.importVTKResults") FreeCAD.addExportType("FEM formats (*.unv *.med *.dat *.inp)", "Fem") -FreeCAD.addImportType("CalculiX result (*.frd)", "feminterface.importCcxFrdResults") -FreeCAD.addImportType("Fenics mesh file (*.xml *.xdmf)", "feminterface.importFenicsMesh") -FreeCAD.addExportType("Fenics mesh file (*.xml *.xdmf)", "feminterface.importFenicsMesh") -FreeCAD.addImportType("Mesh from Calculix/Abaqus input file (*.inp)", "feminterface.importInpMesh") -FreeCAD.addImportType("Z88 mesh (i1) file (*.txt)", "feminterface.importZ88Mesh") -FreeCAD.addExportType("Z88 mesh (i1) file (*.txt)", "feminterface.importZ88Mesh") -FreeCAD.addImportType("Z88 displacement (o2) result file (*.txt)", "feminterface.importZ88O2Results") +FreeCAD.addImportType("CalculiX result (*.frd)", "feminout.importCcxFrdResults") +FreeCAD.addImportType("Fenics mesh file (*.xml *.xdmf)", "feminout.importFenicsMesh") +FreeCAD.addExportType("Fenics mesh file (*.xml *.xdmf)", "feminout.importFenicsMesh") +FreeCAD.addImportType("Mesh from Calculix/Abaqus input file (*.inp)", "feminout.importInpMesh") +FreeCAD.addImportType("Z88 mesh (i1) file (*.txt)", "feminout.importZ88Mesh") +FreeCAD.addExportType("Z88 mesh (i1) file (*.txt)", "feminout.importZ88Mesh") +FreeCAD.addImportType("Z88 displacement (o2) result file (*.txt)", "feminout.importZ88O2Results") diff --git a/src/Mod/Fem/feminterface/__init__.py b/src/Mod/Fem/feminout/__init__.py similarity index 100% rename from src/Mod/Fem/feminterface/__init__.py rename to src/Mod/Fem/feminout/__init__.py diff --git a/src/Mod/Fem/feminterface/convert2TetGen.py b/src/Mod/Fem/feminout/convert2TetGen.py similarity index 100% rename from src/Mod/Fem/feminterface/convert2TetGen.py rename to src/Mod/Fem/feminout/convert2TetGen.py diff --git a/src/Mod/Fem/feminterface/importCcxDatResults.py b/src/Mod/Fem/feminout/importCcxDatResults.py similarity index 100% rename from src/Mod/Fem/feminterface/importCcxDatResults.py rename to src/Mod/Fem/feminout/importCcxDatResults.py diff --git a/src/Mod/Fem/feminterface/importCcxFrdResults.py b/src/Mod/Fem/feminout/importCcxFrdResults.py similarity index 100% rename from src/Mod/Fem/feminterface/importCcxFrdResults.py rename to src/Mod/Fem/feminout/importCcxFrdResults.py diff --git a/src/Mod/Fem/feminterface/importFenicsMesh.py b/src/Mod/Fem/feminout/importFenicsMesh.py similarity index 100% rename from src/Mod/Fem/feminterface/importFenicsMesh.py rename to src/Mod/Fem/feminout/importFenicsMesh.py diff --git a/src/Mod/Fem/feminterface/importInpMesh.py b/src/Mod/Fem/feminout/importInpMesh.py similarity index 100% rename from src/Mod/Fem/feminterface/importInpMesh.py rename to src/Mod/Fem/feminout/importInpMesh.py diff --git a/src/Mod/Fem/feminterface/importToolsFem.py b/src/Mod/Fem/feminout/importToolsFem.py similarity index 100% rename from src/Mod/Fem/feminterface/importToolsFem.py rename to src/Mod/Fem/feminout/importToolsFem.py diff --git a/src/Mod/Fem/feminterface/importVTKResults.py b/src/Mod/Fem/feminout/importVTKResults.py similarity index 100% rename from src/Mod/Fem/feminterface/importVTKResults.py rename to src/Mod/Fem/feminout/importVTKResults.py diff --git a/src/Mod/Fem/feminterface/importZ88Mesh.py b/src/Mod/Fem/feminout/importZ88Mesh.py similarity index 100% rename from src/Mod/Fem/feminterface/importZ88Mesh.py rename to src/Mod/Fem/feminout/importZ88Mesh.py diff --git a/src/Mod/Fem/feminterface/importZ88O2Results.py b/src/Mod/Fem/feminout/importZ88O2Results.py similarity index 98% rename from src/Mod/Fem/feminterface/importZ88O2Results.py rename to src/Mod/Fem/feminout/importZ88O2Results.py index 203910399c..3b5d3a6872 100644 --- a/src/Mod/Fem/feminterface/importZ88O2Results.py +++ b/src/Mod/Fem/feminout/importZ88O2Results.py @@ -64,7 +64,7 @@ def insert(filename, docname): def import_z88_disp(filename, analysis=None, result_name_prefix=None): '''insert a FreeCAD FEM mechanical result object in the ActiveDocument pure usage: - import feminterfaces.importZ88O2Results as importZ88O2Results + import feminout.importZ88O2Results as importZ88O2Results disp_file = '/pathtofile/z88o2.txt' importZ88O2Results.import_z88_disp(disp_file) diff --git a/src/Mod/Fem/feminterface/readFenicsXDMF.py b/src/Mod/Fem/feminout/readFenicsXDMF.py similarity index 100% rename from src/Mod/Fem/feminterface/readFenicsXDMF.py rename to src/Mod/Fem/feminout/readFenicsXDMF.py diff --git a/src/Mod/Fem/feminterface/readFenicsXML.py b/src/Mod/Fem/feminout/readFenicsXML.py similarity index 100% rename from src/Mod/Fem/feminterface/readFenicsXML.py rename to src/Mod/Fem/feminout/readFenicsXML.py diff --git a/src/Mod/Fem/feminterface/writeFenicsXDMF.py b/src/Mod/Fem/feminout/writeFenicsXDMF.py similarity index 100% rename from src/Mod/Fem/feminterface/writeFenicsXDMF.py rename to src/Mod/Fem/feminout/writeFenicsXDMF.py diff --git a/src/Mod/Fem/feminterface/writeFenicsXML.py b/src/Mod/Fem/feminout/writeFenicsXML.py similarity index 100% rename from src/Mod/Fem/feminterface/writeFenicsXML.py rename to src/Mod/Fem/feminout/writeFenicsXML.py diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py index aef238c595..0c9627539e 100644 --- a/src/Mod/Fem/femsolver/calculix/tasks.py +++ b/src/Mod/Fem/femsolver/calculix/tasks.py @@ -33,8 +33,8 @@ import os.path import FreeCAD as App import FemUtils -import feminterface.importCcxFrdResults as importCcxFrdResults -import feminterface.importCcxDatResults as importCcxDatResults +import feminout.importCcxFrdResults as importCcxFrdResults +import feminout.importCcxDatResults as importCcxDatResults from .. import run from .. import settings diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py index 2fe0fcf941..b20ffe9ca3 100644 --- a/src/Mod/Fem/femsolver/z88/tasks.py +++ b/src/Mod/Fem/femsolver/z88/tasks.py @@ -32,7 +32,7 @@ import os.path import FreeCAD as App import FemUtils -import feminterface.importZ88O2Results as importZ88O2Results +import feminout.importZ88O2Results as importZ88O2Results from .. import run from .. import settings diff --git a/src/Mod/Fem/femsolver/z88/writer.py b/src/Mod/Fem/femsolver/z88/writer.py index 22754f88f9..37d65afde5 100644 --- a/src/Mod/Fem/femsolver/z88/writer.py +++ b/src/Mod/Fem/femsolver/z88/writer.py @@ -29,7 +29,7 @@ __url__ = "http://www.freecadweb.org" import FreeCAD import femmesh.meshtools as FemMeshTools -import feminterface.importZ88Mesh as importZ88Mesh +import feminout.importZ88Mesh as importZ88Mesh import FemInputWriter diff --git a/src/Mod/Fem/femtest/testfemcommon.py b/src/Mod/Fem/femtest/testfemcommon.py index ad00728ae2..a36a5aa5d9 100644 --- a/src/Mod/Fem/femtest/testfemcommon.py +++ b/src/Mod/Fem/femtest/testfemcommon.py @@ -168,7 +168,7 @@ class FemTest(unittest.TestCase): def test_read_frd_massflow_networkpressure(self): # read data from frd file frd_file = test_file_dir + 'Flow1D_thermomech.frd' - import feminterface.importCcxFrdResults as importCcxFrdResults + import feminout.importCcxFrdResults as importCcxFrdResults frd_content = importCcxFrdResults.readResult(frd_file) # do something with the read data