From 060433ef631247188bebdc7c193938f26f46cfe8 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 6 Jan 2020 07:58:38 +0100 Subject: [PATCH] FEM: improve logs --- src/Mod/Fem/femmesh/meshtools.py | 16 ++++++++-------- src/Mod/Fem/femsolver/calculix/writer.py | 3 ++- src/Mod/Fem/femsolver/writerbase.py | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py index ee1813d066..4db425a4a5 100644 --- a/src/Mod/Fem/femmesh/meshtools.py +++ b/src/Mod/Fem/femmesh/meshtools.py @@ -40,13 +40,13 @@ def get_femnodes_by_femobj_with_references( node_set = get_femmesh_groupdata_sets_by_name(femmesh, femobj, "Node") # FreeCAD.Console.PrintMessage("node_set_group: {}\n".format(node_set)) if node_set: - FreeCAD.Console.PrintMessage( - " Finite element mesh nodes where retrieved " + FreeCAD.Console.PrintLog( + " Finite element mesh nodes where retrieved " "from existent finite element mesh group data.\n" ) if not node_set: - FreeCAD.Console.PrintMessage( - " Finite element mesh nodes will be retrieved " + FreeCAD.Console.PrintLog( + " Finite element mesh nodes will be retrieved " "by searching the appropriate nodes in the finite element mesh.\n" ) node_set = get_femnodes_by_references(femmesh, femobj["Object"].References) @@ -112,7 +112,7 @@ def get_femnodes_by_refshape( # the following method getElement(element) does not return Solid elements r = get_element(ref[0], refelement) FreeCAD.Console.PrintMessage( - " " + " " "ReferenceShape ... Type: {0}, " "Object name: {1}, " "Object label: {2}, " @@ -762,7 +762,7 @@ def get_force_obj_vertex_nodeload_table( for elem in elem_tup: ref_node = o.Shape.getElement(elem) FreeCAD.Console.PrintMessage( - " " + " " "ReferenceShape ... Type: {0}, " "Object name: {1}, " "Object label: {2}, " @@ -801,7 +801,7 @@ def get_force_obj_edge_nodeload_table( for elem in elem_tup: ref_edge = o.Shape.getElement(elem) FreeCAD.Console.PrintMessage( - " " + " " "ReferenceShape ... Type: {0}, " "Object name: {1}, " "Object label: {2}, " @@ -1073,7 +1073,7 @@ def get_force_obj_face_nodeload_table( for elem in elem_tup: ref_face = o.Shape.getElement(elem) FreeCAD.Console.PrintMessage( - " " + " " "ReferenceShape ... Type: {0}, " "Object name: {1}, " "Object label: {2}, " diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index 3eef1757e8..def8e31734 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -99,13 +99,14 @@ class FemInputWriterCcx(writerbase.FemInputWriter): def write_calculix_input_file(self): timestart = time.clock() FreeCAD.Console.PrintMessage("Start writing CalculiX input file\n") + FreeCAD.Console.PrintMessage("Write ccx input file to: {}\n".format(self.file_name)) FreeCAD.Console.PrintLog( "writerbaseCcx --> self.dir_name --> " + self.dir_name + "\n" ) FreeCAD.Console.PrintLog( "writerbaseCcx --> self.main_file_name --> " + self.main_file_name + "\n" ) - FreeCAD.Console.PrintMessage( + FreeCAD.Console.PrintLog( "writerbaseCcx --> self.file_name --> " + self.file_name + "\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 b68e34638c..4e52da72da 100644 --- a/src/Mod/Fem/femsolver/writerbase.py +++ b/src/Mod/Fem/femsolver/writerbase.py @@ -233,22 +233,22 @@ class FemInputWriter(): ) if femobj["RefShapeType"] == "Vertex": FreeCAD.Console.PrintLog( - "load on vertices --> we do not need the " - "femelement_table and femnodes_mesh for node load calculation" + " load on vertices --> The femelement_table " + "and femnodes_mesh are not needed for node load calculation.\n" ) elif femobj["RefShapeType"] == "Face" \ and meshtools.is_solid_femmesh(self.femmesh) \ and not meshtools.has_no_face_data(self.femmesh): FreeCAD.Console.PrintLog( - "solid_mesh with face data --> we do not need the " - "femelement_table but we need the femnodes_mesh for node load calculation" + " solid_mesh with face data --> The femelement_table is not " + "needed but the femnodes_mesh is needed for node load calculation.\n" ) if not self.femnodes_mesh: self.femnodes_mesh = self.femmesh.Nodes else: FreeCAD.Console.PrintLog( - "mesh without needed data --> we need the " - "femelement_table and femnodes_mesh for node load calculation" + " mesh without needed data --> The femelement_table " + "and femnodes_mesh are not needed for node load calculation.\n" ) if not self.femnodes_mesh: self.femnodes_mesh = self.femmesh.Nodes @@ -257,12 +257,12 @@ class FemInputWriter(): self.femmesh ) # get node loads - FreeCAD.Console.PrintMessage( - " Finite element mesh nodes will be retrieved by searching " + FreeCAD.Console.PrintLog( + " Finite element mesh nodes will be retrieved by searching " "the appropriate nodes in the finite element mesh.\n" ) - FreeCAD.Console.PrintMessage( - " The appropriate finite element mesh node load values will " + FreeCAD.Console.PrintLog( + " The appropriate finite element mesh node load values will " "be calculated according to the finite element definition.\n" ) for femobj in self.force_objects: