From e2e012e2d0f651298fc5b2858b2a6a9ef028170c Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 11 Jul 2021 13:49:16 +0200 Subject: [PATCH] FEM: calculix writer, rename set writing methods to a generic one --- src/Mod/Fem/femsolver/calculix/con_centrif.py | 2 +- src/Mod/Fem/femsolver/calculix/con_contact.py | 2 +- .../femsolver/calculix/con_displacement.py | 2 +- src/Mod/Fem/femsolver/calculix/con_fixed.py | 2 +- src/Mod/Fem/femsolver/calculix/con_force.py | 2 +- .../Fem/femsolver/calculix/con_heatflux.py | 2 +- .../femsolver/calculix/con_planerotation.py | 2 +- .../Fem/femsolver/calculix/con_pressure.py | 2 +- .../femsolver/calculix/con_sectionprint.py | 2 +- .../Fem/femsolver/calculix/con_temperature.py | 2 +- src/Mod/Fem/femsolver/calculix/con_tie.py | 2 +- .../Fem/femsolver/calculix/con_transform.py | 2 +- src/Mod/Fem/femsolver/calculix/writer.py | 24 +++++++++---------- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Mod/Fem/femsolver/calculix/con_centrif.py b/src/Mod/Fem/femsolver/calculix/con_centrif.py index b02e5f5862..0ddca10a56 100644 --- a/src/Mod/Fem/femsolver/calculix/con_centrif.py +++ b/src/Mod/Fem/femsolver/calculix/con_centrif.py @@ -44,7 +44,7 @@ def get_constraint_title(): return "Centrif Constraints" -def write_elements(f, femobj, centrif_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, centrif_obj, ccxwriter): f.write("*ELSET,ELSET={}\n".format(centrif_obj.Name)) # use six to be sure to be Python 2.7 and 3.x compatible if isinstance(femobj["FEMElements"], six.string_types): diff --git a/src/Mod/Fem/femsolver/calculix/con_contact.py b/src/Mod/Fem/femsolver/calculix/con_contact.py index 344bb7069a..cd082e6fef 100644 --- a/src/Mod/Fem/femsolver/calculix/con_contact.py +++ b/src/Mod/Fem/femsolver/calculix/con_contact.py @@ -38,7 +38,7 @@ def get_constraint_title(): return "Contact Constraints" -def write_surfacefaces(f, femobj, contact_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, contact_obj, ccxwriter): # slave DEP f.write("*SURFACE, NAME=DEP{}\n".format(contact_obj.Name)) for i in femobj["ContactSlaveFaces"]: diff --git a/src/Mod/Fem/femsolver/calculix/con_displacement.py b/src/Mod/Fem/femsolver/calculix/con_displacement.py index 3469f1ef91..8d05d33298 100644 --- a/src/Mod/Fem/femsolver/calculix/con_displacement.py +++ b/src/Mod/Fem/femsolver/calculix/con_displacement.py @@ -38,7 +38,7 @@ def get_constraint_title(): return "Displacement constraint applied" -def write_nodes(f, femobj, disp_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, disp_obj, ccxwriter): f.write("*NSET,NSET={}\n".format(disp_obj.Name)) for n in femobj["Nodes"]: f.write("{},\n".format(n)) diff --git a/src/Mod/Fem/femsolver/calculix/con_fixed.py b/src/Mod/Fem/femsolver/calculix/con_fixed.py index f5d173f4ae..8ac0e8874f 100644 --- a/src/Mod/Fem/femsolver/calculix/con_fixed.py +++ b/src/Mod/Fem/femsolver/calculix/con_fixed.py @@ -38,7 +38,7 @@ def get_constraint_title(): return "Fixed Constraints" -def write_nodes(f, femobj, fix_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, fix_obj, ccxwriter): if ( ccxwriter.femmesh.Volumes and (len(ccxwriter.shellthickness_objects) > 0 or len(ccxwriter.beamsection_objects) > 0) diff --git a/src/Mod/Fem/femsolver/calculix/con_force.py b/src/Mod/Fem/femsolver/calculix/con_force.py index 01d7945ca9..a0fe6a4141 100644 --- a/src/Mod/Fem/femsolver/calculix/con_force.py +++ b/src/Mod/Fem/femsolver/calculix/con_force.py @@ -34,7 +34,7 @@ def get_sets_name(): return "constraints_force_node_loads" -def write_nodeloads(f, femobj, force_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, force_obj, ccxwriter): direction_vec = femobj["Object"].DirectionVector for ref_shape in femobj["NodeLoadTable"]: f.write("** " + ref_shape[0] + "\n") diff --git a/src/Mod/Fem/femsolver/calculix/con_heatflux.py b/src/Mod/Fem/femsolver/calculix/con_heatflux.py index 3ed841c315..b7710244d2 100644 --- a/src/Mod/Fem/femsolver/calculix/con_heatflux.py +++ b/src/Mod/Fem/femsolver/calculix/con_heatflux.py @@ -34,7 +34,7 @@ def get_sets_name(): return "constraints_heatflux_element_face_heatflux" -def write_heatflux(f, femobj, heatflux_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, heatflux_obj, ccxwriter): if heatflux_obj.ConstraintType == "Convection": heatflux_key_word = "FILM" heatflux_facetype = "F" diff --git a/src/Mod/Fem/femsolver/calculix/con_planerotation.py b/src/Mod/Fem/femsolver/calculix/con_planerotation.py index cd75d3cb22..52b70c0492 100644 --- a/src/Mod/Fem/femsolver/calculix/con_planerotation.py +++ b/src/Mod/Fem/femsolver/calculix/con_planerotation.py @@ -41,7 +41,7 @@ def get_constraint_title(): return "PlaneRotation Constraints" -def write_nodes(f, femobj, fric_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, fric_obj, ccxwriter): # write nodes to file if not ccxwriter.femnodes_mesh: ccxwriter.femnodes_mesh = ccxwriter.femmesh.Nodes diff --git a/src/Mod/Fem/femsolver/calculix/con_pressure.py b/src/Mod/Fem/femsolver/calculix/con_pressure.py index 4814c997f4..88075f076b 100644 --- a/src/Mod/Fem/femsolver/calculix/con_pressure.py +++ b/src/Mod/Fem/femsolver/calculix/con_pressure.py @@ -34,7 +34,7 @@ def get_sets_name(): return "constraints_pressure_element_face_loads" -def write_pressure(f, femobj, prs_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, prs_obj, ccxwriter): rev = -1 if prs_obj.Reversed else 1 f.write("*DLOAD\n") for ref_shape in femobj["PressureFaces"]: diff --git a/src/Mod/Fem/femsolver/calculix/con_sectionprint.py b/src/Mod/Fem/femsolver/calculix/con_sectionprint.py index e9bb2208cf..1ffc4b1a9a 100644 --- a/src/Mod/Fem/femsolver/calculix/con_sectionprint.py +++ b/src/Mod/Fem/femsolver/calculix/con_sectionprint.py @@ -38,7 +38,7 @@ def get_constraint_title(): return "SectionPrint Constraints" -def write_surfacefaces(f, femobj, sectionprint_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, sectionprint_obj, ccxwriter): f.write("*SURFACE, NAME=SECTIONFACE{}\n".format(sectionprint_obj.Name)) for i in femobj["SectionPrintFaces"]: f.write("{},S{}\n".format(i[0], i[1])) diff --git a/src/Mod/Fem/femsolver/calculix/con_temperature.py b/src/Mod/Fem/femsolver/calculix/con_temperature.py index 4904040055..ad01e48aed 100644 --- a/src/Mod/Fem/femsolver/calculix/con_temperature.py +++ b/src/Mod/Fem/femsolver/calculix/con_temperature.py @@ -38,7 +38,7 @@ def get_constraint_title(): return "Fixed temperature constraint applied" -def write_nodes(f, femobj, temp_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, temp_obj, ccxwriter): f.write("*NSET,NSET={}\n".format(temp_obj.Name)) for n in femobj["Nodes"]: f.write("{},\n".format(n)) diff --git a/src/Mod/Fem/femsolver/calculix/con_tie.py b/src/Mod/Fem/femsolver/calculix/con_tie.py index 927bcf2de1..6602a86466 100644 --- a/src/Mod/Fem/femsolver/calculix/con_tie.py +++ b/src/Mod/Fem/femsolver/calculix/con_tie.py @@ -38,7 +38,7 @@ def get_constraint_title(): return "Tie Constraints" -def write_surfacefaces(f, femobj, tie_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, tie_obj, ccxwriter): # slave DEP f.write("*SURFACE, NAME=TIE_DEP{}\n".format(tie_obj.Name)) for i in femobj["TieSlaveFaces"]: diff --git a/src/Mod/Fem/femsolver/calculix/con_transform.py b/src/Mod/Fem/femsolver/calculix/con_transform.py index b8f23823c2..bbe187a7ac 100644 --- a/src/Mod/Fem/femsolver/calculix/con_transform.py +++ b/src/Mod/Fem/femsolver/calculix/con_transform.py @@ -41,7 +41,7 @@ def get_constraint_title(): return "Transform Constraints" -def write_nodes(f, femobj, trans_obj, ccxwriter): +def write_meshdata_constraint(f, femobj, trans_obj, ccxwriter): if trans_obj.TransformType == "Rectangular": f.write("*NSET,NSET=Rect{}\n".format(trans_obj.Name)) elif trans_obj.TransformType == "Cylindrical": diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index 2c0b9428b3..f383cefbb8 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -373,7 +373,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.fixed_objects, analysis_types=con_fixed.get_analysis_types(), write_name=con_fixed.get_sets_name(), - sets_writer_method=con_fixed.write_nodes, + sets_writer_method=con_fixed.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -395,7 +395,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.displacement_objects, analysis_types=con_displacement.get_analysis_types(), write_name=con_displacement.get_sets_name(), - sets_writer_method=con_displacement.write_nodes, + sets_writer_method=con_displacement.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -418,7 +418,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.planerotation_objects, analysis_types=con_planerotation.get_analysis_types(), write_name=con_planerotation.get_sets_name(), - sets_writer_method=con_planerotation.write_nodes, + sets_writer_method=con_planerotation.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -440,7 +440,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.contact_objects, analysis_types=con_contact.get_analysis_types(), write_name=con_contact.get_sets_name(), - sets_writer_method=con_contact.write_surfacefaces, + sets_writer_method=con_contact.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -462,7 +462,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.tie_objects, analysis_types=con_tie.get_analysis_types(), write_name=con_tie.get_sets_name(), - sets_writer_method=con_tie.write_surfacefaces, + sets_writer_method=con_tie.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -484,7 +484,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.sectionprint_objects, analysis_types=con_sectionprint.get_analysis_types(), write_name=con_sectionprint.get_sets_name(), - sets_writer_method=con_sectionprint.write_surfacefaces, + sets_writer_method=con_sectionprint.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -506,7 +506,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.transform_objects, analysis_types=con_transform.get_analysis_types(), write_name=con_transform.get_sets_name(), - sets_writer_method=con_transform.write_nodes, + sets_writer_method=con_transform.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -528,7 +528,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.temperature_objects, analysis_types=con_temperature.get_analysis_types(), write_name=con_temperature.get_sets_name(), - sets_writer_method=con_temperature.write_nodes, + sets_writer_method=con_temperature.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -602,7 +602,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.centrif_objects, analysis_types=con_centrif.get_analysis_types(), write_name=con_centrif.get_sets_name(), - sets_writer_method=con_centrif.write_elements, + sets_writer_method=con_centrif.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -624,7 +624,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.force_objects, analysis_types=con_force.get_analysis_types(), write_name=con_force.get_sets_name(), - sets_writer_method=con_force.write_nodeloads, + sets_writer_method=con_force.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, write_before="*CLOAD\n" ) @@ -637,7 +637,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.pressure_objects, analysis_types=con_pressure.get_analysis_types(), write_name=con_pressure.get_sets_name(), - sets_writer_method=con_pressure.write_pressure, + sets_writer_method=con_pressure.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, ) @@ -649,7 +649,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): femobjs=self.heatflux_objects, analysis_types=con_heatflux.get_analysis_types(), write_name=con_heatflux.get_sets_name(), - sets_writer_method=con_heatflux.write_heatflux, + sets_writer_method=con_heatflux.write_meshdata_constraint, caller_method_name=sys._getframe().f_code.co_name, )