diff --git a/src/Mod/Fem/FemGmshTools.py b/src/Mod/Fem/FemGmshTools.py index 1831138af8ec..d3ec237c83e5 100644 --- a/src/Mod/Fem/FemGmshTools.py +++ b/src/Mod/Fem/FemGmshTools.py @@ -58,11 +58,11 @@ def __init__(self, gmsh_mesh_obj, analysis=None): self.clmin = Units.Quantity(self.mesh_obj.CharacteristicLengthMin).Value # order - # known_element_orders = ['Automatic', '1st', '2nd'] + # known_element_orders = ['1st', '2nd'] self.order = self.mesh_obj.ElementOrder if self.order == '1st': self.order = '1' - elif self.order == 'Automatic' or self.order == '2nd': + elif self.order == '2nd': self.order = '2' else: print('Error in order') diff --git a/src/Mod/Fem/TaskPanelFemMeshGmsh.ui b/src/Mod/Fem/TaskPanelFemMeshGmsh.ui index 48f738a8ace1..cb1f13acaf80 100644 --- a/src/Mod/Fem/TaskPanelFemMeshGmsh.ui +++ b/src/Mod/Fem/TaskPanelFemMeshGmsh.ui @@ -42,23 +42,13 @@ - - - Mesh element order: - - - - - - - Max element size (0.0 = Auto): - + @@ -95,14 +85,14 @@ - + Min element size (0.0 = Auto): - + diff --git a/src/Mod/Fem/_FemMeshGmsh.py b/src/Mod/Fem/_FemMeshGmsh.py index 2e956e91d8a5..82dadff8ec96 100644 --- a/src/Mod/Fem/_FemMeshGmsh.py +++ b/src/Mod/Fem/_FemMeshGmsh.py @@ -34,7 +34,7 @@ class _FemMeshGmsh(): # they will be used from the task panel too, thus they need to be outside of the __init__ known_element_dimensions = ['Automatic', '1D', '2D', '3D'] - known_element_orders = ['Automatic', '1st', '2nd'] + known_element_orders = ['1st', '2nd'] known_mesh_algorithm_2D = ['Automatic', 'MeshAdapt', 'Delaunay', 'Frontal', 'BAMG', 'DelQuad'] known_mesh_algorithm_3D = ['Automatic', 'Delaunay', 'New Delaunay', 'Frontal', 'Frontal Delaunay', 'Frontal Hex', 'MMG3D', 'R-tree'] @@ -59,9 +59,9 @@ def __init__(self, obj): obj.ElementDimension = _FemMeshGmsh.known_element_dimensions obj.ElementDimension = 'Automatic' # according ShapeType of Part to mesh - obj.addProperty("App::PropertyEnumeration", "ElementOrder", "FEM GMSH Mesh Params", "Order of mesh elements (Auto will be 2nd)") + obj.addProperty("App::PropertyEnumeration", "ElementOrder", "FEM GMSH Mesh Params", "Order of mesh elements") obj.ElementOrder = _FemMeshGmsh.known_element_orders - obj.ElementOrder = 'Automatic' # = 2nd + obj.ElementOrder = '2nd' obj.addProperty("App::PropertyBool", "OptimizeStd", "FEM GMSH Mesh Params", "Optimize tetra elements") obj.OptimizeStd = True diff --git a/src/Mod/Fem/_TaskPanelFemMeshGmsh.py b/src/Mod/Fem/_TaskPanelFemMeshGmsh.py index 8aae5d84872b..50bfabccf764 100644 --- a/src/Mod/Fem/_TaskPanelFemMeshGmsh.py +++ b/src/Mod/Fem/_TaskPanelFemMeshGmsh.py @@ -51,11 +51,9 @@ def __init__(self, obj): QtCore.QObject.connect(self.form.if_max, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.max_changed) QtCore.QObject.connect(self.form.if_min, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.min_changed) QtCore.QObject.connect(self.form.cb_dimension, QtCore.SIGNAL("activated(int)"), self.choose_dimension) - QtCore.QObject.connect(self.form.cb_order, QtCore.SIGNAL("activated(int)"), self.choose_order) QtCore.QObject.connect(self.Timer, QtCore.SIGNAL("timeout()"), self.update_timer_text) self.form.cb_dimension.addItems(_FemMeshGmsh._FemMeshGmsh.known_element_dimensions) - self.form.cb_order.addItems(_FemMeshGmsh._FemMeshGmsh.known_element_orders) self.get_mesh_params() self.get_active_analysis() @@ -80,13 +78,11 @@ def clicked(self, button): def get_mesh_params(self): 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.CharacteristicLengthMax = self.clmax self.mesh_obj.CharacteristicLengthMin = self.clmin - self.mesh_obj.ElementOrder = self.order self.mesh_obj.ElementDimension = self.dimension def update(self): @@ -95,8 +91,6 @@ def update(self): self.form.if_min.setText(self.clmin.UserString) index_dimension = self.form.cb_dimension.findText(self.dimension) self.form.cb_dimension.setCurrentIndex(index_dimension) - index_order = self.form.cb_order.findText(self.order) - self.form.cb_order.setCurrentIndex(index_order) def console_log(self, message="", color="#000000"): self.console_message_gmsh = self.console_message_gmsh + '{0:4.1f}: {2}
'.\ @@ -123,12 +117,6 @@ def choose_dimension(self, index): self.form.cb_dimension.setCurrentIndex(index) self.dimension = str(self.form.cb_dimension.itemText(index)) # form returns unicode - def choose_order(self, index): - if index < 0: - return - self.form.cb_order.setCurrentIndex(index) - self.order = str(self.form.cb_order.itemText(index)) # form returns unicode - def run_gmsh(self): QApplication.setOverrideCursor(Qt.WaitCursor) self.Start = time.time()