diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index a329cd211..e0e7dacb2 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -117,7 +117,7 @@ SET(FemScripts_SRCS importInpMesh.py importVTKResults.py importZ88Mesh.py - importZ88Results.py + importZ88O2Results.py Init.py InitGui.py FemAnalysis.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 3a69fe2c4..3d7f8e12a 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -119,7 +119,7 @@ INSTALL( # solver Z88 importZ88Mesh.py - importZ88Results.py + importZ88O2Results.py FemInputWriterZ88.py FemToolsZ88.py FemSolverZ88.py diff --git a/src/Mod/Fem/FemToolsZ88.py b/src/Mod/Fem/FemToolsZ88.py index 5599a07cb..594366d22 100644 --- a/src/Mod/Fem/FemToolsZ88.py +++ b/src/Mod/Fem/FemToolsZ88.py @@ -190,11 +190,11 @@ class FemToolsZ88(FemTools.FemTools): def load_results_o2(self): import os - import importZ88Results + import importZ88O2Results disp_result_file = self.working_dir + '/z88o2.txt' if os.path.isfile(disp_result_file): result_name_prefix = 'Z88_' + self.solver.AnalysisType + '_' - importZ88Results.import_z88_disp(disp_result_file, self.analysis, result_name_prefix) + importZ88O2Results.import_z88_disp(disp_result_file, self.analysis, result_name_prefix) for m in self.analysis.Member: if m.isDerivedFrom("Fem::FemResultObject"): self.results_present = True diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py index 9cd28c3c9..2f9386e53 100644 --- a/src/Mod/Fem/Init.py +++ b/src/Mod/Fem/Init.py @@ -40,4 +40,4 @@ FreeCAD.addImportType("CalculiX result (*.frd)", "ccxFrdReader") FreeCAD.addImportType("Mesh from Calculix/Abaqus input file (*.inp)", "importInpMesh") FreeCAD.addImportType("Z88 mesh file (*.txt)", "importZ88Mesh") FreeCAD.addExportType("Z88 mesh file (*.txt)", "importZ88Mesh") -FreeCAD.addImportType("Z88 result file (*.txt)", "importZ88Results") +FreeCAD.addImportType("Z88 displacement (o2) result file (*.txt)", "importZ88O2Results") diff --git a/src/Mod/Fem/importZ88Results.py b/src/Mod/Fem/importZ88O2Results.py similarity index 98% rename from src/Mod/Fem/importZ88Results.py rename to src/Mod/Fem/importZ88O2Results.py index e8326d062..07f7feb9e 100644 --- a/src/Mod/Fem/importZ88Results.py +++ b/src/Mod/Fem/importZ88O2Results.py @@ -24,7 +24,7 @@ __title__ = "FreeCAD Z88 Disp Reader" __author__ = "Bernd Hahnebach " __url__ = "http://www.freecadweb.org" -## @package importZ88Results +## @package importZ88O2Results # \ingroup FEM import FreeCAD @@ -149,9 +149,9 @@ def read_z88_disp(z88_disp_input): pure usage: import FemToolsZ88 fea = FemToolsZ88.FemToolsZ88() - import importZ88Results + import importZ88O2Results disp_file = '/pathtofile/z88o2.txt' - importZ88Results.import_z88_disp(disp_file , fea.analysis) + importZ88O2Results.import_z88_disp(disp_file , fea.analysis) The FreeCAD file needs to have an Analysis and an appropiate FEM Mesh '''