From ea60b6551802830e9befaa720ddc57eb004cb947 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 29 Jan 2019 23:51:06 +0100 Subject: [PATCH] FEM: result reader, better identifier name --- src/Mod/Fem/feminout/importCcxFrdResults.py | 15 ++++++++------- src/Mod/Fem/feminout/importZ88O2Results.py | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Mod/Fem/feminout/importCcxFrdResults.py b/src/Mod/Fem/feminout/importCcxFrdResults.py index 9b61e85627..54ff7e5f13 100644 --- a/src/Mod/Fem/feminout/importCcxFrdResults.py +++ b/src/Mod/Fem/feminout/importCcxFrdResults.py @@ -102,16 +102,17 @@ def importFrd(filename, analysis=None, result_name_prefix=None): else: results_name = result_name_prefix + 'results' - results = ObjectsFem.makeResultMechanical(FreeCAD.ActiveDocument, results_name) - results.Mesh = result_mesh_object - results = importToolsFem.fill_femresult_mechanical(results, result_set, span) - if not results.MassFlowRate: + res_obj = ObjectsFem.makeResultMechanical(FreeCAD.ActiveDocument, results_name) + res_obj.Mesh = result_mesh_object + res_obj = importToolsFem.fill_femresult_mechanical(res_obj, result_set) + if analysis: + analysis_object.addObject(res_obj) + # complementary result object calculations + if not res_obj.MassFlowRate: # only compact result if not Flow 1D results # compact result object, workaround for bug 2873, https://www.freecadweb.org/tracker/view.php?id=2873 from femresult.resulttools import compact_result as rs - results = rs(results) - if analysis: - analysis_object.addObject(results) + res_obj = rs(res_obj) else: error_message = ( "We have nodes but no results in frd file, which means we only have a mesh in frd file. " diff --git a/src/Mod/Fem/feminout/importZ88O2Results.py b/src/Mod/Fem/feminout/importZ88O2Results.py index 1d8aa895a4..5ba9064eb2 100644 --- a/src/Mod/Fem/feminout/importZ88O2Results.py +++ b/src/Mod/Fem/feminout/importZ88O2Results.py @@ -95,11 +95,11 @@ def import_z88_disp(filename, analysis=None, result_name_prefix=None): for result_set in disp_read['Results']: results_name = result_name_prefix + 'results' - results = ObjectsFem.makeResultMechanical(FreeCAD.ActiveDocument, results_name) - results.Mesh = result_mesh_object - results = importToolsFem.fill_femresult_mechanical(results, result_set, 0) + res_obj = ObjectsFem.makeResultMechanical(FreeCAD.ActiveDocument, results_name) + res_obj.Mesh = result_mesh_object + res_obj = importToolsFem.fill_femresult_mechanical(res_obj, result_set, 0) if analysis: - analysis_object.addObject(results) + analysis_object.addObject(res_obj) if FreeCAD.GuiUp: if analysis: