suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: import Z88 results, change module name to import...

Browse Source
This commit is contained in:
Bernd Hahnebach 2017-01-30 18:22:28 +01:00
parent 469e391f66
commit 3f08dd5739
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/App/CMakeLists.txt
View File

@ -115,6 +115,7 @@ SET(FemScripts_SRCS
importInpMesh.py importInpMesh.py
importVTKResults.py importVTKResults.py
importZ88Mesh.py importZ88Mesh.py
importZ88Results.py
Init.py Init.py
InitGui.py InitGui.py
FemAnalysis.py FemAnalysis.py
@ -140,7 +141,6 @@ SET(FemScripts_SRCS
FemMaterial.py FemMaterial.py
FemSelectionObserver.py FemSelectionObserver.py
TestFem.py TestFem.py
z88DispReader.py
TaskPanelFemBeamSection.ui TaskPanelFemBeamSection.ui
TaskPanelFemMeshGmsh.ui TaskPanelFemMeshGmsh.ui
TaskPanelFemMeshGroup.ui TaskPanelFemMeshGroup.ui

2
src/Mod/Fem/CMakeLists.txt
View File

@ -116,7 +116,7 @@ INSTALL(
# solver Z88 # solver Z88
importZ88Mesh.py importZ88Mesh.py
z88DispReader.py importZ88Results.py
FemInputWriterZ88.py FemInputWriterZ88.py
FemToolsZ88.py FemToolsZ88.py
FemSolverZ88.py FemSolverZ88.py

4
src/Mod/Fem/FemToolsZ88.py
View File

@ -190,11 +190,11 @@ class FemToolsZ88(FemTools.FemTools):
def load_results_o2(self): def load_results_o2(self):
import os import os
import z88DispReader import importZ88Results
disp_result_file = self.working_dir + '/z88o2.txt' disp_result_file = self.working_dir + '/z88o2.txt'
if os.path.isfile(disp_result_file): if os.path.isfile(disp_result_file):
result_name_prefix = 'Z88_' + self.solver.AnalysisType + '_' result_name_prefix = 'Z88_' + self.solver.AnalysisType + '_'
z88DispReader.import_z88_disp(disp_result_file, self.analysis, result_name_prefix) importZ88Results.import_z88_disp(disp_result_file, self.analysis, result_name_prefix)
for m in self.analysis.Member: for m in self.analysis.Member:
if m.isDerivedFrom("Fem::FemResultObject"): if m.isDerivedFrom("Fem::FemResultObject"):
self.results_present = True self.results_present = True

2
src/Mod/Fem/Init.py
View File

@ -40,4 +40,4 @@ FreeCAD.addImportType("CalculiX result (*.frd)", "ccxFrdReader")
FreeCAD.addImportType("Mesh from Calculix/Abaqus input file (*.inp)", "importInpMesh") FreeCAD.addImportType("Mesh from Calculix/Abaqus input file (*.inp)", "importInpMesh")
FreeCAD.addImportType("Z88 mesh file (*.txt)", "importZ88Mesh") FreeCAD.addImportType("Z88 mesh file (*.txt)", "importZ88Mesh")
FreeCAD.addExportType("Z88 mesh file (*.txt)", "importZ88Mesh") FreeCAD.addExportType("Z88 mesh file (*.txt)", "importZ88Mesh")
FreeCAD.addImportType("Z88 displacement result file (*.txt)", "z88DispReader") FreeCAD.addImportType("Z88 result file (*.txt)", "importZ88Results")

6
src/Mod/Fem/z88DispReader.py → src/Mod/Fem/importZ88Results.py
View File

@ -24,7 +24,7 @@ __title__ = "FreeCAD Z88 Disp Reader"
__author__ = "Bernd Hahnebach " __author__ = "Bernd Hahnebach "
__url__ = "http://www.freecadweb.org" __url__ = "http://www.freecadweb.org"
## @package z88DispReader ## @package importZ88Results
# \ingroup FEM # \ingroup FEM
import FreeCAD import FreeCAD
@ -141,9 +141,9 @@ def read_z88_disp(z88_disp_input):
pure usage: pure usage:
import FemToolsZ88 import FemToolsZ88
fea = FemToolsZ88.FemToolsZ88() fea = FemToolsZ88.FemToolsZ88()
import z88dispReader import importZ88Results
disp_file = '/pathtofile/z88o2.txt' disp_file = '/pathtofile/z88o2.txt'
z88DispReader.import_z88_disp(disp_file , fea.analysis) importZ88Results.import_z88_disp(disp_file , fea.analysis)
The FreeCAD file needs to have an Analysis and an appropiate FEM Mesh The FreeCAD file needs to have an Analysis and an appropiate FEM Mesh
''' '''