kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: ccx results name improvements

Browse Source
This commit is contained in:
Bernd Hahnebach
2021-06-24 17:59:17 +02:00
parent 4ef2769402
commit 79b41f7393
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Fem/feminout/importCcxFrdResults.py
View File

@@ -108,7 +108,7 @@ def importFrd(
step_time = round(step_time, 2) step_time = round(step_time, 2)
if eigenmode_number > 0: if eigenmode_number > 0:
results_name = ( results_name = (
"{}Mode{}_Results" "{}EigenMode_{}_Results"
.format(result_name_prefix, eigenmode_number) .format(result_name_prefix, eigenmode_number)
) )
elif number_of_increments > 1: elif number_of_increments > 1:
@@ -116,13 +116,13 @@ def importFrd(
if result_analysis_type == "buckling": if result_analysis_type == "buckling":
results_name = ( results_name = (
"{}BucklingFactor{}_Results" "{}BucklingFactor_{}_Results"
.format(result_name_prefix, step_time) .format(result_name_prefix, step_time)
) )
else: else:
results_name = ( results_name = (
"{}Time{}_Results" "{}Time_{}_Results"
.format(result_name_prefix, step_time) .format(result_name_prefix, step_time)
) )
else: else:

7
src/Mod/Fem/femtools/ccxtools.py
View File

@@ -784,7 +784,12 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject):
import feminout.importCcxFrdResults as importCcxFrdResults import feminout.importCcxFrdResults as importCcxFrdResults
frd_result_file = os.path.splitext(self.inp_file_name)[0] + ".frd" frd_result_file = os.path.splitext(self.inp_file_name)[0] + ".frd"
if os.path.isfile(frd_result_file): if os.path.isfile(frd_result_file):
importCcxFrdResults.importFrd(frd_result_file, self.analysis, "CCX_", self.solver.AnalysisType) importCcxFrdResults.importFrd(
frd_result_file,
self.analysis,
"CCX_",
self.solver.AnalysisType
)
for m in self.analysis.Group: for m in self.analysis.Group:
if m.isDerivedFrom("Fem::FemResultObject"): if m.isDerivedFrom("Fem::FemResultObject"):
self.results_present = True self.results_present = True