Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions CfdOF/Mesh/TaskPanelCfdMesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ def __init__(self, obj):
self.form.radio_explicit_edge_detection.setToolTip("Find surface edges using explicit (eMesh) detection")
self.form.radio_implicit_edge_detection.setToolTip("Find surface edges using implicit detection")

self.form.if_NumberOfProcesses.setToolTip("Number of parallel processes")
self.form.if_NumberOfThreads.setToolTip("Number of parallel threads per process.\n0 means use all available (if NumberOfProcesses = 1) or use 1 (if NumberOfProcesses > 1)")

self.load()
self.updateUI()

Expand Down Expand Up @@ -140,6 +143,8 @@ def load(self):
self.form.if_edgerefine.setValue(self.mesh_obj.EdgeRefinement)
self.form.radio_implicit_edge_detection.setChecked(self.mesh_obj.ImplicitEdgeDetection)
self.form.radio_explicit_edge_detection.setChecked(not self.mesh_obj.ImplicitEdgeDetection)
self.form.if_NumberOfProcesses.setValue(self.mesh_obj.NumberOfProcesses)
self.form.if_NumberOfThreads.setValue(self.mesh_obj.NumberOfThreads)

index_utility = CfdTools.indexOrDefault(list(zip(
CfdMesh.MESHERS, CfdMesh.DIMENSION, CfdMesh.DUAL_CONVERSION)),
Expand Down Expand Up @@ -169,8 +174,15 @@ def updateUI(self):
utility = CfdMesh.MESHERS[self.form.cb_utility.currentIndex()]
if utility == "snappyHexMesh":
self.form.snappySpecificProperties.setVisible(True)
self.form.NumberOfThreads_frame.setVisible(False)
else:
self.form.snappySpecificProperties.setVisible(False)
self.form.NumberOfThreads_frame.setVisible(True)

if utility == "snappyHexMesh" or utility == "cfMesh":
self.form.NumberOfProcesses_frame.setVisible(True)
else:
self.form.NumberOfProcesses_frame.setVisible(False)

def store(self):
mesher_idx = self.form.cb_utility.currentIndex()
Expand All @@ -181,6 +193,8 @@ def store(self):
storeIfChanged(self.mesh_obj, 'EdgeRefinement', self.form.if_edgerefine.value())
storeIfChanged(self.mesh_obj, 'ConvertToDualMesh', CfdMesh.DUAL_CONVERSION[mesher_idx])
storeIfChanged(self.mesh_obj, 'ImplicitEdgeDetection', self.form.radio_implicit_edge_detection.isChecked())
storeIfChanged(self.mesh_obj, 'NumberOfProcesses', self.form.if_NumberOfProcesses.value())
storeIfChanged(self.mesh_obj, 'NumberOfThreads', self.form.if_NumberOfThreads.value())

point_in_mesh = {'x': getQuantity(self.form.if_pointInMeshX),
'y': getQuantity(self.form.if_pointInMeshY),
Expand Down Expand Up @@ -215,12 +229,18 @@ def choose_utility(self, index):
utility = CfdMesh.MESHERS[self.form.cb_utility.currentIndex()]
if utility == "snappyHexMesh":
self.form.snappySpecificProperties.setVisible(True)
self.form.NumberOfThreads_frame.setVisible(False)
if FreeCAD.GuiUp:
FreeCADGui.ActiveDocument.ActiveView.getSceneGraph().addChild(self.prev_point_node)
else:
self.form.snappySpecificProperties.setVisible(False)
self.form.NumberOfThreads_frame.setVisible(True)
if FreeCAD.GuiUp:
FreeCADGui.ActiveDocument.ActiveView.getSceneGraph().removeChild(self.prev_point_node)
if utility == "snappyHexMesh" or utility == "cfMesh":
self.form.NumberOfProcesses_frame.setVisible(True)
else:
self.form.NumberOfProcesses_frame.setVisible(False)

def pointInMeshChanged(self):
if FreeCAD.GuiUp:
Expand Down
92 changes: 92 additions & 0 deletions Gui/TaskPanelCfdMesh.ui
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,98 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="parallel_frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="NumberOfProcesses_frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_NumberOfProcesses">
<property name="text">
<string>Number of Processes</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QSpinBox" name="if_NumberOfProcesses"/>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QFrame" name="NumberOfThreads_frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_NumberOfThreads">
<property name="text">
<string>Number of Threads</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QSpinBox" name="if_NumberOfThreads"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0">
<property name="leftMargin">
Expand Down
4 changes: 0 additions & 4 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ for the user. Generally improve the logging and messages that are printed there.

Add a task panel and allow editing case path

## Meshing

* Expose parallel option in GUI

## Solver

* Add a mechanism to specify surface tension coefficients between each pair of fluids
Expand Down