diff --git a/src/Mod/Fem/FemGmshTools.py b/src/Mod/Fem/FemGmshTools.py index 26fd8d728f..1923003c51 100644 --- a/src/Mod/Fem/FemGmshTools.py +++ b/src/Mod/Fem/FemGmshTools.py @@ -48,13 +48,13 @@ class FemGmshTools(): # part to mesh self.part_obj = self.mesh_obj.Part - # clmax, ElementSizeMax: float, 0.0 = 1e+22 - self.clmax = Units.Quantity(self.mesh_obj.ElementSizeMax).Value + # clmax, CharacteristicLengthMax: float, 0.0 = 1e+22 + self.clmax = Units.Quantity(self.mesh_obj.CharacteristicLengthMax).Value if self.clmax == 0.0: self.clmax = 1e+22 - # clmin, ElementSizeMin: float - self.clmin = Units.Quantity(self.mesh_obj.ElementSizeMin).Value + # clmin, CharacteristicLengthMin: float + self.clmin = Units.Quantity(self.mesh_obj.CharacteristicLengthMin).Value # order, ElementOrder: ['Auto', '1st', '2nd'] self.order = self.mesh_obj.ElementOrder @@ -71,8 +71,8 @@ class FemGmshTools(): def create_mesh(self): print("\nWe gone start GMSH FEM mesh run!") print(' Part to mesh: Name --> ' + self.part_obj.Name + ', Label --> ' + self.part_obj.Label + ', ShapeType --> ' + self.part_obj.Shape.ShapeType) - print(' ElementSizeMax: ' + str(self.clmax)) - print(' ElementSizeMin: ' + str(self.clmin)) + print(' CharacteristicLengthMax: ' + str(self.clmax)) + print(' CharacteristicLengthMin: ' + str(self.clmin)) print(' ElementOrder: ' + self.order) self.get_dimension() self.get_tmp_file_paths() diff --git a/src/Mod/Fem/_FemMeshGmsh.py b/src/Mod/Fem/_FemMeshGmsh.py index ea29ad8a30..7e1279e04b 100644 --- a/src/Mod/Fem/_FemMeshGmsh.py +++ b/src/Mod/Fem/_FemMeshGmsh.py @@ -44,11 +44,11 @@ class _FemMeshGmsh(): obj.addProperty("App::PropertyLink", "Part", "FEM Mesh", "Part object to mesh") obj.Part = None - obj.addProperty("App::PropertyLength", "ElementSizeMax", "FEM Mesh Params", "Max mesh element size (0.0 = infinity)") - obj.ElementSizeMax = 0.0 # will be 1e+22 + obj.addProperty("App::PropertyLength", "CharacteristicLengthMax", "FEM Mesh Params", "Max mesh element size (0.0 = infinity)") + obj.CharacteristicLengthMax = 0.0 # will be 1e+22 - obj.addProperty("App::PropertyLength", "ElementSizeMin", "FEM Mesh Params", "Min mesh element size") - obj.ElementSizeMin = 0.0 + obj.addProperty("App::PropertyLength", "CharacteristicLengthMin", "FEM Mesh Params", "Min mesh element size") + obj.CharacteristicLengthMin = 0.0 obj.addProperty("App::PropertyEnumeration", "ElementDimension", "FEM Mesh Params", "Dimension of mesh elements (Auto = according ShapeType of part to mesh)") obj.ElementDimension = _FemMeshGmsh.known_element_dimensions diff --git a/src/Mod/Fem/_TaskPanelFemMeshGmsh.py b/src/Mod/Fem/_TaskPanelFemMeshGmsh.py index 0a9d0a42a2..0b4b4913e8 100644 --- a/src/Mod/Fem/_TaskPanelFemMeshGmsh.py +++ b/src/Mod/Fem/_TaskPanelFemMeshGmsh.py @@ -78,14 +78,14 @@ class _TaskPanelFemMeshGmsh: self.run_gmsh() def get_mesh_params(self): - self.clmax = self.mesh_obj.ElementSizeMax - self.clmin = self.mesh_obj.ElementSizeMin + self.clmax = self.mesh_obj.CharacteristicLengthMax + self.clmin = self.mesh_obj.CharacteristicLengthMin self.order = self.mesh_obj.ElementOrder self.dimension = self.mesh_obj.ElementDimension def set_mesh_params(self): - self.mesh_obj.ElementSizeMax = self.clmax - self.mesh_obj.ElementSizeMin = self.clmin + self.mesh_obj.CharacteristicLengthMax = self.clmax + self.mesh_obj.CharacteristicLengthMin = self.clmin self.mesh_obj.ElementOrder = self.order self.mesh_obj.ElementDimension = self.dimension