Merge branch 'develop' into feature/add-srf-option

_TaskPanelCfdZone.py

@@ -41,6 +41,7 @@ def __init__(self, obj):
         FreeCADGui.Selection.clearSelection()
         self.sel_server = None
         self.obj = obj
+        self.analysis_obj = CfdTools.getParentAnalysisObject(obj)
 
         self.ShapeRefsOrig = list(self.obj.ShapeRefs)
         self.NeedsCaseRewriteOrig = self.analysis_obj.NeedsCaseRewrite
@@ -297,7 +298,7 @@ def accept(self):
             storeIfChanged(self.obj, 'PressureSpecified', self.form.checkPressure.isChecked())
             storeIfChanged(self.obj, 'Pressure', getQuantity(self.form.inputPressure))
             storeIfChanged(self.obj, 'VolumeFractionSpecified', self.form.checkAlpha.isChecked())
-            storeIfChanged(self.obj, 'VolumeFractionSpecified', self.alphas)
+            storeIfChanged(self.obj, 'VolumeFractions', self.alphas)
 
         if self.obj.ShapeRefs != self.ShapeRefsOrig:
             refstr = "FreeCAD.ActiveDocument.{}.ShapeRefs = [\n".format(self.obj.Name)

core/functionobjects/reporting/CfdReportingFunctions.py

@@ -65,7 +65,7 @@ def IsActive(self):
     def Activated(self):
         FreeCAD.ActiveDocument.openTransaction("Create CfdReportingFunctions object")
         FreeCADGui.doCommand("")
-        FreeCADGui.addModule("core.functionobjects.reporting.CfdReportingFunctions as CfdReportingFunctions")
+        FreeCADGui.doCommand("from core.functionobjects.reporting import CfdReportingFunctions")
         FreeCADGui.addModule("CfdTools")
         FreeCADGui.doCommand("CfdTools.getActiveAnalysis().addObject(CfdReportingFunctions.makeCfdReportingFunctions())")
         FreeCADGui.ActiveDocument.setEdit(FreeCAD.ActiveDocument.ActiveObject.Name)
@@ -198,7 +198,7 @@ def setEdit(self, vobj, mode):
             CfdTools.cfdErrorBox("Reporting function must have a parent analysis object")
             return False
 
-        from core.functionobjects.reporting import TaskPanelCfdReportingFunctions as TaskPanelCfdReportingFunctions
+        from core.functionobjects.reporting import TaskPanelCfdReportingFunctions
         import importlib
         importlib.reload(TaskPanelCfdReportingFunctions)
         taskd = TaskPanelCfdReportingFunctions.TaskPanelCfdReportingFunctions(self.Object)

core/gui/TaskPanelCfdZone.ui

@@ -25,7 +25,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>200</height>
+       <height>400</height>
       </size>
      </property>
      <layout class="QGridLayout" name="gridLayout_4"/>

core/mesh/dynamic/TaskPanelCfdDynamicMeshRefinement.py

@@ -26,7 +26,7 @@
 import FreeCAD
 import FreeCADGui
 from CfdTools import setQuantity, getQuantity, indexOrDefault
-from core.mesh.dynamic import CfdDynamicMeshRefinement as CfdDynamicMeshRefinement
+from core.mesh.dynamic import CfdDynamicMeshRefinement
 
 
 class TaskPanelCfdDynamicMeshRefinement:

data/defaults/0/alphat

@@ -1,7 +1,7 @@
 %{%(solver/SolverName%)
 %:buoyantSimpleFoam buoyantPimpleFoam hisa
 %{%(physics/Turbulence%)
-%:RANS
+%:RANS DES LES
 %[_header%]
 FoamFile
 {

metadata.txt

@@ -8,7 +8,7 @@ description=Computational Fluid Dynamics (CFD) analysis based on OpenFOAM
 about=Simple workflow to get started with CFD analysis.
       Supports incompressible laminar and turbulent flow, basic multiphase flow,
       and cut-cell cartesian meshing
-version=1.16.1
+version=1.16.3
 tracker=https://forum.freecadweb.org/viewforum.php?f=37&sid=3d90858d2ff441bd10475a693b55643a
 repository=https://gitlab.com/opensimproject/cfdof
 license=LGPL

package.xml

@@ -2,7 +2,7 @@
 <package format="1">
     <name>CfdOF</name>
     <description>Computational Fluid Dynamics (CFD) for FreeCAD based on OpenFOAM</description>
-    <version>1.16.1</version>
+    <version>1.16.3</version>
     <maintainer email="oliveroxtoby@gmail.com">Oliver Oxtoby</maintainer>
     <license file="LICENSE">LGPL-2</license>
     <url type="repository" branch="master">https://gitlab.com/opensimproject/CfdOF</url>