diff --git a/CfdTools.py b/CfdTools.py index ef64558f..40c269bc 100644 --- a/CfdTools.py +++ b/CfdTools.py @@ -144,13 +144,18 @@ def getPhysicsModel(analysis_object): def getDynamicMeshAdaptation(analysis_object): is_present = False - for i in getMesh(analysis_object).Group: - if "DynamicMeshRefinement" in i.Name: - dynamic_mesh_adaption_model = i - is_present = True - if not is_present: - dynamic_mesh_adaption_model = None - return dynamic_mesh_adaption_model + mesh_obj = getMesh(analysis_object) + + if mesh_obj is None: + return is_present + else: + for i in mesh_obj.Group: + if "DynamicMeshRefinement" in i.Name: + dynamic_mesh_adaption_model = i + is_present = True + if not is_present: + dynamic_mesh_adaption_model = None + return dynamic_mesh_adaption_model def getMeshObject(analysis_object): @@ -441,6 +446,8 @@ def getPatchType(bcType, bcSubType): return 'wedge' elif bcSubType == 'empty': return 'empty' + elif bcSubType == 'cyclicAMI': + return 'cyclicAMI' else: return 'patch' else: diff --git a/_TaskPanelCfdFluidBoundary.py b/_TaskPanelCfdFluidBoundary.py index 211e98e9..3f8f70a1 100644 --- a/_TaskPanelCfdFluidBoundary.py +++ b/_TaskPanelCfdFluidBoundary.py @@ -436,9 +436,9 @@ def accept(self): storeIfChanged(self.obj, 'PeriodicCentreOfRotation', centre_of_rotation) rotation_axis = FreeCAD.Vector( - self.form.input_axisx.propertx("quantity").Value, self.form.input_axisx.property("quantity").Value, - self.form.input_axisx.propertz("quantity").Value) + self.form.input_axisy.property("quantity").Value, + self.form.input_axisz.property("quantity").Value) storeIfChanged(self.obj, 'PeriodicCentreOfRotationAxis', rotation_axis) separation_vector = FreeCAD.Vector( diff --git a/data/defaults/0/p b/data/defaults/0/p index 7262b13d..ef2bcb46 100644 --- a/data/defaults/0/p +++ b/data/defaults/0/p @@ -12,7 +12,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // %{%(solver/SolverName%) -%:simpleFoam porousSimpleFoam pimpleFoam +%:simpleFoam porousSimpleFoam pimpleFoam SRFSimpleFoam dimensions [0 2 -2 0 0 0 0]; internalField uniform %(initialValues/KinematicPressure%);