diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C index a975a77d01..f509052ca5 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) // --- Pressure corrector loop while (pimple.correct()) { - #include "../../../heatTransfer/buoyantPimpleFoam/pEqn.H" + #include "../../../heatTransfer/buoyantFoam/pEqn.H" } if (pimple.turbCorr()) diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantFoam/EEqn.H similarity index 100% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H rename to applications/solvers/heatTransfer/buoyantFoam/EEqn.H diff --git a/applications/solvers/heatTransfer/buoyantFoam/Make/files b/applications/solvers/heatTransfer/buoyantFoam/Make/files new file mode 100644 index 0000000000..fccde862b2 --- /dev/null +++ b/applications/solvers/heatTransfer/buoyantFoam/Make/files @@ -0,0 +1,3 @@ +buoyantFoam.C + +EXE = $(FOAM_APPBIN)/buoyantFoam diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantFoam/Make/options similarity index 100% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options rename to applications/solvers/heatTransfer/buoyantFoam/Make/options diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantFoam/UEqn.H similarity index 100% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H rename to applications/solvers/heatTransfer/buoyantFoam/UEqn.H diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C similarity index 95% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C rename to applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C index b616d045c6..b8b4977137 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,12 +22,12 @@ License along with OpenFOAM. If not, see . Application - buoyantPimpleFoam + buoyantFoam Description - Transient solver for buoyant, turbulent flow of compressible fluids for - ventilation and heat-transfer, with optional mesh motion and - mesh topology changes. + Solver for steady or transient buoyant, turbulent flow of compressible + fluids for ventilation and heat-transfer, with optional mesh motion and mesh + topology changes. Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and pseudo-transient simulations. diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/correctPhi.H b/applications/solvers/heatTransfer/buoyantFoam/correctPhi.H similarity index 100% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/correctPhi.H rename to applications/solvers/heatTransfer/buoyantFoam/correctPhi.H diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFieldRefs.H b/applications/solvers/heatTransfer/buoyantFoam/createFieldRefs.H similarity index 100% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/createFieldRefs.H rename to applications/solvers/heatTransfer/buoyantFoam/createFieldRefs.H diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantFoam/createFields.H similarity index 100% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H rename to applications/solvers/heatTransfer/buoyantFoam/createFields.H diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantFoam/pEqn.H similarity index 100% rename from applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H rename to applications/solvers/heatTransfer/buoyantFoam/pEqn.H diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/files b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/files deleted file mode 100644 index f4053436b5..0000000000 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -buoyantPimpleFoam.C - -EXE = $(FOAM_APPBIN)/buoyantPimpleFoam diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H deleted file mode 100644 index fff8969262..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H +++ /dev/null @@ -1,27 +0,0 @@ -{ - volScalarField& he = thermo.he(); - - fvScalarMatrix EEqn - ( - fvm::div(phi, he) - + ( - he.name() == "e" - ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho)) - : fvc::div(phi, volScalarField("K", 0.5*magSqr(U))) - ) - + thermophysicalTransport->divq(he) - == - rho*(U&g) - + fvModels.source(rho, he) - ); - - EEqn.relax(); - - fvConstraints.constrain(EEqn); - - EEqn.solve(); - - fvConstraints.constrain(he); - - thermo.correct(); -} diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/files b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/files deleted file mode 100644 index 25c10cc98f..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -buoyantSimpleFoam.C - -EXE = $(FOAM_APPBIN)/buoyantSimpleFoam diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options deleted file mode 100644 index d96367798b..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ /dev/null @@ -1,23 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/finiteVolume/cfdTools \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/physicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude - -EXE_LIBS = \ - -lfiniteVolume \ - -lfvModels \ - -lfvConstraints \ - -lsampling \ - -lmeshTools \ - -lthermophysicalTransportModels \ - -lfluidThermophysicalModels \ - -lspecie \ - -lmomentumTransportModels \ - -lcompressibleMomentumTransportModels \ - -lmeshTools diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H deleted file mode 100644 index 308f5e6246..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H +++ /dev/null @@ -1,35 +0,0 @@ - // Solve the Momentum equation - - MRF.correctBoundaryVelocity(U); - - tmp tUEqn - ( - fvm::div(phi, U) - + MRF.DDt(rho, U) - + turbulence->divDevTau(U) - == - fvModels.source(rho, U) - ); - fvVectorMatrix& UEqn = tUEqn.ref(); - - UEqn.relax(); - - fvConstraints.constrain(UEqn); - - if (simple.momentumPredictor()) - { - solve - ( - UEqn - == - fvc::reconstruct - ( - ( - - ghf*fvc::snGrad(rho) - - fvc::snGrad(p_rgh) - )*mesh.magSf() - ) - ); - - fvConstraints.constrain(U); - } diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C deleted file mode 100644 index f098f438dc..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ /dev/null @@ -1,91 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 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 - buoyantSimpleFoam - -Description - Steady-state solver for buoyant, turbulent flow of compressible fluids, - including radiation, for ventilation and heat-transfer. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "compressibleMomentumTransportModels.H" -#include "fluidThermophysicalTransportModel.H" -#include "simpleControl.H" -#include "pressureReference.H" -#include "hydrostaticInitialisation.H" -#include "fvModels.H" -#include "fvConstraints.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 "createFieldRefs.H" - #include "initContinuityErrs.H" - - turbulence->validate(); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (simple.loop(runTime)) - { - Info<< "Time = " << runTime.userTimeName() << nl << endl; - - fvModels.correct(); - - // Pressure-velocity SIMPLE corrector - { - #include "UEqn.H" - #include "EEqn.H" - #include "pEqn.H" - } - - turbulence->correct(); - thermophysicalTransport->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/buoyantSimpleFoam/createFieldRefs.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFieldRefs.H deleted file mode 100644 index 502b3b4230..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFieldRefs.H +++ /dev/null @@ -1 +0,0 @@ -const volScalarField& psi = thermo.psi(); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H deleted file mode 100644 index 893b50fcdc..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H +++ /dev/null @@ -1,105 +0,0 @@ -Info<< "Reading thermophysical properties\n" << endl; - -autoPtr pThermo(fluidThermo::New(mesh)); -fluidThermo& thermo = pThermo(); -thermo.validate(args.executable(), "h", "e"); - -volScalarField& p = thermo.p(); - -volScalarField rho -( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - thermo.rho() -); - -Info<< "Reading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "compressibleCreatePhi.H" - -Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence -( - compressible::momentumTransportModel::New - ( - rho, - U, - phi, - thermo - ) -); - -Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport -( - fluidThermophysicalTransportModel::New(turbulence(), thermo) -); - - -#include "readGravitationalAcceleration.H" -#include "readhRef.H" -#include "gh.H" -#include "readpRef.H" - - -Info<< "Reading field p_rgh\n" << endl; -volScalarField p_rgh -( - IOobject - ( - "p_rgh", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -pressureReference pressureReference -( - p, - p_rgh, - simple.dict(), - thermo.incompressible() -); - -mesh.setFluxRequired(p_rgh.name()); - -hydrostaticInitialisation -( - p_rgh, - p, - rho, - U, - gh, - ghf, - pRef, - thermo, - simple.dict() -); - -dimensionedScalar initialMass = fvc::domainIntegrate(rho); - -#include "createMRF.H" -#include "createFvModels.H" -#include "createFvConstraints.H" -#include "checkRadiationModel.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H deleted file mode 100644 index 80a9cd8ac6..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H +++ /dev/null @@ -1,115 +0,0 @@ -rho = thermo.rho(); - -if (!simple.transonic()) -{ - rho.relax(); -} - -const volScalarField rAU("rAU", 1.0/UEqn.A()); -const surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); -volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh)); - -tUEqn.clear(); - -surfaceScalarField phiHbyA -( - "phiHbyA", - fvc::interpolate(rho)*fvc::flux(HbyA) -); - -MRF.makeRelative(fvc::interpolate(rho), phiHbyA); - -bool closedVolume = adjustPhi(phiHbyA, U, p_rgh); - -surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf()); - -phiHbyA += phig; - -// Update the pressure BCs to ensure flux consistency -constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF); - -fvScalarMatrix p_rghEqn(p_rgh, dimMass/dimTime); - -if (simple.transonic()) -{ - surfaceScalarField phid - ( - "phid", - (fvc::interpolate(psi)/fvc::interpolate(rho))*phiHbyA - ); - - phiHbyA -= fvc::interpolate(psi*p_rgh)*phiHbyA/fvc::interpolate(rho); - - while (simple.correctNonOrthogonal()) - { - p_rghEqn = - fvc::div(phiHbyA) + fvm::div(phid, p_rgh) - - fvm::laplacian(rhorAUf, p_rgh) - == - fvModels.source(psi, p_rgh, rho.name()); - - // Relax the pressure equation to ensure diagonal-dominance - p_rghEqn.relax(); - - p_rghEqn.setReference - ( - pressureReference.refCell(), - pressureReference.refValue() - ); - - p_rghEqn.solve(); - } -} -else -{ - while (simple.correctNonOrthogonal()) - { - p_rghEqn = - fvc::div(phiHbyA) - - fvm::laplacian(rhorAUf, p_rgh) - == - fvModels.source(psi, p_rgh, rho.name()); - - p_rghEqn.setReference - ( - pressureReference.refCell(), - pressureReference.refValue() - ); - - p_rghEqn.solve(); - } -} - -phi = phiHbyA + p_rghEqn.flux(); - -p = p_rgh + rho*gh + pRef; - -#include "incompressible/continuityErrs.H" - -// 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())/rhorAUf); -U.correctBoundaryConditions(); -fvConstraints.constrain(U); - -fvConstraints.constrain(p); - -// For closed-volume compressible cases adjust the pressure level -// to obey overall mass continuity -if (closedVolume && !thermo.incompressible()) -{ - p += (initialMass - fvc::domainIntegrate(thermo.rho())) - /fvc::domainIntegrate(psi); - p_rgh = p - rho*gh - pRef; - p.correctBoundaryConditions(); -} - -rho = thermo.rho(); - -if (!simple.transonic()) -{ - rho.relax(); -} diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H index 1f828975f9..3a544ccd1c 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H @@ -52,7 +52,7 @@ else // --- PISO loop while (pimple.correct()) { - #include "../../buoyantPimpleFoam/pEqn.H" + #include "../../buoyantFoam/pEqn.H" } if (pimples.pimpleTurbCorr(i)) diff --git a/bin/buoyantPimpleFoam b/bin/buoyantPimpleFoam new file mode 100755 index 0000000000..8fa5af36e6 --- /dev/null +++ b/bin/buoyantPimpleFoam @@ -0,0 +1,39 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2022 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 +# buoyantPimpleFoam +# +# Description +# Script to inform the user that the buoyantPimpleFoam solver +# has been replaced by the more general buoyantFoam which can be used +# for both steady and transient cases. +# +#------------------------------------------------------------------------------ + +echo "The buoyantPimpleFoam solver has been replaced" +echo "by the more general buoyantFoam solver" +echo "which can be used for both steady and transient cases." + +#------------------------------------------------------------------------------ diff --git a/bin/buoyantSimpleFoam b/bin/buoyantSimpleFoam new file mode 100755 index 0000000000..e69379d0b1 --- /dev/null +++ b/bin/buoyantSimpleFoam @@ -0,0 +1,39 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2022 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 +# buoyantSimpleFoam +# +# Description +# Script to inform the user that the buoyantSimpleFoam solver +# has been replaced by the more general buoyantFoam which can be used +# for both steady and transient cases. +# +#------------------------------------------------------------------------------ + +echo "The buoyantSimpleFoam solver has been replaced" +echo "by the more general buoyantFoam solver" +echo "which can be used for both steady and transient cases." + +#------------------------------------------------------------------------------ diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index b8d269b8e2..5cbf2db168 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-2021 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -282,7 +282,7 @@ _boxTurb_ () } complete -o filenames -o nospace -F _boxTurb_ boxTurb -_buoyantPimpleFoam_ () +_buoyantFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" local prev="${COMP_WORDS[COMP_CWORD-1]}" @@ -305,7 +305,7 @@ _buoyantPimpleFoam_ () esac COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) } -complete -o filenames -o nospace -F _buoyantPimpleFoam_ buoyantPimpleFoam +complete -o filenames -o nospace -F _buoyantFoam_ buoyantFoam _buoyantReactingFoam_ () { @@ -332,31 +332,6 @@ _buoyantReactingFoam_ () } complete -o filenames -o nospace -F _buoyantReactingFoam_ buoyantReactingFoam -_buoyantSimpleFoam_ () -{ - 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 -libs -listFunctionObjects -listFvConstraints -listFvModels -listMomentumTransportModels -listScalarBCs -listSwitches -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|-libs|-roots) - opts="" ; extra="" ;; - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _buoyantSimpleFoam_ buoyantSimpleFoam - _cavitatingFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" diff --git a/etc/templates/closedVolume/README b/etc/templates/closedVolume/README index 0203bed3f8..02411f2a12 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 buoyantSimpleFoam ++ Setup to run buoyantFoam + 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/geometry directory diff --git a/etc/templates/closedVolume/system/controlDict b/etc/templates/closedVolume/system/controlDict index a7b5aa8149..d55e526150 100644 --- a/etc/templates/closedVolume/system/controlDict +++ b/etc/templates/closedVolume/system/controlDict @@ -13,7 +13,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom latestTime; diff --git a/etc/templates/closedVolume/system/fvSchemes b/etc/templates/closedVolume/system/fvSchemes index fbb64bce26..7d27eb5874 100644 --- a/etc/templates/closedVolume/system/fvSchemes +++ b/etc/templates/closedVolume/system/fvSchemes @@ -31,20 +31,21 @@ gradSchemes divSchemes { - default none; + default none; // For transient, remove "bounded" - div(phi,U) bounded Gauss linearUpwind limited; + div(phi,U) bounded Gauss linearUpwind limited; // For transient, remove "bounded" - turbulence bounded Gauss limitedLinear 1; - div(phi,k) $turbulence; - div(phi,omega) $turbulence; - div(phi,epsilon) $turbulence; + turbulence bounded Gauss limitedLinear 1; + div(phi,k) $turbulence; + div(phi,omega) $turbulence; + div(phi,epsilon) $turbulence; - div(phi,e) $turbulence; + div(phi,e) $turbulence; - div(phi,Ekp) bounded Gauss linear; + div(phi,K) bounded Gauss linear; + div(phi,(p|rho)) bounded Gauss linear; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/test/postProcessing/channel/system/controlDict b/test/postProcessing/channel/system/controlDict index 769810535a..fb086a1192 100644 --- a/test/postProcessing/channel/system/controlDict +++ b/test/postProcessing/channel/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantPimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/T b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/T rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/T diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/U b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/U rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/U diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/alphat b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/alphat rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/alphat diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/epsilon b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/epsilon diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/k b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/k rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/k diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/nut b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/nut rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/nut diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/p diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/BernardCells/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/BernardCells/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/g b/tutorials/heatTransfer/buoyantFoam/BernardCells/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/g rename to tutorials/heatTransfer/buoyantFoam/BernardCells/constant/g diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/BernardCells/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/BernardCells/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/BernardCells/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/BernardCells/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/BernardCells/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/BernardCells/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict b/tutorials/heatTransfer/buoyantFoam/BernardCells/system/controlDict similarity index 97% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/BernardCells/system/controlDict index 98361a7ffe..eacc61283c 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/BernardCells/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantPimpleFoam; +application buoyantFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/BernardCells/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/BernardCells/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/BernardCells/system/fvSolution similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/BernardCells/system/fvSolution diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/U diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/omega similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/omega diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/Allclean similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/Allclean diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/README b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/README similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/README rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/README diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/pRef b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/pRef similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/pRef rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/pRef diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/controlDict index 2be49a3273..c10c6c413e 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/controlDict @@ -13,7 +13,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/fvSolution similarity index 99% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/fvSolution index dd7f924b20..26ef7b7af6 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/fvSolution @@ -35,7 +35,7 @@ solvers } } -SIMPLE +PIMPLE { momentumPredictor no; nNonOrthogonalCorrectors 0; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/sample similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/system/sample diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/createGraphs similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/createGraphs diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_10_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_10_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_10_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_10_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_30_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_30_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_30_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_30_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_40_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_40_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_40_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_40_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_50_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_50_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_50_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_50_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_60_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_60_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_60_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_60_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_70_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_70_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_70_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_70_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_90_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_90_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_90_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mt_z0_90_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_10_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_10_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_10_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_10_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_30_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_30_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_30_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_30_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_40_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_40_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_40_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_40_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_50_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_50_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_50_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_50_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_60_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_60_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_60_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_60_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_70_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_70_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_70_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_70_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_90_lo.dat b/tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_90_lo.dat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_90_lo.dat rename to tutorials/heatTransfer/buoyantFoam/buoyantCavity/validation/exptData/mv_z0_90_lo.dat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/T b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/T rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/U diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/baffle3DRegion/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/baffle3DRegion/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/0.orig/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/Allclean similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/Allclean diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/baffle3DRegion/physicalProperties b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/baffle3DRegion/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/baffle3DRegion/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/baffle3DRegion/physicalProperties diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/g b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/g rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle1D.stl b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/geometry/baffle1D.stl similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle1D.stl rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/geometry/baffle1D.stl diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle3D.stl b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/geometry/baffle3D.stl similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle3D.stl rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/geometry/baffle3D.stl diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/pRef b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/pRef similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/pRef rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/pRef diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/1DBaffle/1DTemperatureMasterBafflePatches similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DTemperatureMasterBafflePatches rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/1DBaffle/1DTemperatureMasterBafflePatches diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DbaffleSolidThermo b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/1DBaffle/1DbaffleSolidThermo similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DbaffleSolidThermo rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/1DBaffle/1DbaffleSolidThermo diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/3DBaffle/3DTemperatureMasterBafflePatches similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DTemperatureMasterBafflePatches rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/3DBaffle/3DTemperatureMasterBafflePatches diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DbaffleRadiation b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/3DBaffle/3DbaffleRadiation similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DbaffleRadiation rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/3DBaffle/3DbaffleRadiation diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/extrudeModel b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/3DBaffle/extrudeModel similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/extrudeModel rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/3DBaffle/extrudeModel diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/baffle3DSetup b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/baffle3DSetup similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/baffle3DSetup rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/baffle3DSetup diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/wallBafflePatches b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/wallBafflePatches similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/wallBafflePatches rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/include/wallBafflePatches diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/controlDict index e7380bc8fa..1ac1484c57 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/controlDict @@ -13,7 +13,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/createBafflesDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/createBafflesDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/fvSolution similarity index 90% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/fvSolution index 9a30a32fe1..a176d609e3 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/circuitBoardCooling/system/fvSolution @@ -18,11 +18,12 @@ solvers { p_rgh { - solver GAMG; - smoother DICGaussSeidel; + solver GAMG; + tolerance 1e-7; + relTol 0.01; + + smoother DICGaussSeidel; - tolerance 1e-7; - relTol 0.01; } "(U|h|k|epsilon|omega)" @@ -34,7 +35,7 @@ solvers } } -SIMPLE +PIMPLE { momentumPredictor no; nNonOrthogonalCorrectors 0; diff --git a/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/DR b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/DR new file mode 100644 index 0000000000..f5dfbbcae4 --- /dev/null +++ b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/DR @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format binary; + class volScalarField; + location "0"; + object DR; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + walls + { + type calculated; + value uniform 0; + } + inlet + { + type calculated; + value uniform 16.61; + } + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/PMV b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/PMV new file mode 100644 index 0000000000..3ace2a669c --- /dev/null +++ b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/PMV @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format binary; + class volScalarField; + location "0"; + object PMV; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.40936; + +boundaryField +{ + walls + { + type calculated; + value uniform 1.40936; + } + inlet + { + type calculated; + value uniform -1.18438; + } + outlet + { + type calculated; + value uniform 1.40936; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/PPD b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/PPD new file mode 100644 index 0000000000..84c80fce9e --- /dev/null +++ b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/PPD @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format binary; + class volScalarField; + location "0"; + object PPD; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 46.0115; + +boundaryField +{ + walls + { + type calculated; + value uniform 46.0115; + } + inlet + { + type calculated; + value uniform 34.4876; + } + outlet + { + type calculated; + value uniform 46.0115; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/T b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/T rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/U b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/U rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/U diff --git a/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/age b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/age new file mode 100644 index 0000000000..3db85bcb35 Binary files /dev/null and b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/age differ diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/alphat b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/alphat rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/epsilon b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/k b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/k rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/nut b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/nut rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/p b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/p rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/Allrun b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/Allrun rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/g b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/g rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/pRef b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/pRef similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/pRef rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/pRef diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/controlDict b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/controlDict similarity index 97% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/controlDict index 8df241308b..4aa7e1bc9d 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/createPatchDict b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/createPatchDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/createPatchDict rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/createPatchDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/fvSchemes similarity index 78% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/fvSchemes index 59ef321032..4f76ecb61f 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/fvSchemes @@ -26,15 +26,16 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) bounded Gauss upwind; - div(phi,e) bounded Gauss upwind; + div(phi,U) bounded Gauss upwind; + div(phi,e) bounded Gauss upwind; - div(phi,k) bounded Gauss upwind; - div(phi,epsilon) bounded Gauss upwind; + div(phi,K) Gauss linear; + div(phi,(p|rho)) Gauss linear; - div(phi,Ekp) bounded Gauss linear; + div(phi,k) bounded Gauss upwind; + div(phi,epsilon) bounded Gauss upwind; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/fvSolution similarity index 99% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/fvSolution index a103f537e3..2bf44cb324 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/fvSolution @@ -39,7 +39,7 @@ solvers } } -SIMPLE +PIMPLE { nNonOrthogonalCorrectors 0; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/topoSetDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict rename to tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/topoSetDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/T b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/T rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/U diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/alphat b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/alphat rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/omega similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/omega diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allclean similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allclean diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allmesh b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allmesh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allmesh rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allmesh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allrun-parallel similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/Allrun-parallel diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/README b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/README similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/README rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/README diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/pRef b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/pRef similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/pRef rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/pRef diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/externalSolver similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/externalSolver diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/controlDict b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/controlDict index 565afa1ca9..b8413cec0e 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/controlDict @@ -13,7 +13,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/decomposeParDict b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/decomposeParDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/decomposeParDict rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/decomposeParDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/fvSolution similarity index 99% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/fvSolution index b49e4e8a5a..a7f42003d7 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/externalCoupledCavity/system/fvSolution @@ -35,7 +35,7 @@ solvers } } -SIMPLE +PIMPLE { momentumPredictor yes; nNonOrthogonalCorrectors 0; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/G similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/G diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/T b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/T rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/U diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/alphat b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/alphat rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/Allclean similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allclean rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/Allclean diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/fvModels b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/fvModels similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/fvModels rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/fvModels diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/pRef b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/pRef similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/pRef rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/pRef diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/radiationProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/constant/radiationProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/controlDict index ef719f9a67..40b6fd0e4d 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/fvSolution similarity index 99% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/fvSolution index 808013f222..443e001583 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoom/system/fvSolution @@ -40,7 +40,7 @@ solvers } } -SIMPLE +PIMPLE { nNonOrthogonalCorrectors 0; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/G similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/G diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/IDefault similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/IDefault diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/T b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/T rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/U diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/alphat b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/alphat rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/Allclean similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allclean rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/Allclean diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/fvModels b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/fvModels similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/fvModels rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/fvModels diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/pRef b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/pRef similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/pRef rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/pRef diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/radiationProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/constant/radiationProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/controlDict index 072099052b..03d03485f8 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/fvSolution similarity index 99% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/fvSolution index 56bd58f08d..17a43bb5bb 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/hotRadiationRoomFvDOM/system/fvSolution @@ -43,7 +43,7 @@ solvers } } -SIMPLE +PIMPLE { nNonOrthogonalCorrectors 0; pRefCell 0; diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/T.orig similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/T.orig diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/U diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/alphat diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/epsilon diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/k diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/nut diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/p diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantFoam/hotRoom/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun rename to tutorials/heatTransfer/buoyantFoam/hotRoom/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g rename to tutorials/heatTransfer/buoyantFoam/hotRoom/constant/g diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/hotRoom/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/pRef b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/pRef similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/pRef rename to tutorials/heatTransfer/buoyantFoam/hotRoom/constant/pRef diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/hotRoom/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/hotRoom/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict index 877ef149d4..b8820f8c25 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantPimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSolution similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSolution diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/setFieldsDict similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict rename to tutorials/heatTransfer/buoyantFoam/hotRoom/system/setFieldsDict diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/T.orig b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/T.orig similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/T.orig rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/T.orig diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/U b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/U rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/U diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/alphat b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/alphat rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/alphat diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/epsilon b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/epsilon diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/k b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/k rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/k diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/nut b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/nut rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/nut diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/p diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/Allrun b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/Allrun rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/g b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/g rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/constant/g diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/controlDict b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/controlDict index 877ef149d4..b8820f8c25 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantPimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/fvSolution similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/fvSolution diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/setFieldsDict b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/setFieldsDict similarity index 100% rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/setFieldsDict rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesq/system/setFieldsDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/T.orig b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/T.orig similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/T.orig rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/T.orig diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/U b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/U rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/U diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/alphat b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/alphat rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/epsilon b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/k b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/k rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/nut b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/nut rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allclean b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/Allclean similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allclean rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/Allclean diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allrun b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/Allrun rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/g b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/g rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/controlDict b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/controlDict index 010b105f23..9b2ecf9925 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/fvSchemes similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/fvSchemes diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/fvSolution similarity index 97% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/fvSolution index 699519431a..befc19559e 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/fvSolution @@ -33,10 +33,8 @@ solvers } } -SIMPLE +PIMPLE { - nNonOrthogonalCorrectors 0; - pRefCell 0; pRefValue 0; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/setFieldsDict b/tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/setFieldsDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/system/setFieldsDict rename to tutorials/heatTransfer/buoyantFoam/hotRoomBoussinesqSteady/system/setFieldsDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/T similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/T rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/T diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/U similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/U rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/U diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/alphat similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/alphat rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/alphat diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/epsilon b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/epsilon similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/epsilon rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/epsilon diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/k similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/k rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/k diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/nut similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/nut rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/nut diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/p similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/p diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/p_rgh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/0/p_rgh rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/0/p_rgh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/Allrun similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/Allrun rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/Allrun diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/g b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/g similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/g rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/g diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/geometry/fridgeA.eMesh b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/geometry/fridgeA.eMesh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/geometry/fridgeA.eMesh rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/geometry/fridgeA.eMesh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/momentumTransport b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/momentumTransport rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/physicalProperties b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/physicalProperties similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/physicalProperties rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/constant/physicalProperties diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/blockMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/blockMeshDict rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/blockMeshDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/controlDict similarity index 96% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/controlDict rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/controlDict index 1c3336d3c7..c841dbc37b 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/controlDict +++ b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantSimpleFoam; +application buoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/decomposeParDict b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/decomposeParDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/decomposeParDict rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/decomposeParDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/fvSchemes similarity index 78% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSchemes rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/fvSchemes index fa2f10d0b0..aed4c2fc42 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/fvSchemes @@ -26,15 +26,17 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) bounded Gauss upwind; - div(phi,e) bounded Gauss upwind; + div(phi,U) bounded Gauss upwind; + div(phi,e) bounded Gauss upwind; - div(phi,k) bounded Gauss upwind; - div(phi,epsilon) bounded Gauss upwind; + div(phi,K) Gauss linear; + div(phi,(p|rho)) Gauss linear; + + div(phi,k) bounded Gauss upwind; + div(phi,epsilon) bounded Gauss upwind; - div(phi,Ekp) Gauss linear; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/fvSolution similarity index 95% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSolution rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/fvSolution index 3b3483bde9..478309df46 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/fvSolution +++ b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/fvSolution @@ -22,7 +22,7 @@ solvers smoother DICGaussSeidel; tolerance 1e-8; - relTol 0.01; + relTol 0.1; } "(U|e|k|epsilon)" @@ -34,9 +34,9 @@ solvers } } -SIMPLE +PIMPLE { - nNonOrthogonalCorrectors 1; + nCorrectors 2; pRefCell 0; pRefValue 0; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/meshQualityDict b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/meshQualityDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/meshQualityDict rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/meshQualityDict diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/snappyHexMeshDict similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict rename to tutorials/heatTransfer/buoyantFoam/iglooWithFridges/system/snappyHexMeshDict