From 9bf34679bd2c7c122eb75b967a52e1c814bc080e Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 26 Mar 2019 21:42:14 +0000 Subject: [PATCH] buoyantBoussinesq[SP]impleFoam: replaced by the more general buoyant[SP]impleFoam solvers With the selection of the Boussinesq equation of state the general buoyancy solvers buoyantSimpleFoam and buoyantPimpleFoam can be used instead of the specialised Boussinesq solvers avoiding the need for special implementation of thermal and pressure boundary conditions and providing support for radiation and fvOptions which would not have been feasible or practical in the Boussinesq solvers. Other incompressible equations of state are also supported; for most gaseous problems the incompressiblePerfectGas equation of state is likely to be more accurate than the Boussinesq equation of state. The buoyantBoussinesq[SP]impleFoam tutorials have been updated and moved to the corresponding buoyant[SP]impleFoam directories. --- .../buoyantBoussinesqPimpleFoam/Make/files | 3 - .../buoyantBoussinesqPimpleFoam/Make/options | 21 --- .../buoyantBoussinesqPimpleFoam/TEqn.H | 28 ---- .../buoyantBoussinesqPimpleFoam/UEqn.H | 34 ----- .../buoyantBoussinesqPimpleFoam.C | 119 ----------------- .../createFields.H | 126 ------------------ .../buoyantBoussinesqPimpleFoam/pEqn.H | 62 --------- .../buoyantBoussinesqSimpleFoam/Make/files | 3 - .../buoyantBoussinesqSimpleFoam/Make/options | 19 --- .../buoyantBoussinesqSimpleFoam/TEqn.H | 27 ---- .../buoyantBoussinesqSimpleFoam/UEqn.H | 35 ----- .../buoyantBoussinesqSimpleFoam.C | 101 -------------- .../createFields.H | 126 ------------------ .../buoyantBoussinesqSimpleFoam/pEqn.H | 66 --------- .../readTransportProperties.H | 18 --- bin/buoyantBoussinesqPimpleFoam | 39 ++++++ bin/buoyantBoussinesqSimpleFoam | 39 ++++++ bin/mergedDyM | 7 +- etc/config.sh/bash_completion | 52 +------- etc/templates/closedVolume/0/alphat | 4 +- etc/templates/closedVolume/0/p | 2 +- etc/templates/closedVolume/0/p_rgh | 2 +- etc/templates/closedVolume/README | 2 +- .../constant/thermophysicalProperties | 54 ++++++++ .../closedVolume/constant/transportProperties | 34 ----- etc/templates/closedVolume/system/controlDict | 2 +- etc/templates/closedVolume/system/fvSchemes | 4 +- etc/templates/closedVolume/system/fvSolution | 8 +- .../basic/rhoThermo/rhoThermos.C | 14 +- .../hotRoom/constant/transportProperties | 35 ----- .../hotRoom/Allclean | 9 -- .../hotRoom/constant/transportProperties | 35 ----- .../constant/transportProperties | 35 ----- .../BernardCells/0/T | 0 .../BernardCells/0/U | 0 .../BernardCells/0/alphat | 4 +- .../BernardCells/0/epsilon | 0 .../BernardCells/0/k | 0 .../BernardCells/0/nut | 0 .../BernardCells/0/p | 2 +- .../BernardCells/0/p_rgh | 3 +- .../BernardCells/constant/g | 0 .../constant/thermophysicalProperties | 54 ++++++++ .../BernardCells/constant/transportProperties | 0 .../constant/turbulenceProperties | 0 .../BernardCells/system/blockMeshDict | 0 .../BernardCells/system/controlDict | 2 +- .../BernardCells/system/fvSchemes | 7 +- .../BernardCells/system/fvSolution | 12 +- .../BernardCells/system/residuals | 0 .../BernardCells/system/streamlines | 0 .../buoyantPimpleFoam/hotRoom/Allclean | 9 -- .../hotRoomBoussinesq}/0/T.orig | 2 + .../hotRoomBoussinesq}/0/U | 0 .../hotRoomBoussinesq}/0/alphat | 11 +- .../hotRoomBoussinesq}/0/epsilon | 0 .../hotRoomBoussinesq}/0/k | 0 .../hotRoomBoussinesq}/0/nut | 0 .../hotRoomBoussinesq}/0/p | 2 +- .../hotRoomBoussinesq}/0/p_rgh | 5 +- .../hotRoomBoussinesq}/Allrun | 1 + .../hotRoomBoussinesq}/constant/g | 0 .../constant/thermophysicalProperties | 54 ++++++++ .../constant/turbulenceProperties | 2 +- .../hotRoomBoussinesq}/system/blockMeshDict | 0 .../hotRoomBoussinesq}/system/controlDict | 4 +- .../hotRoomBoussinesq}/system/fvSchemes | 15 ++- .../hotRoomBoussinesq}/system/fvSolution | 20 ++- .../hotRoomBoussinesq}/system/setFieldsDict | 0 .../hotRoomBoussinesq}/0/T.orig | 0 .../hotRoomBoussinesq}/0/U | 0 .../hotRoomBoussinesq}/0/alphat | 8 +- .../hotRoomBoussinesq}/0/epsilon | 0 .../hotRoomBoussinesq}/0/k | 0 .../hotRoomBoussinesq}/0/nut | 0 .../hotRoomBoussinesq}/0/p | 2 +- .../hotRoomBoussinesq}/0/p_rgh | 5 +- .../hotRoomBoussinesq}/Allclean | 0 .../hotRoomBoussinesq}/Allrun | 0 .../hotRoomBoussinesq}/constant/g | 0 .../constant/thermophysicalProperties | 54 ++++++++ .../constant/turbulenceProperties | 0 .../hotRoomBoussinesq}/system/blockMeshDict | 0 .../hotRoomBoussinesq}/system/controlDict | 4 +- .../hotRoomBoussinesq}/system/fvSchemes | 7 +- .../hotRoomBoussinesq}/system/fvSolution | 7 +- .../hotRoomBoussinesq}/system/setFieldsDict | 0 .../iglooWithFridges/0/T | 0 .../iglooWithFridges/0/U | 0 .../iglooWithFridges/0/alphat | 4 +- .../iglooWithFridges/0/epsilon | 0 .../iglooWithFridges/0/k | 0 .../iglooWithFridges/0/nut | 0 .../iglooWithFridges/0/p | 2 +- .../iglooWithFridges/0/p_rgh | 3 +- .../iglooWithFridges/Allrun | 0 .../iglooWithFridges/constant/g | 0 .../constant/thermophysicalProperties | 54 ++++++++ .../constant/triSurface/fridgeA.eMesh | 0 .../constant/turbulenceProperties | 0 .../iglooWithFridges/system/blockMeshDict | 0 .../iglooWithFridges/system/controlDict | 2 +- .../iglooWithFridges/system/decomposeParDict | 0 .../iglooWithFridges/system/fvSchemes | 9 +- .../iglooWithFridges/system/fvSolution | 6 +- .../iglooWithFridges/system/meshQualityDict | 0 .../iglooWithFridges/system/snappyHexMeshDict | 0 107 files changed, 458 insertions(+), 1083 deletions(-) delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/UEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/files delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H create mode 100755 bin/buoyantBoussinesqPimpleFoam create mode 100755 bin/buoyantBoussinesqSimpleFoam create mode 100644 etc/templates/closedVolume/constant/thermophysicalProperties delete mode 100644 etc/templates/closedVolume/constant/transportProperties delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties delete mode 100755 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/T (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/U (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/alphat (89%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/epsilon (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/k (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/nut (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/p (96%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/0/p_rgh (93%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/constant/g (100%) create mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/thermophysicalProperties rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/constant/transportProperties (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/constant/turbulenceProperties (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/system/blockMeshDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/system/controlDict (96%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/system/fvSchemes (87%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/system/fvSolution (91%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/system/residuals (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam => buoyantPimpleFoam}/BernardCells/system/streamlines (100%) delete mode 100755 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/T.orig (99%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/U (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/alphat (75%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/epsilon (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/k (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/nut (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/p (96%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/0/p_rgh (89%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/Allrun (93%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/constant/g (100%) create mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/iglooWithFridges => buoyantPimpleFoam/hotRoomBoussinesq}/constant/turbulenceProperties (97%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/system/blockMeshDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/system/controlDict (94%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/system/fvSchemes (81%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/system/fvSolution (87%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantPimpleFoam/hotRoomBoussinesq}/system/setFieldsDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/T.orig (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/U (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/alphat (80%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/epsilon (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/k (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/nut (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/p (96%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/0/p_rgh (89%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/Allclean (100%) rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/Allrun (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/constant/g (100%) create mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties rename tutorials/heatTransfer/{buoyantBoussinesqPimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/constant/turbulenceProperties (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/system/blockMeshDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/system/controlDict (93%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/system/fvSchemes (89%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/system/fvSolution (94%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/hotRoomBoussinesq}/system/setFieldsDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/T (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/U (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/alphat (89%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/epsilon (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/k (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/nut (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/p (96%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/0/p_rgh (93%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/Allrun (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/constant/g (100%) create mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/thermophysicalProperties rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/constant/triSurface/fridgeA.eMesh (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom => buoyantSimpleFoam/iglooWithFridges}/constant/turbulenceProperties (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/system/blockMeshDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/system/controlDict (95%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/system/decomposeParDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/system/fvSchemes (87%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/system/fvSolution (94%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/system/meshQualityDict (100%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam => buoyantSimpleFoam}/iglooWithFridges/system/snappyHexMeshDict (100%) diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files deleted file mode 100644 index 19c4661a3c..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -buoyantBoussinesqPimpleFoam.C - -EXE = $(FOAM_APPBIN)/buoyantBoussinesqPimpleFoam diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options deleted file mode 100644 index 7e2cfae243..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options +++ /dev/null @@ -1,21 +0,0 @@ -EXE_INC = \ - -I. \ - -I../buoyantBoussinesqSimpleFoam \ - -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)/radiationModels/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude - -EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lradiationModels \ - -lfiniteVolume \ - -lfvOptions \ - -lsampling \ - -lmeshTools diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H deleted file mode 100644 index 76b0ef0168..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H +++ /dev/null @@ -1,28 +0,0 @@ -{ - alphat = turbulence->nut()/Prt; - alphat.correctBoundaryConditions(); - - volScalarField alphaEff("alphaEff", turbulence->nu()/Pr + alphat); - - fvScalarMatrix TEqn - ( - fvm::ddt(T) - + fvm::div(phi, T) - - fvm::laplacian(alphaEff, T) - == - radiation->ST(rhoCpRef, T) - + fvOptions(T) - ); - - TEqn.relax(); - - fvOptions.constrain(TEqn); - - TEqn.solve(); - - radiation->correct(); - - fvOptions.correct(T); - - rhok = 1.0 - beta*(T - TRef); -} diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/UEqn.H deleted file mode 100644 index 06a347860d..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/UEqn.H +++ /dev/null @@ -1,34 +0,0 @@ - // Solve the momentum equation - - MRF.correctBoundaryVelocity(U); - - fvVectorMatrix UEqn - ( - fvm::ddt(U) + fvm::div(phi, U) - + MRF.DDt(U) - + turbulence->divDevReff(U) - == - fvOptions(U) - ); - - UEqn.relax(); - - fvOptions.constrain(UEqn); - - if (pimple.momentumPredictor()) - { - solve - ( - UEqn - == - fvc::reconstruct - ( - ( - - ghf*fvc::snGrad(rhok) - - fvc::snGrad(p_rgh) - )*mesh.magSf() - ) - ); - - fvOptions.correct(U); - } diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C deleted file mode 100644 index 6deca393f2..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ /dev/null @@ -1,119 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 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 - buoyantBoussinesqPimpleFoam - -Description - Transient solver for buoyant, turbulent flow of incompressible fluids. - - Uses the Boussinesq approximation: - \f[ - rho_{k} = 1 - beta(T - T_{ref}) - \f] - - where: - \f$ rho_{k} \f$ = the effective (driving) kinematic density - beta = thermal expansion coefficient [1/K] - T = temperature [K] - \f$ T_{ref} \f$ = reference temperature [K] - - Valid when: - \f[ - \frac{beta(T - T_{ref})}{rho_{ref}} << 1 - \f] - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" -#include "noRadiation.H" -#include "fvOptions.H" -#include "pimpleControl.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createFields.H" - #include "createTimeControls.H" - #include "CourantNo.H" - #include "setInitialDeltaT.H" - #include "initContinuityErrs.H" - - turbulence->validate(); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - #include "readTimeControls.H" - #include "CourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - #include "UEqn.H" - #include "TEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - laminarTransport.correct(); - turbulence->correct(); - } - } - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H deleted file mode 100644 index 908af133dc..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H +++ /dev/null @@ -1,126 +0,0 @@ -Info<< "Reading thermophysical properties\n" << endl; - -Info<< "Reading field T\n" << endl; -volScalarField T -( - IOobject - ( - "T", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -Info<< "Reading field p_rgh\n" << endl; -volScalarField p_rgh -( - IOobject - ( - "p_rgh", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -Info<< "Reading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "createPhi.H" - -#include "readTransportProperties.H" - -Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence -( - incompressible::turbulenceModel::New(U, phi, laminarTransport) -); - -// Kinematic density for buoyancy force -volScalarField rhok -( - IOobject - ( - "rhok", - runTime.timeName(), - mesh - ), - 1.0 - beta*(T - TRef) -); - -// kinematic turbulent thermal thermal conductivity m2/s -Info<< "Reading field alphat\n" << endl; -volScalarField alphat -( - IOobject - ( - "alphat", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - - -#include "readGravitationalAcceleration.H" -#include "readhRef.H" -#include "gh.H" - - -volScalarField p -( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - p_rgh + rhok*gh -); - -label pRefCell = 0; -scalar pRefValue = 0.0; -setRefCell -( - p, - p_rgh, - pimple.dict(), - pRefCell, - pRefValue -); - -if (p_rgh.needReference()) -{ - p += dimensionedScalar - ( - "p", - p.dimensions(), - pRefValue - getRefCellValue(p, pRefCell) - ); -} - -mesh.setFluxRequired(p_rgh.name()); - -#include "createMRF.H" -#include "createIncompressibleRadiationModel.H" -#include "createFvOptions.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H deleted file mode 100644 index 0b212ffa53..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H +++ /dev/null @@ -1,62 +0,0 @@ -{ - volScalarField rAU("rAU", 1.0/UEqn.A()); - surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU)); - volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh)); - - surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf()); - - surfaceScalarField phiHbyA - ( - "phiHbyA", - fvc::flux(HbyA) - + MRF.zeroFilter(rAUf*fvc::ddtCorr(U, phi)) - + phig - ); - - MRF.makeRelative(phiHbyA); - - // Update the pressure BCs to ensure flux consistency - constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF); - - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix p_rghEqn - ( - fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA) - ); - - p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell)); - - p_rghEqn.solve(); - - if (pimple.finalNonOrthogonalIter()) - { - // Calculate the conservative fluxes - phi = phiHbyA - p_rghEqn.flux(); - - // Explicitly relax pressure for momentum corrector - p_rgh.relax(); - - // Correct the momentum source with the pressure gradient flux - // calculated from the relaxed pressure - U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf); - U.correctBoundaryConditions(); - fvOptions.correct(U); - } - } - - #include "continuityErrs.H" - - p = p_rgh + rhok*gh; - - if (p_rgh.needReference()) - { - p += dimensionedScalar - ( - "p", - p.dimensions(), - pRefValue - getRefCellValue(p, pRefCell) - ); - p_rgh = p - rhok*gh; - } -} diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/files b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/files deleted file mode 100644 index 677ada2ca2..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -buoyantBoussinesqSimpleFoam.C - -EXE = $(FOAM_APPBIN)/buoyantBoussinesqSimpleFoam diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options deleted file mode 100644 index aaeaf96baf..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options +++ /dev/null @@ -1,19 +0,0 @@ -EXE_INC = \ - -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)/radiationModels/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lradiationModels \ - -lfiniteVolume \ - -lsampling \ - -lmeshTools \ - -lfvOptions diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H deleted file mode 100644 index fec770c974..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H +++ /dev/null @@ -1,27 +0,0 @@ -{ - alphat = turbulence->nut()/Prt; - alphat.correctBoundaryConditions(); - - volScalarField alphaEff("alphaEff", turbulence->nu()/Pr + alphat); - - fvScalarMatrix TEqn - ( - fvm::div(phi, T) - - fvm::laplacian(alphaEff, T) - == - radiation->ST(rhoCpRef, T) - + fvOptions(T) - ); - - TEqn.relax(); - - fvOptions.constrain(TEqn); - - TEqn.solve(); - - radiation->correct(); - - fvOptions.correct(T); - - rhok = 1.0 - beta*(T - TRef); -} diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H deleted file mode 100644 index d8a347f87d..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H +++ /dev/null @@ -1,35 +0,0 @@ - // Solve the momentum equation - - MRF.correctBoundaryVelocity(U); - - tmp tUEqn - ( - fvm::div(phi, U) - + MRF.DDt(U) - + turbulence->divDevReff(U) - == - fvOptions(U) - ); - fvVectorMatrix& UEqn = tUEqn.ref(); - - UEqn.relax(); - - fvOptions.constrain(UEqn); - - if (simple.momentumPredictor()) - { - solve - ( - UEqn - == - fvc::reconstruct - ( - ( - - ghf*fvc::snGrad(rhok) - - fvc::snGrad(p_rgh) - )*mesh.magSf() - ) - ); - - fvOptions.correct(U); - } diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C deleted file mode 100644 index e6caa887d2..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ /dev/null @@ -1,101 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 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 - buoyantBoussinesqSimpleFoam - -Description - Steady-state solver for buoyant, turbulent flow of incompressible fluids. - - Uses the Boussinesq approximation: - \f[ - rho_{k} = 1 - beta(T - T_{ref}) - \f] - - where: - \f$ rho_{k} \f$ = the effective (driving) density - beta = thermal expansion coefficient [1/K] - T = temperature [K] - \f$ T_{ref} \f$ = reference temperature [K] - - Valid when: - \f[ - \frac{beta(T - T_{ref})}{rho_{ref}} << 1 - \f] - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" -#include "noRadiation.H" -#include "fvOptions.H" -#include "simpleControl.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createFields.H" - #include "initContinuityErrs.H" - - turbulence->validate(); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (simple.loop(runTime)) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - // Pressure-velocity SIMPLE corrector - { - #include "UEqn.H" - #include "TEqn.H" - #include "pEqn.H" - } - - laminarTransport.correct(); - turbulence->correct(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H deleted file mode 100644 index a61f66aea0..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H +++ /dev/null @@ -1,126 +0,0 @@ -Info<< "Reading thermophysical properties\n" << endl; - -Info<< "Reading field T\n" << endl; -volScalarField T -( - IOobject - ( - "T", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -Info<< "Reading field p_rgh\n" << endl; -volScalarField p_rgh -( - IOobject - ( - "p_rgh", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -Info<< "Reading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "createPhi.H" - -#include "readTransportProperties.H" - -Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence -( - incompressible::turbulenceModel::New(U, phi, laminarTransport) -); - -// Kinematic density for buoyancy force -volScalarField rhok -( - IOobject - ( - "rhok", - runTime.timeName(), - mesh - ), - 1.0 - beta*(T - TRef) -); - -// kinematic turbulent thermal thermal conductivity m2/s -Info<< "Reading field alphat\n" << endl; -volScalarField alphat -( - IOobject - ( - "alphat", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - - -#include "readGravitationalAcceleration.H" -#include "readhRef.H" -#include "gh.H" - - -volScalarField p -( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - p_rgh + rhok*gh -); - -label pRefCell = 0; -scalar pRefValue = 0.0; -setRefCell -( - p, - p_rgh, - simple.dict(), - pRefCell, - pRefValue -); - -if (p_rgh.needReference()) -{ - p += dimensionedScalar - ( - "p", - p.dimensions(), - pRefValue - getRefCellValue(p, pRefCell) - ); -} - -mesh.setFluxRequired(p_rgh.name()); - -#include "createMRF.H" -#include "createIncompressibleRadiationModel.H" -#include "createFvOptions.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H deleted file mode 100644 index f29075b149..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H +++ /dev/null @@ -1,66 +0,0 @@ -{ - volScalarField rAU("rAU", 1.0/UEqn.A()); - surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU)); - volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh)); - - tUEqn.clear(); - - surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf()); - - surfaceScalarField phiHbyA - ( - "phiHbyA", - fvc::flux(HbyA) - ); - - MRF.makeRelative(phiHbyA); - - adjustPhi(phiHbyA, U, p_rgh); - - phiHbyA += phig; - - // Update the pressure BCs to ensure flux consistency - constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF); - - while (simple.correctNonOrthogonal()) - { - fvScalarMatrix p_rghEqn - ( - fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA) - ); - - p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell)); - - p_rghEqn.solve(); - - if (simple.finalNonOrthogonalIter()) - { - // Calculate the conservative fluxes - phi = phiHbyA - p_rghEqn.flux(); - - // Explicitly relax pressure for momentum corrector - p_rgh.relax(); - - // Correct the momentum source with the pressure gradient flux - // calculated from the relaxed pressure - U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf); - U.correctBoundaryConditions(); - fvOptions.correct(U); - } - } - - #include "continuityErrs.H" - - p = p_rgh + rhok*gh; - - if (p_rgh.needReference()) - { - p += dimensionedScalar - ( - "p", - p.dimensions(), - pRefValue - getRefCellValue(p, pRefCell) - ); - p_rgh = p - rhok*gh; - } -} diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H deleted file mode 100644 index d78368dec8..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H +++ /dev/null @@ -1,18 +0,0 @@ -singlePhaseTransportModel laminarTransport(U, phi); - -// Thermal expansion coefficient [1/K] -dimensionedScalar beta -( - "beta", - dimless/dimTemperature, - laminarTransport -); - -// Reference temperature [K] -dimensionedScalar TRef("TRef", dimTemperature, laminarTransport); - -// Laminar Prandtl number -dimensionedScalar Pr("Pr", dimless, laminarTransport); - -// Turbulent Prandtl number -dimensionedScalar Prt("Prt", dimless, laminarTransport); diff --git a/bin/buoyantBoussinesqPimpleFoam b/bin/buoyantBoussinesqPimpleFoam new file mode 100755 index 0000000000..da18136045 --- /dev/null +++ b/bin/buoyantBoussinesqPimpleFoam @@ -0,0 +1,39 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2019 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 +# buoyantBoussinesqPimpleFoam +# +# Description +# Script to inform the user that the buoyantBoussinesqPimpleFoam solver +# has been replaced by the more general buoyantPimpleFoam which can be used +# with the Boussinesq equation of state. +# +#------------------------------------------------------------------------------ + +echo "The buoyantBoussinesqPimpleFoam solver has been replaced" +echo "by the more general buoyantPimpleFoam solver" +echo "which can be used with the Boussinesq equation of state." + +#------------------------------------------------------------------------------ diff --git a/bin/buoyantBoussinesqSimpleFoam b/bin/buoyantBoussinesqSimpleFoam new file mode 100755 index 0000000000..34d7e6c3a7 --- /dev/null +++ b/bin/buoyantBoussinesqSimpleFoam @@ -0,0 +1,39 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2019 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 +# buoyantBoussinesqSimpleFoam +# +# Description +# Script to inform the user that the buoyantBoussinesqSimpleFoam solver +# has been replaced by the more general buoyantSimpleFoam which can be used +# with the Boussinesq equation of state. +# +#------------------------------------------------------------------------------ + +echo "The buoyantBoussinesqSimpleFoam solver has been replaced" +echo "by the more general buoyantSimpleFoam solver" +echo "which can used be with the Boussinesq equation of state." + +#------------------------------------------------------------------------------ diff --git a/bin/mergedDyM b/bin/mergedDyM index a764e93d12..b6f1ee48ac 100755 --- a/bin/mergedDyM +++ b/bin/mergedDyM @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -23,10 +23,11 @@ # along with OpenFOAM. If not, see . # # Script -# supersededByPostProcess +# mergedDyM # # Description -# Script to suggest using the new "postProcess" utility. +# Script to inform the user that the "DyM" solvers have been merged into +# the corresponding standard solvers. # #------------------------------------------------------------------------------ DyMsolver=${0##*/} diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index ee088e2aca..ed54eb5a3e 100644 --- a/etc/config.sh/bash_completion +++ b/etc/config.sh/bash_completion @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -272,56 +272,6 @@ _boxTurb_ () } complete -o filenames -o nospace -F _boxTurb_ boxTurb -_buoyantBoussinesqPimpleFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - -case) - opts="" ; extra="-d" ;; - -fileHandler) - opts="uncollated collated masterUncollated" ; extra="" ;; - -hostRoots|-roots) - opts="" ; extra="" ;; - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _buoyantBoussinesqPimpleFoam_ buoyantBoussinesqPimpleFoam - -_buoyantBoussinesqSimpleFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - -case) - opts="" ; extra="-d" ;; - -fileHandler) - opts="uncollated collated masterUncollated" ; extra="" ;; - -hostRoots|-roots) - opts="" ; extra="" ;; - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _buoyantBoussinesqSimpleFoam_ buoyantBoussinesqSimpleFoam - _buoyantPimpleFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" diff --git a/etc/templates/closedVolume/0/alphat b/etc/templates/closedVolume/0/alphat index a44f115462..9f1f56b66a 100644 --- a/etc/templates/closedVolume/0/alphat +++ b/etc/templates/closedVolume/0/alphat @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; internalField uniform 0; @@ -22,7 +22,7 @@ boundaryField { wall { - type alphatJayatillekeWallFunction; + type compressible::alphatJayatillekeWallFunction; Prt 0.85; value $internalField; } diff --git a/etc/templates/closedVolume/0/p b/etc/templates/closedVolume/0/p index 50c3d161d2..7464dc7318 100644 --- a/etc/templates/closedVolume/0/p +++ b/etc/templates/closedVolume/0/p @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; diff --git a/etc/templates/closedVolume/0/p_rgh b/etc/templates/closedVolume/0/p_rgh index 506b2d77d7..0f40e6ec92 100644 --- a/etc/templates/closedVolume/0/p_rgh +++ b/etc/templates/closedVolume/0/p_rgh @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; diff --git a/etc/templates/closedVolume/README b/etc/templates/closedVolume/README index e82f1320ee..8692931c17 100644 --- a/etc/templates/closedVolume/README +++ b/etc/templates/closedVolume/README @@ -1,7 +1,7 @@ Overview ======= + This is a template case for a closed volume -+ Setup to run buoyantBoussinesqSimpleFoam ++ Setup to run buoyantSimpleFoam + The case is designed to be meshed with snappyHexMesh + snappyHexMesh is setup to use a single trisurface file named CAD.obj + Copy the CAD.obj file to the constant/triSurface directory diff --git a/etc/templates/closedVolume/constant/thermophysicalProperties b/etc/templates/closedVolume/constant/thermophysicalProperties new file mode 100644 index 0000000000..5a81d7afe8 --- /dev/null +++ b/etc/templates/closedVolume/constant/thermophysicalProperties @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo eConst; + equationOfState Boussinesq; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + equationOfState + { + rho0 1; + T0 300; + beta 3e-03; + } + thermodynamics + { + Cv 712; + Hf 0; + } + transport + { + mu 1e-05; + Pr 0.7; + } +} + + +// ************************************************************************* // diff --git a/etc/templates/closedVolume/constant/transportProperties b/etc/templates/closedVolume/constant/transportProperties deleted file mode 100644 index 9c5fd422c2..0000000000 --- a/etc/templates/closedVolume/constant/transportProperties +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object transportProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -transportModel Newtonian; - -// Laminar viscosity -nu [0 2 -1 0 0 0 0] 1e-05; - -// Thermal expansion coefficient -beta [0 0 0 -1 0 0 0] 3e-03; - -// Reference temperature -TRef [0 0 0 1 0 0 0] 300; - -// Laminar Prandtl number -Pr [0 0 0 0 0 0 0] 0.9; - -// Turbulent Prandtl number -Prt [0 0 0 0 0 0 0] 0.7; - -// ************************************************************************* // diff --git a/etc/templates/closedVolume/system/controlDict b/etc/templates/closedVolume/system/controlDict index 173ebb72f6..71a800658d 100644 --- a/etc/templates/closedVolume/system/controlDict +++ b/etc/templates/closedVolume/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantBoussinesqSimpleFoam; +application buoyantSimpleFoam; startFrom latestTime; diff --git a/etc/templates/closedVolume/system/fvSchemes b/etc/templates/closedVolume/system/fvSchemes index 3c976fd616..bbe9efca13 100644 --- a/etc/templates/closedVolume/system/fvSchemes +++ b/etc/templates/closedVolume/system/fvSchemes @@ -43,7 +43,9 @@ divSchemes div(phi,omega) $turbulence; div(phi,epsilon) $turbulence; - div(phi,T) $turbulence; + div(phi,e) $turbulence; + + div(phi,Ekp) bounded Gauss linear; div((nuEff*dev2(T(grad(U))))) Gauss linear; } diff --git a/etc/templates/closedVolume/system/fvSolution b/etc/templates/closedVolume/system/fvSolution index 7cbd50e503..3aa65a065e 100644 --- a/etc/templates/closedVolume/system/fvSolution +++ b/etc/templates/closedVolume/system/fvSolution @@ -24,7 +24,7 @@ solvers relTol 0.1; } - "(U|T|k|omega|epsilon)" + "(U|e|k|omega|epsilon)" { solver smoothSolver; smoother symGaussSeidel; @@ -38,7 +38,7 @@ solvers relTol 0; } - "(U|k|omega|epsilon)Final" + "(U|e|k|omega|epsilon)Final" { $U; relTol 0; @@ -60,7 +60,7 @@ SIMPLE { p 1e-4; U 1e-4; - T 1e-4; + e 1e-4; "(k|omega|epsilon)" 1e-4; } nNonOrthogonalCorrectors 0; @@ -83,7 +83,7 @@ relaxationFactors equations { U 0.3; - T 0.5; + e 0.5; "(k|omega|epsilon)" 0.7; } } diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C index d68a6add0b..e15eeb17bc 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -410,6 +410,18 @@ makeThermos specie ); +makeThermos +( + rhoThermo, + heRhoThermo, + pureMixture, + constTransport, + sensibleInternalEnergy, + eConstThermo, + Boussinesq, + specie +); + makeThermos ( rhoThermo, diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties deleted file mode 100644 index 9d0135ba0c..0000000000 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties +++ /dev/null @@ -1,35 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -transportModel Newtonian; - -// Laminar viscosity -nu [0 2 -1 0 0 0 0] 1e-05; - -// Thermal expansion coefficient -beta [0 0 0 -1 0 0 0] 3e-03; - -// Reference temperature -TRef [0 0 0 1 0 0 0] 300; - -// Laminar Prandtl number -Pr [0 0 0 0 0 0 0] 0.7; - -// Turbulent Prandtl number -Prt [0 0 0 0 0 0 0] 0.85; - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean deleted file mode 100755 index 6b45f82a41..0000000000 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase - -#------------------------------------------------------------------------------ diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties deleted file mode 100644 index 9d0135ba0c..0000000000 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties +++ /dev/null @@ -1,35 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -transportModel Newtonian; - -// Laminar viscosity -nu [0 2 -1 0 0 0 0] 1e-05; - -// Thermal expansion coefficient -beta [0 0 0 -1 0 0 0] 3e-03; - -// Reference temperature -TRef [0 0 0 1 0 0 0] 300; - -// Laminar Prandtl number -Pr [0 0 0 0 0 0 0] 0.7; - -// Turbulent Prandtl number -Prt [0 0 0 0 0 0 0] 0.85; - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties deleted file mode 100644 index 9d0135ba0c..0000000000 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties +++ /dev/null @@ -1,35 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -transportModel Newtonian; - -// Laminar viscosity -nu [0 2 -1 0 0 0 0] 1e-05; - -// Thermal expansion coefficient -beta [0 0 0 -1 0 0 0] 3e-03; - -// Reference temperature -TRef [0 0 0 1 0 0 0] 300; - -// Laminar Prandtl number -Pr [0 0 0 0 0 0 0] 0.7; - -// Turbulent Prandtl number -Prt [0 0 0 0 0 0 0] 0.85; - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/T b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/T rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/T diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/U rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/U diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/alphat similarity index 89% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/alphat rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/alphat index 48d6755ff2..286747e019 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/alphat +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/alphat @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; internalField uniform 0; @@ -22,7 +22,7 @@ boundaryField { wall { - type alphatJayatillekeWallFunction; + type compressible::alphatJayatillekeWallFunction; Prt 0.85; value $internalField; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/epsilon rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/epsilon diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/k rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/k diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/nut b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/nut rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/nut diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p similarity index 96% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/p rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p index 63f2f9ac6f..25bad04e50 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/p +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p_rgh similarity index 93% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/p_rgh rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p_rgh index 0a68d59abd..a52ec740e6 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/0/p_rgh +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p_rgh @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; @@ -23,7 +23,6 @@ boundaryField wall { type fixedFluxPressure; - rho rhok; value $internalField; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/constant/g b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/constant/g rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/g diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/thermophysicalProperties new file mode 100644 index 0000000000..009e69bb9c --- /dev/null +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/thermophysicalProperties @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo eConst; + equationOfState Boussinesq; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 18; + } + equationOfState + { + rho0 1; + T0 300; + beta 1e-03; + } + thermodynamics + { + Cv 712; + Hf 0; + } + transport + { + mu 1e-03; + Pr 1; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/constant/transportProperties b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/transportProperties similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/constant/transportProperties rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/transportProperties diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/turbulenceProperties similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/turbulenceProperties diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/blockMeshDict rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/controlDict rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict index b46b78011e..cb6453df14 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/controlDict +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantBoussinesqPimpleFoam; +application buoyantPimpleFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes similarity index 87% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/fvSchemes rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes index 4ee71b8c73..942e2f832f 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes @@ -30,13 +30,16 @@ divSchemes default none; div(phi,U) Gauss linearUpwind grad(U); - div(phi,T) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; turbulence Gauss limitedLinear 1; div(phi,k) $turbulence; div(phi,epsilon) $turbulence; - div((nuEff*dev2(T(grad(U))))) Gauss linear; + div(phiv,p) Gauss linear; + div(phi,K) Gauss linear; + + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSolution similarity index 91% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/fvSolution rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSolution index 0090879c63..8efcfc5f99 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/fvSolution +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSolution @@ -17,6 +17,11 @@ FoamFile solvers { + "rho.*" + { + solver diagonal; + } + p_rgh { solver GAMG; @@ -31,7 +36,7 @@ solvers relTol 0; } - "(U|T|k|epsilon)" + "(U|e|k|epsilon)" { solver PBiCGStab; preconditioner DILU; @@ -39,9 +44,9 @@ solvers relTol 0.01; } - "(U|T|k|epsilon)Final" + "(U|e|k|epsilon)Final" { - $T; + $U; relTol 0; } @@ -52,6 +57,7 @@ PIMPLE momentumPredictor no; nNonOrthogonalCorrectors 0; nCorrectors 2; + pRefCell 0; pRefValue 0; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/residuals b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/residuals similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/residuals rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/residuals diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/streamlines b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/streamlines similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BernardCells/system/streamlines rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/streamlines diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean deleted file mode 100755 index 6b45f82a41..0000000000 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase - -#------------------------------------------------------------------------------ diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.orig b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/T.orig similarity index 99% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.orig rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/T.orig index be061a175a..e14a6738bc 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.orig +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/T.orig @@ -25,11 +25,13 @@ boundaryField type fixedValue; value uniform 300; } + ceiling { type fixedValue; value uniform 300; } + fixedWalls { type zeroGradient; diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/U diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/alphat similarity index 75% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/alphat index ff6617762d..d14b17abfe 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/alphat @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; internalField uniform 0; @@ -23,20 +23,17 @@ boundaryField { floor { - type alphatJayatillekeWallFunction; - Prt 0.85; + type compressible::alphatWallFunction; value uniform 0; } ceiling { - type alphatJayatillekeWallFunction; - Prt 0.85; + type compressible::alphatWallFunction; value uniform 0; } fixedWalls { - type alphatJayatillekeWallFunction; - Prt 0.85; + type compressible::alphatWallFunction; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/epsilon diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/k diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/nut diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p similarity index 96% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p index c71297a875..7203b9109c 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p_rgh similarity index 89% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p_rgh index a18188b234..86e87bdda1 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p_rgh @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; @@ -23,21 +23,18 @@ boundaryField floor { type fixedFluxPressure; - rho rhok; value uniform 0; } ceiling { type fixedFluxPressure; - rho rhok; value uniform 0; } fixedWalls { type fixedFluxPressure; - rho rhok; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/Allrun similarity index 93% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/Allrun index 56752ca0bb..b18d70e448 100755 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/Allrun @@ -4,6 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions +# Get application name application=$(getApplication) runApplication blockMesh diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/g diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties new file mode 100644 index 0000000000..5a81d7afe8 --- /dev/null +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo eConst; + equationOfState Boussinesq; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + equationOfState + { + rho0 1; + T0 300; + beta 3e-03; + } + thermodynamics + { + Cv 712; + Hf 0; + } + transport + { + mu 1e-05; + Pr 0.7; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties similarity index 97% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties index a652d98461..b68c3c893e 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/controlDict similarity index 94% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/controlDict index 35e9c23551..5e3ac9d735 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantBoussinesqPimpleFoam; +application buoyantPimpleFoam; startFrom startTime; @@ -29,7 +29,7 @@ deltaT 2; writeControl timeStep; -writeInterval 200; +writeInterval 100; purgeWrite 0; diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes similarity index 81% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes index d29a1bd15d..72b81b2b96 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes @@ -30,17 +30,20 @@ divSchemes default none; div(phi,U) Gauss upwind; - div(phi,T) Gauss upwind; + div(phi,e) Gauss upwind; + div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; - div(phi,R) Gauss upwind; - div(R) Gauss linear; - div((nuEff*dev2(T(grad(U))))) Gauss linear; + + div(phiv,p) Gauss linear; + div(phi,K) Gauss linear; + + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes { - default Gauss linear uncorrected; + default Gauss linear corrected; } interpolationSchemes @@ -50,7 +53,7 @@ interpolationSchemes snGradSchemes { - default uncorrected; + default corrected; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSolution similarity index 87% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSolution index 970dfca3eb..3ad5b1fc44 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSolution @@ -17,6 +17,11 @@ FoamFile solvers { + "rho.*" + { + solver diagonal; + } + p_rgh { solver PCG; @@ -31,7 +36,7 @@ solvers relTol 0; } - "(U|T|k|epsilon|R)" + "(U|e|k|epsilon)" { solver PBiCGStab; preconditioner DILU; @@ -39,7 +44,7 @@ solvers relTol 0.1; } - "(U|T|k|epsilon|R)Final" + "(U|e|k|epsilon)Final" { $U; relTol 0; @@ -48,21 +53,14 @@ solvers PIMPLE { - momentumPredictor no; + momentumPredictor yes; nOuterCorrectors 1; nCorrectors 2; nNonOrthogonalCorrectors 0; + pRefCell 0; pRefValue 0; } -relaxationFactors -{ - equations - { - "(U|T|k|epsilon|R)" 1; - "(U|T|k|epsilon|R)Final" 1; - } -} // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/setFieldsDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/setFieldsDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.orig b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/T.orig similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.orig rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/T.orig diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/U diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/alphat similarity index 80% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/alphat index ff6617762d..f4afbac47d 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/alphat @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; internalField uniform 0; @@ -23,19 +23,19 @@ boundaryField { floor { - type alphatJayatillekeWallFunction; + type compressible::alphatJayatillekeWallFunction; Prt 0.85; value uniform 0; } ceiling { - type alphatJayatillekeWallFunction; + type compressible::alphatJayatillekeWallFunction; Prt 0.85; value uniform 0; } fixedWalls { - type alphatJayatillekeWallFunction; + type compressible::alphatJayatillekeWallFunction; Prt 0.85; value uniform 0; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/epsilon diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/k diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/nut diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p similarity index 96% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p index c71297a875..7203b9109c 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p_rgh similarity index 89% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p_rgh index a18188b234..86e87bdda1 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p_rgh @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; @@ -23,21 +23,18 @@ boundaryField floor { type fixedFluxPressure; - rho rhok; value uniform 0; } ceiling { type fixedFluxPressure; - rho rhok; value uniform 0; } fixedWalls { type fixedFluxPressure; - rho rhok; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allclean similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allclean diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allrun diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties new file mode 100644 index 0000000000..5a81d7afe8 --- /dev/null +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/thermophysicalProperties @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo eConst; + equationOfState Boussinesq; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + equationOfState + { + rho0 1; + T0 300; + beta 3e-03; + } + thermodynamics + { + Cv 712; + Hf 0; + } + transport + { + mu 1e-05; + Pr 0.7; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/controlDict similarity index 93% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/controlDict index d5c886e62b..95bf1e268b 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/controlDict @@ -15,9 +15,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantBoussinesqSimpleFoam; +application buoyantSimpleFoam; -startFrom latestTime; +startFrom startTime; startTime 0; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSchemes similarity index 89% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSchemes index bcaaf62f81..3d522d23e3 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSchemes @@ -30,10 +30,13 @@ divSchemes default none; div(phi,U) bounded Gauss upwind; - div(phi,T) bounded Gauss upwind; + div(phi,e) bounded Gauss upwind; + div(phi,k) bounded Gauss upwind; div(phi,epsilon) bounded Gauss upwind; - div((nuEff*dev2(T(grad(U))))) Gauss linear; + + div(phi,Ekp) bounded Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSolution similarity index 94% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSolution index aec24dce6c..866afccf83 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSolution @@ -25,7 +25,7 @@ solvers relTol 0.01; } - "(U|T|k|epsilon|R)" + "(U|e|k|epsilon)" { solver PBiCGStab; preconditioner DILU; @@ -37,6 +37,7 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; + pRefCell 0; pRefValue 0; @@ -44,7 +45,7 @@ SIMPLE { p_rgh 1e-2; U 1e-4; - T 1e-2; + e 1e-2; // possibly check turbulence fields "(k|epsilon|omega)" 1e-3; @@ -60,7 +61,7 @@ relaxationFactors equations { U 0.3; - T 0.5; + e 0.5; "(k|epsilon|R)" 0.7; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/setFieldsDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/setFieldsDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/T diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/U diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/alphat similarity index 89% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/alphat index 27a824ca46..a1415887d3 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/alphat @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; internalField uniform 0; @@ -26,7 +26,7 @@ boundaryField wall { - type alphatJayatillekeWallFunction; + type compressible::alphatJayatillekeWallFunction; Prt 0.85; value uniform 0; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/epsilon diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/k diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/nut diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p similarity index 96% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p index 450b7088c9..cba4066d76 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p_rgh similarity index 93% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p_rgh index bb697419e7..4bc5a1b995 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p_rgh @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; internalField uniform 0; @@ -26,7 +26,6 @@ boundaryField wall { type fixedFluxPressure; - rho rhok; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/Allrun diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/thermophysicalProperties new file mode 100644 index 0000000000..5a81d7afe8 --- /dev/null +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/thermophysicalProperties @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport const; + thermo eConst; + equationOfState Boussinesq; + specie specie; + energy sensibleInternalEnergy; +} + +mixture +{ + specie + { + molWeight 28.9; + } + equationOfState + { + rho0 1; + T0 300; + beta 3e-03; + } + thermodynamics + { + Cv 712; + Hf 0; + } + transport + { + mu 1e-05; + Pr 0.7; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/turbulenceProperties similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/turbulenceProperties diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/controlDict similarity index 95% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/controlDict index 0c04e45a77..6da5156000 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantBoussinesqSimpleFoam; +application buoyantSimpleFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/decomposeParDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/decomposeParDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSchemes similarity index 87% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSchemes index 61cb047f19..f6deccfcd8 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSchemes @@ -30,12 +30,13 @@ divSchemes default none; div(phi,U) bounded Gauss upwind; - div(phi,T) bounded Gauss upwind; + div(phi,e) bounded Gauss upwind; + div(phi,k) bounded Gauss upwind; div(phi,epsilon) bounded Gauss upwind; - div(phi,R) bounded Gauss upwind; - div(R) Gauss linear; - div((nuEff*dev2(T(grad(U))))) Gauss linear; + + div(phi,Ekp) bounded Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSolution similarity index 94% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSolution index 1b65cbea74..5da8d8d4be 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSolution @@ -25,7 +25,7 @@ solvers relTol 0.01; } - "(U|T|k|epsilon)" + "(U|e|k|epsilon)" { solver PBiCGStab; preconditioner DILU; @@ -44,7 +44,7 @@ SIMPLE { p_rgh 1e-2; U 1e-4; - T 1e-3; + e 1e-3; // possibly check turbulence fields "(k|epsilon|omega)" 1e-3; @@ -60,7 +60,7 @@ relaxationFactors equations { U 0.2; - T 0.5; + e 0.5; "(k|epsilon)" 0.7; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/meshQualityDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/meshQualityDict diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict