diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index d9dae88efd..ff80c0c23d 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -131,7 +131,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter): "writerbaseCcx --> self.file_name --> {}\n".format(self.file_name) ) - self.get_mesh_data() + self.get_mesh_sets() self.write_file() FreeCAD.Console.PrintMessage( @@ -146,35 +146,6 @@ class FemInputWriterCcx(writerbase.FemInputWriter): ) return "" - def get_mesh_data(self): - FreeCAD.Console.PrintMessage( - "Get mesh data for " - "node sets (groups), surface sets (groups) and element sets (groups)\n" - ) - - # materials and element geometry element sets getter - self.get_element_sets_material_and_femelement_geometry() - - # constraints element sets getter - self.get_constraints_centrif_elements() - - # constraints node sets getter - self.get_constraints_fixed_nodes() - self.get_constraints_displacement_nodes() - self.get_constraints_planerotation_nodes() - - # constraints suface sets getter - self.get_constraints_contact_faces() - self.get_constraints_tie_faces() - self.get_constraints_sectionprint_faces() - self.get_constraints_transform_nodes() - self.get_constraints_temperature_nodes() - - # constraints sets with constraint data - self.get_constraints_force_nodeloads() - self.get_constraints_pressure_faces() - self.get_constraints_heatflux_faces() - def write_file(self): FreeCAD.Console.PrintMessage("Start writing input file\n") if self.solver_obj.SplitInputWriter is True: diff --git a/src/Mod/Fem/femsolver/writerbase.py b/src/Mod/Fem/femsolver/writerbase.py index 2a2cd170c1..2e2140c67c 100644 --- a/src/Mod/Fem/femsolver/writerbase.py +++ b/src/Mod/Fem/femsolver/writerbase.py @@ -133,7 +133,39 @@ class FemInputWriter(): # use sorted to be sure the order is the same on different runs # be aware a sorted set returns a list, because set are not sorted by default # - done in return value of meshtools.get_femnodes_by_femobj_with_references - # TODO FIXME might be appropriate for element sets too + # TODO FIXME might be appropriate for element sets and surfaceface sets too + + # ******************************************************************************************** + # ******************************************************************************************** + # get all known sets + def get_mesh_sets(self): + FreeCAD.Console.PrintMessage( + "Get mesh data for " + "node sets (groups), surface sets (groups) and element sets (groups)\n" + ) + + # materials and element geometry element sets getter + self.get_element_sets_material_and_femelement_geometry() + + # constraints element sets getter + self.get_constraints_centrif_elements() + + # constraints node sets getter + self.get_constraints_fixed_nodes() + self.get_constraints_displacement_nodes() + self.get_constraints_planerotation_nodes() + + # constraints suface sets getter + self.get_constraints_contact_faces() + self.get_constraints_tie_faces() + self.get_constraints_sectionprint_faces() + self.get_constraints_transform_nodes() + self.get_constraints_temperature_nodes() + + # constraints sets with constraint data + self.get_constraints_force_nodeloads() + self.get_constraints_pressure_faces() + self.get_constraints_heatflux_faces() # ******************************************************************************************** # ********************************************************************************************