diff --git a/src/Mod/Fem/feminout/importCcxFrdResults.py b/src/Mod/Fem/feminout/importCcxFrdResults.py index 0fe2024637..b5d1ffa86c 100644 --- a/src/Mod/Fem/feminout/importCcxFrdResults.py +++ b/src/Mod/Fem/feminout/importCcxFrdResults.py @@ -127,7 +127,7 @@ def importFrd( analysis.addObject(res_obj) # complementary result object calculations - import femresult.resulttools as restools + from femresult import resulttools from femtools import femutils if not res_obj.MassFlowRate: # information 1: @@ -143,7 +143,7 @@ def importFrd( # example frd file: https://forum.freecadweb.org/viewtopic.php?t=32649#p274291 if res_mesh_is_compacted is False: # first result set, compact FemMesh and NodeNumbers - res_obj = restools.compact_result(res_obj) + res_obj = resulttools.compact_result(res_obj) res_mesh_is_compacted = True nodenumbers_for_compacted_mesh = res_obj.NodeNumbers else: @@ -151,26 +151,26 @@ def importFrd( res_obj.NodeNumbers = nodenumbers_for_compacted_mesh # fill DisplacementLengths - res_obj = restools.add_disp_apps(res_obj) + res_obj = resulttools.add_disp_apps(res_obj) # fill vonMises - res_obj = restools.add_von_mises(res_obj) + res_obj = resulttools.add_von_mises(res_obj) if res_obj.getParentGroup(): has_reinforced_mat = False for obj in res_obj.getParentGroup().Group: if obj.isDerivedFrom("App::MaterialObjectPython") \ and femutils.is_of_type(obj, "Fem::MaterialReinforced"): has_reinforced_mat = True - restools.add_principal_stress_reinforced(res_obj) + resulttools.add_principal_stress_reinforced(res_obj) break if has_reinforced_mat is False: # fill PrincipalMax, PrincipalMed, PrincipalMin, MaxShear - res_obj = restools.add_principal_stress_std(res_obj) + res_obj = resulttools.add_principal_stress_std(res_obj) else: # if a pure frd file was opened no analysis and thus no parent group # fill PrincipalMax, PrincipalMed, PrincipalMin, MaxShear - res_obj = restools.add_principal_stress_std(res_obj) + res_obj = resulttools.add_principal_stress_std(res_obj) # fill Stats - res_obj = restools.fill_femresult_stats(res_obj) + res_obj = resulttools.fill_femresult_stats(res_obj) else: error_message = ( diff --git a/src/Mod/Fem/femresult/resulttools.py b/src/Mod/Fem/femresult/resulttools.py index 3d39f3f36b..cf8cdd9989 100644 --- a/src/Mod/Fem/femresult/resulttools.py +++ b/src/Mod/Fem/femresult/resulttools.py @@ -565,8 +565,8 @@ def compact_result(res_obj): # as workaround for https://www.freecadweb.org/tracker/view.php?id=2873 # get compact mesh data - from femmesh.meshtools import compact_mesh as cm - compact_femmesh_data = cm(res_obj.Mesh.FemMesh) + from femmesh.meshtools import compact_mesh + compact_femmesh_data = compact_mesh(res_obj.Mesh.FemMesh) compact_femmesh = compact_femmesh_data[0] node_map = compact_femmesh_data[1] # FreeCAD result obj does not support elem results ATM