From 81cea09983cc478a5d6e06de82444235438b22a3 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sat, 18 Nov 2017 01:13:48 +0000 Subject: [PATCH] ENH: pimpleDyMFoam: Improved efficiency and consistency when running on a static mesh Now pimpleDyMFoam is exactly equivalent to pimpleFoam when running on a staticFvMesh. Also when the constant/dynamicMeshDict is not present a staticFvMesh is automatically constructed so that the pimpleDyMFoam solver can run any pimpleFoam case without change. pimpleDyMFoam: Store Uf as an autoPtr for better error handling pimpleFoam: Set initial deltaT from the Courant number for improved stability on start-up and compatibility with pimpleDyMFoam ENH: pimpleFoam: Merged dynamic mesh functionality of pimpleDyMFoam into pimpleFoam and replaced pimpleDyMFoam with a script which reports this change. The pimpleDyMFoam tutorials have been moved into the pimpleFoam directory. This change is the first of a set of developments to merge dynamic mesh functionality into the standard solvers to improve consistency, usability, flexibility and maintainability of these solvers. Henry G. Weller CFD Direct Ltd. tutorials/incompressible/pimpleFoam: Updated pimpleDyMFoam tutorials to run pimpleFoam Renamed tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleDyMFoam -> tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam --- .../incompressible/pimpleFoam/Make/options | 11 +- .../{pimpleDyMFoam => }/correctPhi.H | 0 .../{pimpleDyMFoam => }/createControls.H | 0 .../solvers/incompressible/pimpleFoam/pEqn.H | 18 ++- .../pimpleFoam/pimpleDyMFoam/Make/files | 3 - .../pimpleFoam/pimpleDyMFoam/Make/options | 24 ---- .../pimpleFoam/pimpleDyMFoam/pEqn.H | 71 ---------- .../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C | 130 ------------------ .../incompressible/pimpleFoam/pimpleFoam.C | 45 ++++-- .../{pimpleDyMFoam => }/readControls.H | 0 bin/mergedDyM | 38 +++++ bin/pimpleDyMFoam | 38 +++++ .../dynamicFvMesh/dynamicFvMesh.H | 13 +- .../dynamicFvMesh/dynamicFvMeshNew.C | 83 +++++------ .../incompressible/createUfIfPresent.H | 51 +++++++ .../cfdTools/incompressible/updateUf.H | 55 ++++++++ src/finiteVolume/finiteVolume/fvc/fvcDdt.C | 53 ++++++- src/finiteVolume/finiteVolume/fvc/fvcDdt.H | 47 ++++++- .../finiteVolume/fvc/fvcMeshPhi.C | 39 +++++- .../finiteVolume/fvc/fvcMeshPhi.H | 17 ++- .../constant/transportProperties | 0 .../constant/turbulenceProperties | 0 .../RAS}/oscillatingInletACMI2D/0.orig/U | 0 .../oscillatingInletACMI2D/0.orig/epsilon | 0 .../RAS}/oscillatingInletACMI2D/0.orig/k | 0 .../RAS}/oscillatingInletACMI2D/0.orig/nut | 0 .../RAS}/oscillatingInletACMI2D/0.orig/p | 0 .../RAS}/oscillatingInletACMI2D/Allclean | 0 .../RAS}/oscillatingInletACMI2D/Allrun | 0 .../oscillatingInletACMI2D/Allrun-parallel | 0 .../RAS}/oscillatingInletACMI2D/Allrun.pre | 0 .../RAS}/oscillatingInletACMI2D/README | 0 .../constant/dynamicMeshDict | 0 .../constant/transportProperties | 0 .../constant/turbulenceProperties | 0 .../system/blockMeshDict | 0 .../oscillatingInletACMI2D/system/controlDict | 2 +- .../system/createBafflesDict | 0 .../system/decomposeParDict | 0 .../oscillatingInletACMI2D/system/fvSchemes | 0 .../oscillatingInletACMI2D/system/fvSolution | 0 .../oscillatingInletACMI2D/system/topoSetDict | 0 .../RAS}/propeller/0.orig/U | 0 .../RAS}/propeller/0.orig/epsilon | 0 .../RAS}/propeller/0.orig/k | 0 .../RAS}/propeller/0.orig/nut | 0 .../RAS}/propeller/0.orig/p | 0 .../RAS}/propeller/Allclean | 0 .../RAS}/propeller/Allrun | 0 .../RAS}/propeller/Allrun.pre | 0 .../RAS}/propeller/constant/dynamicMeshDict | 0 .../propeller/constant/transportProperties | 0 .../constant/triSurface/innerCylinder.obj | 0 .../triSurface/innerCylinderSmall.obj | 0 .../constant/triSurface/outerCylinder.obj | 0 .../constant/triSurface/propellerStem1.obj | 0 .../constant/triSurface/propellerStem2.obj | 0 .../constant/triSurface/propellerStem3.obj | 0 .../propeller/constant/turbulenceProperties | 30 ++++ .../RAS}/propeller/system/blockMeshDict | 0 .../RAS}/propeller/system/controlDict | 2 +- .../system/createInletOutletSets.topoSetDict | 0 .../RAS}/propeller/system/createPatchDict | 0 .../RAS}/propeller/system/decomposeParDict | 0 .../RAS}/propeller/system/forces | 0 .../RAS}/propeller/system/fvSchemes | 0 .../RAS}/propeller/system/fvSolution | 0 .../RAS}/propeller/system/snappyHexMeshDict | 0 .../system/surfaceFeatureExtractDict | 0 .../system/surfaceFeatureExtractDictDefaults | 0 .../RAS}/propeller/system/surfaces | 0 .../RAS}/wingMotion/Allclean | 2 +- .../RAS}/wingMotion/Allrun | 2 +- .../wingMotion2D_pimpleFoam}/0.orig/U | 0 .../0.orig/include/fixedInlet | 0 .../0.orig/include/frontBackTopBottomPatches | 0 .../0.orig/include/initialConditions | 0 .../wingMotion2D_pimpleFoam}/0.orig/k | 0 .../wingMotion2D_pimpleFoam}/0.orig/nut | 0 .../wingMotion2D_pimpleFoam}/0.orig/omega | 0 .../wingMotion2D_pimpleFoam}/0.orig/p | 0 .../0.orig/pointDisplacement | 0 .../constant/dynamicMeshDict | 0 .../constant/transportProperties | 0 .../constant/turbulenceProperties | 0 .../system/controlDict | 2 +- .../system/decomposeParDict | 0 .../wingMotion2D_pimpleFoam}/system/fvSchemes | 0 .../system/fvSolution | 0 .../wingMotion2D_simpleFoam/0.orig/U | 0 .../0.orig/include/fixedInlet | 0 .../0.orig/include/frontBackTopBottomPatches | 0 .../0.orig/include/initialConditions | 0 .../wingMotion2D_simpleFoam/0.orig/k | 0 .../wingMotion2D_simpleFoam/0.orig/nut | 0 .../wingMotion2D_simpleFoam/0.orig/omega | 0 .../wingMotion2D_simpleFoam/0.orig/p | 0 .../constant/transportProperties | 0 .../constant/turbulenceProperties | 0 .../system/controlDict | 0 .../system/createPatchDict | 0 .../system/extrudeMeshDict | 0 .../wingMotion2D_simpleFoam/system/fvSchemes | 0 .../wingMotion2D_simpleFoam/system/fvSolution | 0 .../constant/triSurface/wing_5degrees.obj | 0 .../system/blockMeshDict | 0 .../system/controlDict | 0 .../system/decomposeParDict | 0 .../wingMotion_snappyHexMesh/system/fvSchemes | 0 .../system/fvSolution | 0 .../system/snappyHexMeshDict | 0 .../laminar}/mixerVesselAMI2D/0/U | 0 .../laminar}/mixerVesselAMI2D/0/epsilon | 0 .../laminar}/mixerVesselAMI2D/0/k | 0 .../laminar}/mixerVesselAMI2D/0/nut | 0 .../laminar}/mixerVesselAMI2D/0/p | 0 .../laminar}/mixerVesselAMI2D/Allrun | 0 .../mixerVesselAMI2D/constant/dynamicMeshDict | 0 .../constant/transportProperties | 0 .../constant/triSurface/projectionSurface.stl | 0 .../constant/turbulenceProperties | 0 .../laminar}/mixerVesselAMI2D/makeMesh | 0 .../mixerVesselAMI2D/system/blockMeshDict.m4 | 0 .../mixerVesselAMI2D/system/controlDict | 2 +- .../mixerVesselAMI2D/system/decomposeParDict | 0 .../mixerVesselAMI2D/system/fvSchemes | 0 .../mixerVesselAMI2D/system/fvSolution | 0 .../mixerVesselAMI2D/system/topoSetDict | 0 .../laminar}/movingCone/0/U | 0 .../laminar}/movingCone/0/p | 0 .../laminar}/movingCone/0/pointMotionUx | 0 .../movingCone/constant/dynamicMeshDict | 0 .../movingCone/constant/transportProperties | 22 +++ .../movingCone/constant/turbulenceProperties | 0 .../laminar}/movingCone/system/blockMeshDict | 0 .../laminar}/movingCone/system/controlDict | 2 +- .../laminar}/movingCone/system/cuttingPlane | 0 .../laminar}/movingCone/system/fvSchemes | 0 .../laminar}/movingCone/system/fvSolution | 0 139 files changed, 503 insertions(+), 299 deletions(-) rename applications/solvers/incompressible/pimpleFoam/{pimpleDyMFoam => }/correctPhi.H (100%) rename applications/solvers/incompressible/pimpleFoam/{pimpleDyMFoam => }/createControls.H (100%) delete mode 100644 applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/files delete mode 100644 applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options delete mode 100644 applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H delete mode 100644 applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C rename applications/solvers/incompressible/pimpleFoam/{pimpleDyMFoam => }/readControls.H (100%) create mode 100755 bin/mergedDyM create mode 100755 bin/pimpleDyMFoam create mode 100644 src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H create mode 100644 src/finiteVolume/cfdTools/incompressible/updateUf.H rename tutorials/{incompressible/pimpleDyMFoam/movingCone => compressible/rhoPimpleFoam/RAS/mixerVessel2DDyM}/constant/transportProperties (100%) rename tutorials/{incompressible/pimpleDyMFoam/oscillatingInletACMI2D => compressible/rhoPimpleFoam/RAS/mixerVessel2DDyM}/constant/turbulenceProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/0.orig/U (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/0.orig/epsilon (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/0.orig/k (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/0.orig/nut (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/0.orig/p (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/Allclean (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/Allrun (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/Allrun-parallel (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/Allrun.pre (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/README (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/constant/dynamicMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/constant/transportProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam/propeller => pimpleFoam/RAS/oscillatingInletACMI2D}/constant/turbulenceProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/system/blockMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/system/controlDict (97%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/system/createBafflesDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/system/decomposeParDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/system/fvSchemes (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/system/fvSolution (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/oscillatingInletACMI2D/system/topoSetDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/0.orig/U (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/0.orig/epsilon (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/0.orig/k (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/0.orig/nut (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/0.orig/p (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/Allclean (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/Allrun (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/Allrun.pre (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/dynamicMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/transportProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/triSurface/innerCylinder.obj (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/triSurface/innerCylinderSmall.obj (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/triSurface/outerCylinder.obj (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/triSurface/propellerStem1.obj (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/triSurface/propellerStem2.obj (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/constant/triSurface/propellerStem3.obj (100%) create mode 100644 tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/blockMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/controlDict (97%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/createInletOutletSets.topoSetDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/createPatchDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/decomposeParDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/forces (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/fvSchemes (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/fvSolution (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/snappyHexMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/surfaceFeatureExtractDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/surfaceFeatureExtractDictDefaults (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/propeller/system/surfaces (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/Allclean (87%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/Allrun (96%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/U (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/include/fixedInlet (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/include/frontBackTopBottomPatches (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/include/initialConditions (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/k (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/nut (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/omega (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/p (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/0.orig/pointDisplacement (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/constant/dynamicMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/constant/transportProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/constant/turbulenceProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/system/controlDict (97%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/system/decomposeParDict (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/system/fvSchemes (100%) rename tutorials/incompressible/{pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam => pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam}/system/fvSolution (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/U (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/k (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/nut (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/omega (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/0.orig/p (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/system/controlDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion2D_simpleFoam/system/fvSolution (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion_snappyHexMesh/system/controlDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion_snappyHexMesh/system/fvSolution (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/RAS}/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/0/U (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/0/epsilon (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/0/k (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/0/nut (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/0/p (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/Allrun (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/constant/dynamicMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/constant/transportProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/constant/turbulenceProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/makeMesh (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/system/blockMeshDict.m4 (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/system/controlDict (97%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/system/decomposeParDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/system/fvSchemes (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/system/fvSolution (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/mixerVesselAMI2D/system/topoSetDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/0/U (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/0/p (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/0/pointMotionUx (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/constant/dynamicMeshDict (100%) create mode 100644 tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/constant/turbulenceProperties (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/system/blockMeshDict (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/system/controlDict (97%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/system/cuttingPlane (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/system/fvSchemes (100%) rename tutorials/incompressible/{pimpleDyMFoam => pimpleFoam/laminar}/movingCone/system/fvSolution (100%) diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options index 9af500124c..14a5a2d924 100644 --- a/applications/solvers/incompressible/pimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/Make/options @@ -4,14 +4,19 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ - -lmeshTools \ -lfvOptions \ - -lsampling + -lsampling \ + -ldynamicFvMesh \ + -ltopoChangerFvMesh \ + -ldynamicMesh \ + -lmeshTools diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/correctPhi.H similarity index 100% rename from applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H rename to applications/solvers/incompressible/pimpleFoam/correctPhi.H diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H b/applications/solvers/incompressible/pimpleFoam/createControls.H similarity index 100% rename from applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H rename to applications/solvers/incompressible/pimpleFoam/createControls.H diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H index c8d02ed281..df19741c50 100644 --- a/applications/solvers/incompressible/pimpleFoam/pEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H @@ -4,12 +4,17 @@ surfaceScalarField phiHbyA ( "phiHbyA", fvc::flux(HbyA) - + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi) + + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi, Uf) ); MRF.makeRelative(phiHbyA); -adjustPhi(phiHbyA, U, p); +if (p.needReference()) +{ + fvc::makeRelative(phiHbyA, U); + adjustPhi(phiHbyA, U, p); + fvc::makeAbsolute(phiHbyA, U); +} tmp rAtU(rAU); @@ -32,7 +37,6 @@ constrainPressure(p, U, phiHbyA, rAtU(), MRF); // Non-orthogonal pressure corrector loop while (pimple.correctNonOrthogonal()) { - // Pressure corrector fvScalarMatrix pEqn ( fvm::laplacian(rAtU(), p) == fvc::div(phiHbyA) @@ -53,6 +57,12 @@ while (pimple.correctNonOrthogonal()) // Explicitly relax pressure for momentum corrector p.relax(); -U = HbyA - rAtU()*fvc::grad(p); +U = HbyA - rAtU*fvc::grad(p); U.correctBoundaryConditions(); fvOptions.correct(U); + +// Correct Uf if the mesh is moving +fvc::correctUf(Uf, U, phi); + +// Make the fluxes relative to the mesh motion +fvc::makeRelative(phi, U); diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/files b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/files deleted file mode 100644 index c1edb235e6..0000000000 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -pimpleDyMFoam.C - -EXE = $(FOAM_APPBIN)/pimpleDyMFoam diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options deleted file mode 100644 index b22f523550..0000000000 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options +++ /dev/null @@ -1,24 +0,0 @@ -EXE_INC = \ - -I. \ - -I.. \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lfvOptions \ - -lsampling \ - -ldynamicFvMesh \ - -ltopoChangerFvMesh \ - -ldynamicMesh \ - -lmeshTools diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H deleted file mode 100644 index a53391a90b..0000000000 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H +++ /dev/null @@ -1,71 +0,0 @@ -volScalarField rAU(1.0/UEqn.A()); -volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); -surfaceScalarField phiHbyA -( - "phiHbyA", - fvc::flux(HbyA) - + fvc::interpolate(rAU)*fvc::ddtCorr(U, Uf) -); - -MRF.makeRelative(phiHbyA); - -if (p.needReference()) -{ - fvc::makeRelative(phiHbyA, U); - adjustPhi(phiHbyA, U, p); - fvc::makeAbsolute(phiHbyA, U); -} - -tmp rAtU(rAU); - -if (pimple.consistent()) -{ - rAtU = 1.0/max(1.0/rAU - UEqn.H1(), 0.1/rAU); - phiHbyA += - fvc::interpolate(rAtU() - rAU)*fvc::snGrad(p)*mesh.magSf(); - HbyA -= (rAU - rAtU())*fvc::grad(p); -} - -if (pimple.nCorrPISO() <= 1) -{ - tUEqn.clear(); -} - -// Update the pressure BCs to ensure flux consistency -constrainPressure(p, U, phiHbyA, rAtU(), MRF); - -// Non-orthogonal pressure corrector loop -while (pimple.correctNonOrthogonal()) -{ - fvScalarMatrix pEqn - ( - fvm::laplacian(rAtU(), p) == fvc::div(phiHbyA) - ); - - pEqn.setReference(pRefCell, pRefValue); - - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); - - if (pimple.finalNonOrthogonalIter()) - { - phi = phiHbyA - pEqn.flux(); - } -} - -#include "continuityErrs.H" - -// Explicitly relax pressure for momentum corrector -p.relax(); - -U = HbyA - rAtU*fvc::grad(p); -U.correctBoundaryConditions(); -fvOptions.correct(U); - -{ - Uf = fvc::interpolate(U); - surfaceVectorField n(mesh.Sf()/mesh.magSf()); - Uf += n*(phi/mesh.magSf() - (n & Uf)); -} - -// Make the fluxes relative to the mesh motion -fvc::makeRelative(phi, U); diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C deleted file mode 100644 index f77f2677f8..0000000000 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C +++ /dev/null @@ -1,130 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - pimpleDyMFoam.C - -Group - grpIncompressibleSolvers grpMovingMeshSolvers - -Description - Transient solver for incompressible, turbulent flow of Newtonian fluids - on a moving mesh. - - Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "dynamicFvMesh.H" -#include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" -#include "pimpleControl.H" -#include "CorrectPhi.H" -#include "fvOptions.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCase.H" - #include "createTime.H" - #include "createDynamicFvMesh.H" - #include "initContinuityErrs.H" - #include "createControls.H" - #include "createFields.H" - #include "createUf.H" - #include "CourantNo.H" - #include "setInitialDeltaT.H" - - turbulence->validate(); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - #include "readControls.H" - #include "CourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - mesh.update(); - - if (mesh.changing()) - { - MRF.update(); - - if (correctPhi) - { - // Calculate absolute flux from the mapped surface velocity - phi = mesh.Sf() & Uf; - - #include "correctPhi.H" - - // Make the flux relative to the mesh motion - fvc::makeRelative(phi, U); - } - - if (checkMeshCourantNo) - { - #include "meshCourantNo.H" - } - } - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - #include "UEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - laminarTransport.correct(); - turbulence->correct(); - } - } - - runTime.write(); - - runTime.printExecutionTime(Info); - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index 26d4e2480a..dc5da155fe 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -22,14 +22,14 @@ License along with OpenFOAM. If not, see . Application - pimpleFoam + pimpleDyMFoam.C Group grpIncompressibleSolvers Description - Large time-step transient solver for incompressible, turbulent flow, using - the PIMPLE (merged PISO-SIMPLE) algorithm. + Transient solver for incompressible, turbulent flow of Newtonian fluids + on a moving mesh. \heading Solver details The solver uses the PIMPLE (merged PISO-SIMPLE) algorithm to solve the @@ -68,9 +68,11 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" #include "turbulentTransportModel.H" #include "pimpleControl.H" +#include "CorrectPhi.H" #include "fvOptions.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,11 +83,13 @@ int main(int argc, char *argv[]) #include "setRootCase.H" #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createTimeControls.H" - #include "createFields.H" + #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" + #include "createControls.H" + #include "createFields.H" + #include "createUfIfPresent.H" + #include "CourantNo.H" + #include "setInitialDeltaT.H" turbulence->validate(); @@ -95,7 +99,7 @@ int main(int argc, char *argv[]) while (runTime.run()) { - #include "readTimeControls.H" + #include "readControls.H" #include "CourantNo.H" #include "setDeltaT.H" @@ -103,6 +107,31 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; + mesh.update(); + + #include "updateUf.H" + + if (mesh.changing()) + { + MRF.update(); + + if (correctPhi) + { + // Calculate absolute flux from the mapped surface velocity + phi = mesh.Sf() & Uf(); + + #include "correctPhi.H" + + // Make the flux relative to the mesh motion + fvc::makeRelative(phi, U); + } + + if (checkMeshCourantNo) + { + #include "meshCourantNo.H" + } + } + // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleFoam/readControls.H similarity index 100% rename from applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H rename to applications/solvers/incompressible/pimpleFoam/readControls.H diff --git a/bin/mergedDyM b/bin/mergedDyM new file mode 100755 index 0000000000..eed3824241 --- /dev/null +++ b/bin/mergedDyM @@ -0,0 +1,38 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# supersededByPostProcess +# +# Description +# Script to suggest using the new "postProcess" utility. +# +#------------------------------------------------------------------------------ +DyMsolver=${0##*/} +solver=$(echo $DyMsolver | sed 's/DyM//') + +echo "The dynamic mesh functionality in $DyMsolver has been merged into $solver" +echo "and the $DyMsolver tutorials moved into the $solver tutorials directory" + +#------------------------------------------------------------------------------ diff --git a/bin/pimpleDyMFoam b/bin/pimpleDyMFoam new file mode 100755 index 0000000000..eed3824241 --- /dev/null +++ b/bin/pimpleDyMFoam @@ -0,0 +1,38 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# supersededByPostProcess +# +# Description +# Script to suggest using the new "postProcess" utility. +# +#------------------------------------------------------------------------------ +DyMsolver=${0##*/} +solver=$(echo $DyMsolver | sed 's/DyM//') + +echo "The dynamic mesh functionality in $DyMsolver has been merged into $solver" +echo "and the $DyMsolver tutorials moved into the $solver tutorials directory" + +#------------------------------------------------------------------------------ diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H index a65a8160b7..3f2aa7e4d6 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License @@ -37,8 +37,6 @@ SourceFiles #define dynamicFvMesh_H #include "fvMesh.H" -#include "autoPtr.H" -#include "runTimeSelectionTables.H" #define MOVING_MESH @@ -117,7 +115,9 @@ public: // Selectors - //- Select null constructed + //- Select, construct and return the dynamicFvMesh + // If the constant/dynamicMeshDict does not exist + // a staticFvMesh is returned static autoPtr New(const IOobject& io); @@ -131,13 +131,16 @@ public: virtual bool update() = 0; }; - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#include "staticFvMesh.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #endif // ************************************************************************* // diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C index aa4a74a790..3256f709f9 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,8 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "dynamicFvMesh.H" -#include "Time.H" -#include "dlLibraryTable.H" // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // @@ -36,51 +34,56 @@ Foam::autoPtr Foam::dynamicFvMesh::New(const IOobject& io) // - defaultRegion (region0) gets loaded from constant, other ones // get loaded from constant/. Normally we'd use // polyMesh::dbDir() but we haven't got a polyMesh yet ... - IOdictionary dict + IOobject dictHeader ( - IOobject + "dynamicMeshDict", + io.time().constant(), + (io.name() == polyMesh::defaultRegion ? "" : io.name()), + io.db(), + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false + ); + + if (dictHeader.typeHeaderOk(true)) + { + IOdictionary dict(dictHeader); + + const word dynamicFvMeshTypeName(dict.lookup("dynamicFvMesh")); + + Info<< "Selecting dynamicFvMesh " << dynamicFvMeshTypeName << endl; + + const_cast(io.time()).libs().open ( - "dynamicMeshDict", - io.time().constant(), - (io.name() == polyMesh::defaultRegion ? "" : io.name()), - io.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ); + dict, + "dynamicFvMeshLibs", + IOobjectConstructorTablePtr_ + ); - const word dynamicFvMeshTypeName(dict.lookup("dynamicFvMesh")); + if (!IOobjectConstructorTablePtr_) + { + FatalErrorInFunction + << "dynamicFvMesh table is empty" + << exit(FatalError); + } - Info<< "Selecting dynamicFvMesh " << dynamicFvMeshTypeName << endl; + IOobjectConstructorTable::iterator cstrIter = + IOobjectConstructorTablePtr_->find(dynamicFvMeshTypeName); - const_cast(io.time()).libs().open - ( - dict, - "dynamicFvMeshLibs", - IOobjectConstructorTablePtr_ - ); + if (cstrIter == IOobjectConstructorTablePtr_->end()) + { + FatalErrorInFunction + << "Unknown dynamicFvMesh type " + << dynamicFvMeshTypeName << nl << nl + << "Valid dynamicFvMesh types are :" << endl + << IOobjectConstructorTablePtr_->sortedToc() + << exit(FatalError); + } - if (!IOobjectConstructorTablePtr_) - { - FatalErrorInFunction - << "dynamicFvMesh table is empty" - << exit(FatalError); + return autoPtr(cstrIter()(io)); } - auto cstrIter = IOobjectConstructorTablePtr_->cfind(dynamicFvMeshTypeName); - - if (!cstrIter.found()) - { - FatalErrorInFunction - << "Unknown dynamicFvMesh type " - << dynamicFvMeshTypeName << nl << nl - << "Valid dynamicFvMesh types :" << endl - << IOobjectConstructorTablePtr_->sortedToc() - << exit(FatalError); - } - - return autoPtr(cstrIter()(io)); + return autoPtr(new staticFvMesh(io)); } diff --git a/src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H b/src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H new file mode 100644 index 0000000000..79e6619eec --- /dev/null +++ b/src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H @@ -0,0 +1,51 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Global + createUf + +Description + Creates and initialises the velocity field Uf if present. + +\*---------------------------------------------------------------------------*/ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +autoPtr Uf; + +IOobject UfHeader +( + "Uf", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE +); + +if (UfHeader.typeHeaderOk(true)) +{ + Info<< "Reading face velocity Uf\n" << endl; + Uf = new surfaceVectorField(UfHeader, mesh); +} + +// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/incompressible/updateUf.H b/src/finiteVolume/cfdTools/incompressible/updateUf.H new file mode 100644 index 0000000000..e2cb0b90b4 --- /dev/null +++ b/src/finiteVolume/cfdTools/incompressible/updateUf.H @@ -0,0 +1,55 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Global + updateUf + +Description + Constructs the face velocity field Uf if not already constructed. + +\*---------------------------------------------------------------------------*/ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +if (mesh.changing()) +{ + if (!Uf.valid()) + { + Info<< "Constructing face velocity Uf" << endl; + + Uf = new surfaceVectorField + ( + IOobject + ( + "Uf", + runTime.timeName(), + mesh, + IOobject::READ_IF_PRESENT, + IOobject::AUTO_WRITE + ), + fvc::interpolate(U) + ); + } +} + +// ************************************************************************* // diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C index 6087724834..b83ffbfe59 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -201,6 +201,31 @@ ddtCorr } +template +tmp::type, fvsPatchField, surfaceMesh>> +ddtCorr +( + const GeometricField& U, + const GeometricField + < + typename flux::type, + fvsPatchField, + surfaceMesh + >& phi, + const autoPtr>& Uf +) +{ + if (U.mesh().changing()) + { + return ddtCorr(U, Uf()); + } + else + { + return ddtCorr(U, phi); + } +} + + template tmp::type, fvsPatchField, surfaceMesh>> ddtCorr @@ -240,6 +265,32 @@ ddtCorr } +template +tmp::type, fvsPatchField, surfaceMesh>> +ddtCorr +( + const volScalarField& rho, + const GeometricField& U, + const GeometricField + < + typename flux::type, + fvsPatchField, + surfaceMesh + >& phi, + const autoPtr>& Uf +) +{ + if (U.mesh().changing()) + { + return ddtCorr(rho, U, Uf()); + } + else + { + return ddtCorr(rho, U, phi); + } +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace fvc diff --git a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H index 0c6ee4b35a..929d897486 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcDdt.H +++ b/src/finiteVolume/finiteVolume/fvc/fvcDdt.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -154,6 +154,28 @@ namespace fvc >& phi ); + template + tmp + < + GeometricField + < + typename Foam::flux::type, + fvsPatchField, + surfaceMesh + > + > + ddtCorr + ( + const GeometricField& U, + const GeometricField + < + typename Foam::flux::type, + fvsPatchField, + surfaceMesh + >& phi, + const autoPtr>& Uf + ); + template tmp < @@ -192,6 +214,29 @@ namespace fvc surfaceMesh >& phi ); + + template + tmp + < + GeometricField + < + typename Foam::flux::type, + fvsPatchField, + surfaceMesh + > + > + ddtCorr + ( + const volScalarField& rho, + const GeometricField& U, + const GeometricField + < + typename Foam::flux::type, + fvsPatchField, + surfaceMesh + >& phi, + const autoPtr>& Uf + ); } diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C index c7c38d79e8..c082e54ecf 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -219,4 +219,41 @@ Foam::tmp Foam::fvc::absolute } +void Foam::fvc::correctUf +( + autoPtr& Uf, + const volVectorField& U, + const surfaceScalarField& phi +) +{ + const fvMesh& mesh = U.mesh(); + + if (mesh.changing()) + { + Uf() = fvc::interpolate(U); + surfaceVectorField n(mesh.Sf()/mesh.magSf()); + Uf() += n*(phi/mesh.magSf() - (n & Uf())); + } +} + + +void Foam::fvc::correctRhoUf +( + autoPtr& rhoUf, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi +) +{ + const fvMesh& mesh = U.mesh(); + + if (mesh.changing()) + { + rhoUf() = fvc::interpolate(rho*U); + surfaceVectorField n(mesh.Sf()/mesh.magSf()); + rhoUf() += n*(fvc::absolute(phi, rho, U)/mesh.magSf() - (n & rhoUf())); + } +} + + // ************************************************************************* // diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H index e055d4d970..9ce689847d 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H +++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -147,6 +147,21 @@ namespace fvc const volScalarField& rho, const volVectorField& U ); + + void correctUf + ( + autoPtr& Uf, + const volVectorField& U, + const surfaceScalarField& phi + ); + + void correctRhoUf + ( + autoPtr& rhoUf, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi + ); } diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2DDyM/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2DDyM/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2DDyM/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2DDyM/constant/turbulenceProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/U rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/U diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/epsilon similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/epsilon rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/epsilon diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/k similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/k rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/k diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/nut similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/nut rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/nut diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.orig/p rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/p diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allclean similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allclean diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/README b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/README similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/README rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/README diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/dynamicMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict similarity index 97% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/controlDict rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict index 3031125d38..d67d2a4d49 100644 --- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application pimpleDyMFoam; +application pimpleFoam; startFrom latestTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createBafflesDict rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/createBafflesDict diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/decomposeParDict rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/decomposeParDict diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict rename to tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/Allclean rename to tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/Allrun rename to tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre rename to tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/innerCylinder.obj b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/innerCylinder.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/innerCylinder.obj rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/innerCylinder.obj diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/innerCylinderSmall.obj b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/innerCylinderSmall.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/innerCylinderSmall.obj rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/innerCylinderSmall.obj diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/outerCylinder.obj b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/outerCylinder.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/outerCylinder.obj rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/outerCylinder.obj diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/propellerStem1.obj b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/propellerStem1.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/propellerStem1.obj rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/propellerStem1.obj diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/propellerStem2.obj b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/propellerStem2.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/propellerStem2.obj rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/propellerStem2.obj diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/propellerStem3.obj b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/propellerStem3.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/triSurface/propellerStem3.obj rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/propellerStem3.obj diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties new file mode 100644 index 0000000000..cd2daf8229 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + RASModel kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/blockMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/blockMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/controlDict similarity index 97% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/controlDict index 2d912634e2..73ba6d4752 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application pimpleDyMFoam; +application pimpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/createInletOutletSets.topoSetDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createPatchDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/createPatchDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/decomposeParDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/decomposeParDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/forces similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/forces rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/forces diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDict diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDictDefaults similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDictDefaults diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces rename to tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean similarity index 87% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean index a743892030..0e00deb36c 100755 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean @@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory ( cd wingMotion2D_simpleFoam && cleanCase0 ) -( cd wingMotion2D_pimpleDyMFoam && cleanCase0 ) +( cd wingMotion2D_pimpleFoam && cleanCase0 ) #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun similarity index 96% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun index f173a5d46f..9b8c732884 100755 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun @@ -23,7 +23,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Copy mesh from the steady state case, map the results to a mesh motion case, # then solve transient. ( - cd wingMotion2D_pimpleDyMFoam || exit 1 + cd wingMotion2D_pimpleFoam || exit 1 \rm -rf constant/polyMesh \cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/U rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/include/fixedInlet b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/include/fixedInlet rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/include/frontBackTopBottomPatches rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/include/initialConditions b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/include/initialConditions rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/k rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/nut rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/omega rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/p rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/pointDisplacement b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.orig/pointDisplacement rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict similarity index 97% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict index 25210380e6..3491948ab0 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application pimpleDyMFoam; +application pimpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/decomposeParDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/U rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/k rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/nut rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/omega rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.orig/p rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/controlDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/controlDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/U diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/epsilon similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/epsilon diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/k similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/k diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/nut similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/nut diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/p b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/p rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/0/p diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4 similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4 diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/controlDict similarity index 97% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/controlDict rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/controlDict index 461294b7ad..1a994b9cfe 100644 --- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application pimpleDyMFoam; +application pimpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/decomposeParDict rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/decomposeParDict diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/topoSetDict rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/0/U rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/0/U diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/0/p rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/0/p diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties new file mode 100644 index 0000000000..401efe9083 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object transportProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +transportModel Newtonian; + +nu [0 2 -1 0 0 0 0] 1e-05; + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/blockMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/system/blockMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/controlDict similarity index 97% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/system/controlDict index 9c11677557..0d7d902b6d 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application pimpleDyMFoam; +application pimpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution rename to tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution