diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index e0e7dacb2..cd8c8b3df 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -111,9 +111,9 @@ SET(FemScripts_SRCS _ViewProviderFemSolverCalculix.py _ViewProviderFemSolverZ88.py _ViewProviderFemMaterial.py - ccxDatReader.py - ccxFrdReader.py convert2TetGen.py + importCcxDatResults.py + importCcxFrdResults.py importInpMesh.py importVTKResults.py importZ88Mesh.py diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index f5b91a991..61564edf7 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1078,7 +1078,7 @@ void FemMesh::writeABAQUS(const std::string &Filename) const static std::map faceTypeMap; static std::map volTypeMap; if (elemOrderMap.empty()) { - // node order fits with node order in ccxFrdReader.py module to import CalculiX result meshes + // node order fits with node order in importCcxFrdResults.py module to import CalculiX result meshes // dimension 1 // diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 3d7f8e12a..5e44cdf0e 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -106,8 +106,8 @@ INSTALL( # solver CalculiX ccx importInpMesh.py - ccxDatReader.py - ccxFrdReader.py + importCcxDatResults.py + importCcxFrdResults.py FemInputWriterCcx.py FemToolsCcx.py FemSolverCalculix.py diff --git a/src/Mod/Fem/FemToolsCcx.py b/src/Mod/Fem/FemToolsCcx.py index 58540573a..5fa27b331 100644 --- a/src/Mod/Fem/FemToolsCcx.py +++ b/src/Mod/Fem/FemToolsCcx.py @@ -233,11 +233,11 @@ class FemToolsCcx(FemTools.FemTools): # @param self The python object self def load_results_ccxfrd(self): import os - import ccxFrdReader + import 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 + '_' - ccxFrdReader.importFrd(frd_result_file, self.analysis, result_name_prefix) + importCcxFrdResults.importFrd(frd_result_file, self.analysis, result_name_prefix) for m in self.analysis.Member: if m.isDerivedFrom("Fem::FemResultObject"): self.results_present = True @@ -251,10 +251,10 @@ class FemToolsCcx(FemTools.FemTools): # @param self The python object self def load_results_ccxdat(self): import os - import ccxDatReader + import importCcxDatResults dat_result_file = os.path.splitext(self.inp_file_name)[0] + '.dat' if os.path.isfile(dat_result_file): - mode_frequencies = ccxDatReader.import_dat(dat_result_file, self.analysis) + mode_frequencies = importCcxDatResults.import_dat(dat_result_file, self.analysis) else: raise Exception('FEM: No .dat results found at {}!'.format(dat_result_file)) if mode_frequencies: diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py index 2f9386e53..63635c68e 100644 --- a/src/Mod/Fem/Init.py +++ b/src/Mod/Fem/Init.py @@ -36,7 +36,7 @@ if("BUILD_FEM_VTK" in FreeCAD.__cmake__): FreeCAD.addExportType("FEM CFD Result in VTK format (*.vtk *.vtu)", "importVTKResults") FreeCAD.addExportType("FEM formats (*.unv *.med *.dat *.inp)", "Fem") -FreeCAD.addImportType("CalculiX result (*.frd)", "ccxFrdReader") +FreeCAD.addImportType("CalculiX result (*.frd)", "importCcxFrdResults") FreeCAD.addImportType("Mesh from Calculix/Abaqus input file (*.inp)", "importInpMesh") FreeCAD.addImportType("Z88 mesh file (*.txt)", "importZ88Mesh") FreeCAD.addExportType("Z88 mesh file (*.txt)", "importZ88Mesh") diff --git a/src/Mod/Fem/ccxDatReader.py b/src/Mod/Fem/importCcxDatResults.py similarity index 98% rename from src/Mod/Fem/ccxDatReader.py rename to src/Mod/Fem/importCcxDatResults.py index ebda82e4b..5bc5e170f 100644 --- a/src/Mod/Fem/ccxDatReader.py +++ b/src/Mod/Fem/importCcxDatResults.py @@ -20,11 +20,11 @@ # * * # *************************************************************************** -__title__ = "ccxDatReader" +__title__ = "importCcxDatResults" __author__ = "Przemo Firszt" __url__ = "http://www.freecadweb.org" -## @package ccxDatReader +## @package importCcxDatResults # \ingroup FEM import FreeCAD diff --git a/src/Mod/Fem/ccxFrdReader.py b/src/Mod/Fem/importCcxFrdResults.py similarity index 99% rename from src/Mod/Fem/ccxFrdReader.py rename to src/Mod/Fem/importCcxFrdResults.py index 58df3fefb..b2ab1540a 100644 --- a/src/Mod/Fem/ccxFrdReader.py +++ b/src/Mod/Fem/importCcxFrdResults.py @@ -26,7 +26,7 @@ __title__ = "FreeCAD Calculix library" __author__ = "Juergen Riegel , Michael Hindley, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ccxFrdReader +## @package importCcxFrdResults # \ingroup FEM import FreeCAD