diff --git a/applications/solvers/incompressible/channelOodles/createFields.H b/applications/solvers/incompressible/channelOodles/createFields.H index 9f9804a2e2..26559fcb1a 100644 --- a/applications/solvers/incompressible/channelOodles/createFields.H +++ b/applications/solvers/incompressible/channelOodles/createFields.H @@ -37,7 +37,7 @@ singlePhaseTransportModel laminarTransport(U, phi); - autoPtr sgsModel + autoPtr sgsModel ( - LESmodel::New(U, phi, laminarTransport) + incompressible::LESmodel::New(U, phi, laminarTransport) ); diff --git a/applications/solvers/incompressible/oodles/createFields.H b/applications/solvers/incompressible/oodles/createFields.H index 9f9804a2e2..26559fcb1a 100644 --- a/applications/solvers/incompressible/oodles/createFields.H +++ b/applications/solvers/incompressible/oodles/createFields.H @@ -37,7 +37,7 @@ singlePhaseTransportModel laminarTransport(U, phi); - autoPtr sgsModel + autoPtr sgsModel ( - LESmodel::New(U, phi, laminarTransport) + incompressible::LESmodel::New(U, phi, laminarTransport) ); diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H b/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H index 75260de6c2..4b1012b850 100644 --- a/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H @@ -146,7 +146,7 @@ interfaceProperties interface(alpha1, U, twoPhaseProperties); // Construct LES model - autoPtr turbulence + autoPtr turbulence ( - LESmodel::New(U, phi, twoPhaseProperties) + incompressible::LESmodel::New(U, phi, twoPhaseProperties) ); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H index 02c3b45295..1fba42a1c2 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H @@ -92,7 +92,7 @@ interfaceProperties interface(gamma, U, twoPhaseProperties()); // Construct LES model - autoPtr turbulence + autoPtr turbulence ( - LESmodel::New(U, phi, twoPhaseProperties()) + incompressible::LESmodel::New(U, phi, twoPhaseProperties()) ); diff --git a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H b/applications/solvers/multiphase/lesCavitatingFoam/createFields.H index 47ac1c9387..7590df3f59 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H +++ b/applications/solvers/multiphase/lesCavitatingFoam/createFields.H @@ -79,7 +79,7 @@ twoPhaseMixture twoPhaseProperties(U, phiv, "gamma"); // Create LES model - autoPtr turbulence + autoPtr turbulence ( - LESmodel::New(U, phiv, twoPhaseProperties) + incompressible::LESmodel::New(U, phiv, twoPhaseProperties) ); diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C index 2e519dc17c..9d6c4690db 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C +++ b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -115,6 +117,7 @@ bool devOneEqEddy::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H index 4e0763a101..5d4408f970 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H +++ b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H @@ -61,6 +61,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -136,6 +138,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LESmodels +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/lesInterFoam/createFields.H b/applications/solvers/multiphase/lesInterFoam/createFields.H index c24f8bda35..ae8ec03a59 100644 --- a/applications/solvers/multiphase/lesInterFoam/createFields.H +++ b/applications/solvers/multiphase/lesInterFoam/createFields.H @@ -109,7 +109,7 @@ interfaceProperties interface(gamma, U, twoPhaseProperties); // Construct LES model - autoPtr turbulence + autoPtr turbulence ( - LESmodel::New(U, phi, twoPhaseProperties) + incompressible::LESmodel::New(U, phi, twoPhaseProperties) ); diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C index 79891d0f03..43348f7ec4 100644 --- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C +++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C @@ -162,9 +162,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh) } else if (turbulenceProperties.found("LESmodel")) { - autoPtr sgsModel + autoPtr sgsModel ( - LESmodel::New(U, phi, laminarTransport) + incompressible::LESmodel::New(U, phi, laminarTransport) ); execFlowFunctionObjects(args, runTime); diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C index bdd3bca109..b20e04e6ab 100644 --- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C +++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C @@ -132,9 +132,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh) } else if (turbulenceProperties.found("LESmodel")) { - autoPtr sgsModel + autoPtr sgsModel ( - LESmodel::New(U, phi, laminarTransport) + incompressible::LESmodel::New(U, phi, laminarTransport) ); PePtr.set diff --git a/applications/utilities/postProcessing/wall/yPlusLES/createFields.H b/applications/utilities/postProcessing/wall/yPlusLES/createFields.H index 23426dd297..8f89b373bb 100644 --- a/applications/utilities/postProcessing/wall/yPlusLES/createFields.H +++ b/applications/utilities/postProcessing/wall/yPlusLES/createFields.H @@ -16,9 +16,9 @@ volVectorField U singlePhaseTransportModel laminarTransport(U, phi); -autoPtr sgsModel +autoPtr sgsModel ( - LESmodel::New(U, phi, laminarTransport) + incompressible::LESmodel::New(U, phi, laminarTransport) ); volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y(); diff --git a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C index 68e4dcd45a..942e8a2145 100644 --- a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C +++ b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C @@ -83,9 +83,9 @@ int main(int argc, char *argv[]) singlePhaseTransportModel laminarTransport(U, phi); - autoPtr sgsModel + autoPtr sgsModel ( - LESmodel::New(U, phi, laminarTransport) + incompressible::LESmodel::New(U, phi, laminarTransport) ); volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y(); diff --git a/src/postProcessing/forces/forces/forces.C b/src/postProcessing/forces/forces/forces.C index 923db8a7ce..8554c33a9c 100644 --- a/src/postProcessing/forces/forces/forces.C +++ b/src/postProcessing/forces/forces/forces.C @@ -75,10 +75,10 @@ Foam::tmp Foam::forces::devRhoReff() const return les.devRhoBeff(); } - else if (obr_.foundObject("turbulenceProperties")) + else if (obr_.foundObject("turbulenceProperties")) { - const LESmodel& les - = obr_.lookupObject("turbulenceProperties"); + const incompressible::LESmodel& les + = obr_.lookupObject("turbulenceProperties"); return rhoRef_*les.devBeff(); } diff --git a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C index 7a95ea699d..f4677a15ef 100644 --- a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C +++ b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C @@ -45,8 +45,7 @@ void LESmodel::printCoeffs() { if (printCoeffs_) { - Info<< type() << "Coeffs" << nl - << LESmodelProperties_; + Info<< type() << "Coeffs" << LESmodelProperties_ << endl; } } diff --git a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H index 912db4f0a1..ed87427eaf 100644 --- a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H +++ b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Namespace - Foam::compressible::LESmodels + Foam::compressible Description Namespace for compressible LES models. diff --git a/src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C b/src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C index 7565d0fc53..714e303d70 100644 --- a/src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C +++ b/src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C @@ -64,6 +64,8 @@ autoPtr LESmodel::New turbulencePropertiesDict.lookup("LESmodel") >> LESmodelTypeName; } + Info<< "Selecting turbulence model " << LESmodelTypeName << endl; + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(LESmodelTypeName); diff --git a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C index e963a81f73..efcc278fd4 100644 --- a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C +++ b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -126,6 +128,7 @@ bool DeardorffDiffStress::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H index 54138e0df3..07f1ecaf72 100644 --- a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H +++ b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::DeardorffDiffStress + Foam::incompressible::LES::DeardorffDiffStress Description Differential SGS Stress Equation Model for incompressible flows @@ -60,6 +60,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -128,6 +130,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C index 4087e21545..c37d584950 100644 --- a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C +++ b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C @@ -30,6 +30,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -110,6 +112,7 @@ bool GenEddyVisc::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H index 62cf67dc1c..4e7b51eb0d 100644 --- a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H +++ b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::GenEddyVisc + Foam::incompressible::LES::GenEddyVisc Description General base class for all incompressible models that can be implemented @@ -46,6 +46,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -129,6 +131,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C index f06fe00f53..d4be214437 100644 --- a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C +++ b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C @@ -30,6 +30,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -174,6 +176,7 @@ bool GenSGSStress::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H index 98f31d6aa8..ea0c1a7a05 100644 --- a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H +++ b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::GenSGSStress + Foam::incompressible::LES::GenSGSStress Description General base class for all incompressible models that directly @@ -47,6 +47,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -137,6 +139,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C index 5d045df287..da8ae5e32d 100644 --- a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C +++ b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -43,8 +45,7 @@ void LESmodel::printCoeffs() { if (printCoeffs_) { - Info<< type() << "Coeffs" << nl - << LESmodelProperties_; + Info<< type() << "Coeffs" << LESmodelProperties_ << endl; } } @@ -132,6 +133,7 @@ bool LESmodel::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H index 2853e66d2d..675903eba6 100644 --- a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H +++ b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H @@ -23,14 +23,14 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Namespace - Foam::LESmodels + Foam::incompressible Description Namespace for incompressible LES models. Class - Foam::LESmodel + Foam::incompressible::LESmodel Description Base class for all incompressible flow LES SGS models. @@ -64,6 +64,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ /*---------------------------------------------------------------------------*\ Class LESmodel Declaration @@ -263,6 +265,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C b/src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C index fb04f7937c..0e74e07128 100644 --- a/src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C +++ b/src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C @@ -30,6 +30,8 @@ License namespace Foam { +namespace incompressible +{ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -61,6 +63,8 @@ autoPtr LESmodel::New turbulencePropertiesDict.lookup("LESmodel") >> LESmodelTypeName; } + Info<< "Selecting turbulence model " << LESmodelTypeName << endl; + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(LESmodelTypeName); @@ -70,7 +74,7 @@ autoPtr LESmodel::New ( "LESmodel::select(const volVectorField&, const " "surfaceScalarField&, transportModel&)" - ) << "Unknown LESmodel type " << LESmodelTypeName + ) << "Unknown LESmodel type " << LESmodelTypeName << endl << endl << "Valid LESmodel types are :" << endl << dictionaryConstructorTablePtr_->toc() @@ -83,6 +87,7 @@ autoPtr LESmodel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C index c7ef99d910..2c0f64714c 100644 --- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C +++ b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -129,6 +131,7 @@ bool LRRDiffStress::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H index f9e5c057b8..3688f03a55 100644 --- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H +++ b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::LRRDiffStress + Foam::incompressible::LES::LRRDiffStress Description Differential SGS Stress Equation Model for incompressible flows. @@ -58,6 +58,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -127,6 +129,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C index ff626ed7b6..e82fe4695b 100644 --- a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C +++ b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -84,6 +86,7 @@ bool Smagorinsky::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H index 9464b9b481..9cc21812fb 100644 --- a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H +++ b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::Smagorinsky + Foam::incompressible::LES::Smagorinsky Description The Isochoric Smagorinsky Model for incompressible flows. @@ -57,6 +57,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -129,6 +131,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C index dbb8dbce91..d7a2774289 100644 --- a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C +++ b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -108,6 +110,7 @@ bool Smagorinsky2::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H index 3a682680fe..fe6b9fc05a 100644 --- a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H +++ b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::Smagorinsky2 + Foam::incompressible::LES::Smagorinsky2 Description The Isochoric Smagorinsky Model for incompressible flows @@ -56,6 +56,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -119,6 +121,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C index add91b8fb3..6892524909 100644 --- a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C @@ -32,6 +32,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -238,6 +240,7 @@ bool SpalartAllmaras::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H index 459a9ab9db..f0f2634976 100644 --- a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::SpalartAllmaras + Foam::incompressible::LES::SpalartAllmaras Description SpalartAllmaras for incompressible flows @@ -43,6 +43,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -153,6 +155,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C index f8eb662e2f..5baf127794 100644 --- a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C +++ b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -134,6 +136,7 @@ bool dynMixedSmagorinsky::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H index b25ae74b62..398b6a71e4 100644 --- a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H +++ b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::dynMixedSmagorinsky + Foam::incompressible::LES::dynMixedSmagorinsky Description The Mixed Isochoric Smagorinsky Model for incompressible flows. @@ -68,6 +68,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -138,6 +140,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C index 4c39778216..98d187e81a 100644 --- a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C +++ b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -173,6 +175,7 @@ bool dynOneEqEddy::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H index 84c8180233..9b57483fef 100644 --- a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H +++ b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::dynOneEqEddy + Foam::incompressible::LES::dynOneEqEddy Description One Equation Eddy Viscosity Model for incompressible flows. @@ -64,6 +64,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -143,6 +145,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C index 85802cd231..822a30a4ba 100644 --- a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C +++ b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -153,6 +155,7 @@ bool dynSmagorinsky::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H index f4d44cf6e6..d4b88b737f 100644 --- a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H +++ b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::dynSmagorinsky + Foam::incompressible::LES::dynSmagorinsky Description The Isochoric dynamic Smagorinsky Model for incompressible flows. @@ -73,6 +73,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -143,6 +145,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/laminar/laminar.C b/src/turbulenceModels/LES/incompressible/laminar/laminar.C index 92389fa94a..45585a69da 100644 --- a/src/turbulenceModels/LES/incompressible/laminar/laminar.C +++ b/src/turbulenceModels/LES/incompressible/laminar/laminar.C @@ -32,6 +32,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -99,7 +101,7 @@ tmp laminar::nuSgs() const dimensionedScalar("nuSgs", nu().dimensions(), 0.0) ) ); -} +} tmp laminar::nuEff() const { @@ -158,6 +160,7 @@ bool laminar::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/laminar/laminar.H b/src/turbulenceModels/LES/incompressible/laminar/laminar.H index e4dc2fe252..f6c2c31cc2 100644 --- a/src/turbulenceModels/LES/incompressible/laminar/laminar.H +++ b/src/turbulenceModels/LES/incompressible/laminar/laminar.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::laminar + Foam::incompressible::LES::laminar Description LES model for laminar incompressible flow. @@ -44,6 +44,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -59,7 +61,7 @@ class laminar // Disallow default bitwise copy construct and assignment laminar(const laminar&); - laminar& operator=(const laminar&); + laminar& operator=(const laminar&); public: @@ -86,7 +88,7 @@ public: // Member Functions - + //- Return SGS kinetic energy tmp k() const; @@ -118,6 +120,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C index 95c48f7fc7..520b12ff45 100644 --- a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C +++ b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -164,6 +166,7 @@ bool locDynOneEqEddy::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H index 8296e45f10..3d62ca5e20 100644 --- a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H +++ b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::locDynOneEqEddy + Foam::incompressible::LES::locDynOneEqEddy Description Localised Dynamic One Equation Eddy Viscosity Model for incompressible @@ -72,6 +72,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -161,6 +163,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C index e9f7093ef3..d08ba9425a 100644 --- a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C +++ b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -137,6 +139,7 @@ bool mixedSmagorinsky::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H index f6d95f3ee9..3fab843cf1 100644 --- a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H +++ b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::mixedSmagorinsky + Foam::incompressible::LES::mixedSmagorinsky Description The mixed Isochoric Smagorinsky Model for incompressible flows. @@ -67,6 +67,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -144,6 +146,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C index 828d43cedd..6c97d16ddf 100644 --- a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C +++ b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -113,6 +115,7 @@ bool oneEqEddy::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H index ea6395c091..be0ef24630 100644 --- a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H +++ b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::oneEqEddy + Foam::incompressible::LES::oneEqEddy Description One Equation Eddy Viscosity Model for incompressible flows @@ -61,6 +61,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -136,6 +138,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C index fab13467a9..0a5a544615 100644 --- a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C +++ b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C @@ -30,6 +30,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -116,6 +118,7 @@ bool scaleSimilarity::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H index 71f8f3b4cc..738e74896d 100644 --- a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H +++ b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::scaleSimilarity + Foam::incompressible::LES::scaleSimilarity Description General base class for all scale similarity models @@ -47,6 +47,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -122,6 +124,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C index da16b1a604..da56f3a866 100644 --- a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C +++ b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C @@ -31,6 +31,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -118,6 +120,7 @@ bool spectEddyVisc::read() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H index 928798d406..ad93740588 100644 --- a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H +++ b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::spectEddyVisc + Foam::incompressible::LES::spectEddyVisc Description The Isochoric spectral Eddy Viscosity Model for incompressible flows. @@ -61,6 +61,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -126,6 +128,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C index 96916c20e7..b8d8467297 100644 --- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C +++ b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C @@ -35,6 +35,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -143,6 +145,7 @@ void vanDriestDelta::correct() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H index ff96b5aaf5..28de4b696a 100644 --- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H +++ b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::vanDriestDelta + Foam::incompressible::LES::vanDriestDelta Description Simple cube-root of cell volume delta used in incompressible LES models. @@ -42,6 +42,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -102,6 +104,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C index 1c39967b7e..d2262d7133 100644 --- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C @@ -34,6 +34,8 @@ License namespace Foam { +namespace incompressible +{ namespace LES { @@ -110,7 +112,7 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate const scalarField& ry = patch().deltaCoeffs(); - const fvPatchVectorField& U = + const fvPatchVectorField& U = patch().lookupPatchField("U"); scalarField magUp = mag(U.patchInternalField() - U); @@ -127,7 +129,7 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate scalar magUpara = magUp[facei]; scalar utau = sqrt((nuSgsw[facei] + nuw[facei])*magFaceGradU[facei]); - + if(utau > VSMALL) { int iter = 0; @@ -140,21 +142,21 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate scalar f = - utau/(ry[facei]*nuw[facei]) - + magUpara/utau + + magUpara/utau + 1/E*(fkUu - 1.0/6.0*kUu*sqr(kUu)); - + scalar df = - 1.0/(ry[facei]*nuw[facei]) - magUpara/sqr(utau) - 1/E*kUu*fkUu/utau; - + scalar utauNew = utau - f/df; err = mag((utau - utauNew)/utau); utau = utauNew; } while (utau > VSMALL && err > 0.01 && ++iter < 10); - nuSgsw[facei] = + nuSgsw[facei] = max(sqr(max(utau, 0))/magFaceGradU[facei] - nuw[facei], 0.0); } else @@ -172,6 +174,7 @@ makePatchTypeField(fvPatchScalarField, nuSgsWallFunctionFvPatchScalarField); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // ************************************************************************* // diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H index 4d74510d11..ef464406d6 100644 --- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::LESmodels::nuSgsWallFunctionFvPatchScalarField + Foam::incompressible::LES::nuSgsWallFunctionFvPatchScalarField Description wall function boundary condition for incompressible flows @@ -42,6 +42,8 @@ SourceFiles namespace Foam { +namespace incompressible +{ namespace LES { @@ -139,6 +141,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LES +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C index ecbd901c3b..b91f2fe3ec 100644 --- a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C +++ b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C @@ -47,8 +47,7 @@ void RASmodel::printCoeffs() { if (printCoeffs_) { - Info<< type() << "Coeffs" << nl - << RASmodelCoeffs_; + Info<< type() << "Coeffs" << RASmodelCoeffs_ << endl; } } diff --git a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C index a6e9b14d16..27f54cccc8 100644 --- a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C +++ b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C @@ -45,8 +45,7 @@ void RASmodel::printCoeffs() { if (printCoeffs_) { - Info<< type() << "Coeffs" << nl - << RASmodelCoeffs_; + Info<< type() << "Coeffs" << RASmodelCoeffs_ << endl;; } } diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties index ca792d9f45..0caf7f3952 100644 --- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties index ba6e807f82..0e59c3d7f6 100644 --- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties +++ b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel LaunderSharmaKE; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties b/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties index 21fc8a8a02..d7016db500 100644 --- a/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties +++ b/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties @@ -22,9 +22,12 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESmodel oneEqEddy; +LESmodel oneEqEddy; -delta cubeRootVol; +delta cubeRootVol; + + +printCoeffs on; laminarCoeffs { @@ -39,7 +42,7 @@ oneEqEddyCoeffs dynOneEqEddyCoeffs { ce 1.05; - filter simple; + filter simple; } lowReOneEqEddyCoeffs diff --git a/tutorials/Xoodles/pitzDaily3D/constant/combustionProperties b/tutorials/Xoodles/pitzDaily3D/constant/combustionProperties index 8b865c7fe1..4fb8ff7ba8 100644 --- a/tutorials/Xoodles/pitzDaily3D/constant/combustionProperties +++ b/tutorials/Xoodles/pitzDaily3D/constant/combustionProperties @@ -46,30 +46,30 @@ GuldersCoeffs { Methane { - W W [0 0 0 0 0 0 0] 0.422; - eta eta [0 0 0 0 0 0 0] 0.15; - xi xi [0 0 0 0 0 0 0] 5.18; - alpha alpha [0 0 0 0 0 0 0] 2; - beta beta [0 0 0 0 0 0 0] -0.5; - f f [0 0 0 0 0 0 0] 2.3; + W 0.422; + eta 0.15; + xi 5.18; + alpha 2; + beta -0.5; + f 2.3; } Propane { - W W [0 0 0 0 0 0 0] 0.446; - eta eta [0 0 0 0 0 0 0] 0.12; - xi xi [0 0 0 0 0 0 0] 4.95; - alpha alpha [0 0 0 0 0 0 0] 1.77; - beta beta [0 0 0 0 0 0 0] -0.2; - f f [0 0 0 0 0 0 0] 2.3; + W 0.446; + eta 0.12; + xi 4.95; + alpha 1.77; + beta -0.2; + f 2.3; } IsoOctane { - W W [0 0 0 0 0 0 0] 0.4658; - eta eta [0 0 0 0 0 0 0] -0.326; - xi xi [0 0 0 0 0 0 0] 4.48; - alpha alpha [0 0 0 0 0 0 0] 1.56; - beta beta [0 0 0 0 0 0 0] -0.22; - f f [0 0 0 0 0 0 0] 2.3; + W 0.4658; + eta -0.326; + xi 4.48; + alpha 1.56; + beta -0.22; + f 2.3; } } diff --git a/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties b/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties index 21fc8a8a02..f3f94216e3 100644 --- a/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties +++ b/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties @@ -22,9 +22,12 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESmodel oneEqEddy; +LESmodel oneEqEddy; -delta cubeRootVol; +delta cubeRootVol; + + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties index 3e1e16755c..d859aae7f4 100644 --- a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel LaunderSharmaKE; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties index f979cb3a80..2c541c2155 100644 --- a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties @@ -27,7 +27,9 @@ FoamFile RASmodel kEpsilon; // Do you wish to calculate turbulence? -turbulence on; +turbulence on; + +printCoeffs on; // Laminar model coefficients laminarCoeffs diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties index df50c86414..681d37f289 100644 --- a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel laminar; -turbulence off; +turbulence off; + +printCoeffs off; laminarCoeffs { diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties index 7128f95ea1..28f4f60411 100644 --- a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties index 7128f95ea1..28f4f60411 100644 --- a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties index 7128f95ea1..28f4f60411 100644 --- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/cavitatingFoam/nozzle2D/0/T b/tutorials/cavitatingFoam/nozzle2D/0/T deleted file mode 100644 index ed4741ce5c..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/0/T +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object rho; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 0 0 1 0]; - -internalField uniform 300; - -boundaryField -{ - inlet - { - type fixedValue; //inletOutlet; - value uniform 300; - inletValue uniform 300; - } - - outlet - { - type zeroGradient; //inletOutlet; - value uniform 300; - inletValue uniform 300; - } - - wall - { - type zeroGradient; - } - - back - { - type wedge; - } - - front - { - type wedge; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/0/U b/tutorials/cavitatingFoam/nozzle2D/0/U deleted file mode 100644 index a839bb4145..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/0/U +++ /dev/null @@ -1,62 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volVectorField; - object U; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 1 -1 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - inlet - { - type zeroGradient; //pressureInletOutletVelocity; - value uniform (0 0 0); - } - - outlet - { - type zeroGradient; //inletOutlet; - value uniform (0 0 0); - inletValue uniform (0 0 0); - } - - wall - { - type slip; - } - - back - { - type wedge; - } - - front - { - type wedge; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/0/gamma b/tutorials/cavitatingFoam/nozzle2D/0/gamma deleted file mode 100644 index 8fc4ace6f9..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/0/gamma +++ /dev/null @@ -1,62 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object gamma; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - inlet - { - type calculated; - value uniform 0; - } - - outlet - { - type calculated; - value uniform 0; - } - - wall - { - type calculated; - value uniform 0; - } - - back - { - type wedge; - } - - front - { - type wedge; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/0/p b/tutorials/cavitatingFoam/nozzle2D/0/p deleted file mode 100644 index efcda64b29..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/0/p +++ /dev/null @@ -1,67 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object p; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [1 -1 -2 0 0]; - -internalField uniform 5e5; - -boundaryField -{ - inlet - { - type totalPressure; - U U; - phi phiv; - rho rho; - psi none; - gamma 1; - p0 uniform 100e5; - //p0 uniform 15e5; - } - - outlet - { - type fixedValue; - value uniform 5e5; - } - - wall - { - type zeroGradient; - } - - back - { - type wedge; - } - - front - { - type wedge; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/0/rho b/tutorials/cavitatingFoam/nozzle2D/0/rho deleted file mode 100644 index c825e1ae0f..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/0/rho +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object gamma; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [1 -3 0 0 0]; - -internalField uniform 828.23621; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 832.75441; - //value uniform 828.7118; - } - - outlet - { - type fixedValue; //inletOutlet; - value uniform 828.23621; - inletValue uniform 828.23621; - } - - wall - { - type zeroGradient; - } - - back - { - type wedge; - } - - front - { - type wedge; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/constant/polyMesh/blockMeshDict b/tutorials/cavitatingFoam/nozzle2D/constant/polyMesh/blockMeshDict deleted file mode 100644 index d69a1c03ee..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/constant/polyMesh/blockMeshDict +++ /dev/null @@ -1,134 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object blockMeshDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 1.0e-03; - -vertices -( - (0 0 0) - (4 0 0) - (5 0 0) - (10 0 0) - - (0 0.167 -7.2913e-3) - (4 0.167 -7.2913e-3) - (5 0.167 -7.2913e-3) - (10 0.167 -7.2913e-3) - - (0 0.5 -2.183e-2) - (4 0.5 -2.183e-2) - (5 0.5 -2.183e-2) - (10 0.5 -2.183e-2) - - (0 0 0) - (4 0 0) - (5 0 0) - (10 0 0) - - (0 0.167 7.2913e-3) - (4 0.167 7.2913e-3) - (5 0.167 7.2913e-3) - (10 0.167 7.2913e-3) - - (0 0.5 2.183e-2) - (4 0.5 2.183e-2) - (5 0.5 2.183e-2) - (10 0.5 2.183e-2) -); - - -blocks -( - // block 0 - hex (0 1 5 4 12 13 17 16) - (40 10 1) - (0.167 1 1) - - // block 1 - hex (1 2 6 5 13 14 18 17) - (30 10 1) - (1 1 1) - - // block 2 - hex (2 3 7 6 14 15 19 18) - (50 10 1) - (6 1 1) - - // block 3 - hex (4 5 9 8 16 17 21 20) - (40 20 1) - (0.167 1 1) - - // block 4 - hex (6 7 11 10 18 19 23 22) - (50 20 1) - (6 1 1) -); - - -patches -( - patch inlet - ( - (0 12 16 4) - (4 16 20 8) - ) - - patch outlet - ( - (3 7 19 15) - (7 11 23 19) - ) - - wall wall - ( - (8 20 21 9) - (5 9 21 17) - (6 5 17 18) - (10 6 18 22) - (11 10 22 23) - ) - - wedge back - ( - (0 4 5 1) - (1 5 6 2) - (2 6 7 3) - (4 8 9 5) - (6 10 11 7) - ) - - wedge front - ( - (12 13 17 16) - (13 14 18 17) - (14 15 19 18) - (16 17 21 20) - (18 19 23 22) - ) -); - - -// ************************************************************************* // - diff --git a/tutorials/cavitatingFoam/nozzle2D/constant/polyMesh/boundary b/tutorials/cavitatingFoam/nozzle2D/constant/polyMesh/boundary deleted file mode 100644 index 91c35b984a..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/constant/polyMesh/boundary +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - object boundary; - location "constant/polyMesh"; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -6 -( - inlet - { - type patch; - nFaces 30; - startFace 5830; - } - outlet - { - type patch; - nFaces 30; - startFace 5860; - } - wall - { - type wall; - nFaces 160; - startFace 5890; - } - back - { - type wedge; - nFaces 3000; - startFace 6050; - } - front - { - type wedge; - nFaces 3000; - startFace 9050; - } - defaultFaces - { - type empty; - nFaces 0; - startFace 12050; - } -) - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/constant/thermodynamicProperties b/tutorials/cavitatingFoam/nozzle2D/constant/thermodynamicProperties deleted file mode 100644 index 1c8ed2274f..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/constant/thermodynamicProperties +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object thermodynamicProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -compressibilityModel linear; //Chung; - -psiv psiv [0 -2 2 0 0] 4.662e-5; - -rholSat rholSat [1 -3 0 0 0] 828; -psil psil [0 -2 2 0 0] 4.756e-7; - -pSat pSat [1 -1 -2 0 0] 3325; - -rhoMin rhoMin [1 -3 0 0 0] 0.001; - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/constant/transportProperties b/tutorials/cavitatingFoam/nozzle2D/constant/transportProperties deleted file mode 100644 index ec945cbe42..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/constant/transportProperties +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -mul mul [1 -1 -1 0 0] 3.877e-3; -muv muv [1 -1 -1 0 0] 1.207e-4; - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/system/controlDict b/tutorials/cavitatingFoam/nozzle2D/system/controlDict deleted file mode 100644 index bbc9f1a260..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/system/controlDict +++ /dev/null @@ -1,52 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object controlDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -startFrom latestTime; -startTime 0; - -stopAt endTime; -endTime 1e-3; - -deltaT 1e-8; - -writeControl adjustableRunTime; - -writeInterval 1e-5; - -purgeWrite 0; - -writeFormat ascii; -writePrecision 6; -writeCompression uncompressed; - -timeFormat general; - -runTimeModifiable yes; - -adjustTimeStep on; - -maxCo 0.5; -maxAcousticCo 50.0; - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/system/fvSchemes b/tutorials/cavitatingFoam/nozzle2D/system/fvSchemes deleted file mode 100644 index b8b112168e..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/system/fvSchemes +++ /dev/null @@ -1,73 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -interpolationSchemes -{ - default linear; -} - -divSchemes -{ - default none; - - div(phiv,rho) Gauss upwind; - div(phi,U) Gauss upwind; -} - -gradSchemes -{ - default Gauss; -} - -laplacianSchemes -{ - default none; - - laplacian(nuf,rhoU) Gauss linear corrected; - laplacian(muf,U) Gauss linear corrected; - laplacian(rrhoUAf,p) Gauss linear corrected; - laplacian(rUAf,p) Gauss linear corrected; -} - -snGradSchemes -{ - default none; - - snGrad(p) corrected; -} - -fluxRequired -{ - default none; - p; - rho; -} - - -// ************************************************************************* // diff --git a/tutorials/cavitatingFoam/nozzle2D/system/fvSolution b/tutorials/cavitatingFoam/nozzle2D/system/fvSolution deleted file mode 100644 index 46f3139924..0000000000 --- a/tutorials/cavitatingFoam/nozzle2D/system/fvSolution +++ /dev/null @@ -1,59 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - rho smoothSolver - { - smoother GaussSeidel; - tolerance 1e-8; - relTol 0; - nSweeps 1; - }; - - U smoothSolver - { - smoother GaussSeidel; - tolerance 1e-8; - relTol 0; - nSweeps 1; - }; - - p PCG - { - preconditioner DIC; - tolerance 1e-10; - relTol 0; - }; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; - - removeSwirl 2; -} - -// ************************************************************************* // diff --git a/tutorials/channelOodles/channel395/constant/turbulenceProperties b/tutorials/channelOodles/channel395/constant/turbulenceProperties index 3478ac639c..e4c8498ce7 100644 --- a/tutorials/channelOodles/channel395/constant/turbulenceProperties +++ b/tutorials/channelOodles/channel395/constant/turbulenceProperties @@ -22,9 +22,11 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESmodel oneEqEddy; +LESmodel oneEqEddy; -delta vanDriest; +printCoeffs on; + +delta vanDriest; laminarCoeffs { diff --git a/tutorials/coodles/pitzDaily/constant/turbulenceProperties b/tutorials/coodles/pitzDaily/constant/turbulenceProperties index 21fc8a8a02..38f8469362 100644 --- a/tutorials/coodles/pitzDaily/constant/turbulenceProperties +++ b/tutorials/coodles/pitzDaily/constant/turbulenceProperties @@ -22,9 +22,11 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESmodel oneEqEddy; +LESmodel oneEqEddy; -delta cubeRootVol; +printCoeffs on; + +delta cubeRootVol; laminarCoeffs { diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties index b14ec53716..ec87c01487 100644 --- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties @@ -18,7 +18,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { @@ -35,7 +37,7 @@ kEpsilonCoeffs alphaEps 0.76923; muLimiter on; Lsgs 0.0002; - + } RNGkEpsilonCoeffs diff --git a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties index 68a30fe751..1dd18e0cb5 100644 --- a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties +++ b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties index c0e5f76583..06673cebae 100644 --- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties +++ b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties @@ -25,7 +25,9 @@ FoamFile // RASmodel kEpsilon; RASmodel laminar; -turbulence off; +turbulence on; + +printCoeffs off; laminarCoeffs { diff --git a/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties b/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties index 4719424842..b1a94d71a7 100644 --- a/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties +++ b/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties @@ -22,9 +22,11 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESmodel oneEqEddy; +LESmodel oneEqEddy; -delta smooth; +delta smooth; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/oodles/pitzDaily/constant/turbulenceProperties b/tutorials/oodles/pitzDaily/constant/turbulenceProperties index ce1b97ca73..a58f676536 100644 --- a/tutorials/oodles/pitzDaily/constant/turbulenceProperties +++ b/tutorials/oodles/pitzDaily/constant/turbulenceProperties @@ -22,9 +22,11 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESmodel oneEqEddy; +LESmodel oneEqEddy; -delta cubeRootVol; +delta cubeRootVol; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties b/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties index ce1b97ca73..a58f676536 100644 --- a/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties +++ b/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties @@ -22,9 +22,11 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESmodel oneEqEddy; +LESmodel oneEqEddy; -delta cubeRootVol; +delta cubeRootVol; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties index 6f67a329b1..b12af49802 100644 --- a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties +++ b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties index a10685dcae..636a110eac 100644 --- a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties +++ b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties @@ -17,7 +17,10 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // RASmodel kEpsilon; -turbulence on; + +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties index a10685dcae..636a110eac 100644 --- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties +++ b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties @@ -17,7 +17,10 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // RASmodel kEpsilon; -turbulence on; + +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties index aa269bc9b6..51fa555354 100644 --- a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties @@ -27,7 +27,9 @@ FoamFile RASmodel kOmegaSST; //kEpsilon; // Do you wish to calculate turbulence? -turbulence on; +turbulence on; + +printCoeffs on; // Laminar model coefficients laminarCoeffs diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties index 038378f511..b920d56b89 100644 --- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties +++ b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties @@ -27,7 +27,9 @@ FoamFile RASmodel kEpsilon; // Do you wish to calculate turbulence? -turbulence on; +turbulence on; + +printCoeffs on; // Laminar model coefficients laminarCoeffs diff --git a/tutorials/settlingFoam/dahl/constant/turbulenceProperties b/tutorials/settlingFoam/dahl/constant/turbulenceProperties index e1c73326f9..18e22ca339 100644 --- a/tutorials/settlingFoam/dahl/constant/turbulenceProperties +++ b/tutorials/settlingFoam/dahl/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties index e1c73326f9..18e22ca339 100644 --- a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties +++ b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties index 283f8136c9..47a08d2f2a 100644 --- a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/0/R b/tutorials/simpleFoam/pitzDaily3Blocks/0/R deleted file mode 100644 index 2de0c4866d..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/0/R +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volSymmTensorField; - object R; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform (0 0 0 0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0 0 0 0 0 0); - } - - outlet - { - type zeroGradient; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - lowerWallInlet - { - type zeroGradient; - } - - lowerWallInterface - { - type zeroGradient; - } - - interface - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/0/U b/tutorials/simpleFoam/pitzDaily3Blocks/0/U deleted file mode 100644 index d20cc2d85c..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/0/U +++ /dev/null @@ -1,79 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volVectorField; - object U; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (10 0 0); - } - - outlet - { - type zeroGradient; - } - - upperWall - { - type fixedValue; - value uniform (0 0 0); - } - - lowerWall - { - type fixedValue; - value uniform (0 0 0); - } - - lowerWallInlet - { - type fixedValue; - value uniform (0 0 0); - } - - lowerWallInterface - { - type fixedValue; - value uniform (0 0 0); - } - - interface - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/0/epsilon b/tutorials/simpleFoam/pitzDaily3Blocks/0/epsilon deleted file mode 100644 index 36a3e0a698..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/0/epsilon +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object epsilon; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform 14.855; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 14.855; - } - - outlet - { - type zeroGradient; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - lowerWallInlet - { - type zeroGradient; - } - - lowerWallInterface - { - type zeroGradient; - } - - interface - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/0/k b/tutorials/simpleFoam/pitzDaily3Blocks/0/k deleted file mode 100644 index c6cdbb8615..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/0/k +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object k; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0.375; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0.375; - } - - outlet - { - type zeroGradient; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - lowerWallInlet - { - type zeroGradient; - } - - lowerWallInterface - { - type zeroGradient; - } - - interface - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/0/nuTilda b/tutorials/simpleFoam/pitzDaily3Blocks/0/nuTilda deleted file mode 100644 index 39cd26164f..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/0/nuTilda +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object nuTilda; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0; - } - - outlet - { - type zeroGradient; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - lowerWallInlet - { - type zeroGradient; - } - - lowerWallInterface - { - type zeroGradient; - } - - interface - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/0/p b/tutorials/simpleFoam/pitzDaily3Blocks/0/p deleted file mode 100644 index 8d9b632a6d..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/0/p +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class volScalarField; - object p; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - inlet - { - type zeroGradient; - } - - outlet - { - type fixedValue; - value uniform 0; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - lowerWallInlet - { - type zeroGradient; - } - - lowerWallInterface - { - type zeroGradient; - } - - interface - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/constant/polyMesh/blockMeshDict b/tutorials/simpleFoam/pitzDaily3Blocks/constant/polyMesh/blockMeshDict deleted file mode 100644 index 5f99db0f3e..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/constant/polyMesh/blockMeshDict +++ /dev/null @@ -1,101 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object blockMeshDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 0.001; - -vertices -( - (-20.6 0 -0.5) - (-20.6 25.4 -0.5) - (0 -25.4 -0.5) - (0 0 -0.5) - (0 25.4 -0.5) - (206 -25.4 -0.5) - (206 25.4 -0.5) - (290 -16.6 -0.5) - (290 16.6 -0.5) - (-20.6 0 0.5) - (-20.6 25.4 0.5) - (0 -25.4 0.5) - (0 0 0.5) - (0 25.4 0.5) - (206 -25.4 0.5) - (206 25.4 0.5) - (290 -16.6 0.5) - (290 16.6 0.5) -); - -blocks -( - hex (0 3 4 1 9 12 13 10) (18 30 1) simpleGrading (1 2 1) - hex (2 5 6 4 11 14 15 13) (180 60 1) simpleGrading (1 2 1) - hex (5 7 8 6 14 16 17 15) (30 60 1) simpleGrading (1 2 1) -); - -edges -( -); - -patches -( - patch inlet - ( - (0 9 10 1) - ) - patch outlet - ( - (8 17 16 7) - ) - wall upperWall - ( - (1 10 13 4) - (4 13 15 6) - (6 15 17 8) - ) - wall lowerWall - ( - (7 16 14 5) - (5 14 11 2) - ) - - wall lowerWallInterface - ( - (2 11 13 4) - ) - wall lowerWallInlet - ( - (3 12 9 0) - ) - patch interface - ( - (4 13 12 3) - ) -); - -mergePatchPairs -( - ( lowerWallInterface interface ) -); - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/constant/polyMesh/boundary b/tutorials/simpleFoam/pitzDaily3Blocks/constant/polyMesh/boundary deleted file mode 100644 index 13917670fa..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/constant/polyMesh/boundary +++ /dev/null @@ -1,77 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.1 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root "/home/dm2/henry/OpenFOAM/OpenFOAM-1.4.1/tutorials/simpleFoam"; - case "pitzDaily3Blocks"; - instance "constant"; - local "polyMesh"; - - class polyBoundaryMesh; - object boundary; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -7 -( -inlet -{ - type patch; - nFaces 30; - startFace 26013; -} - -outlet -{ - type patch; - nFaces 60; - startFace 26043; -} - -upperWall -{ - type wall; - nFaces 228; - startFace 26103; -} - -lowerWall -{ - type wall; - nFaces 210; - startFace 26331; -} - -lowerWallInterface -{ - type wall; - nFaces 36; - startFace 26541; -} - -lowerWallInlet -{ - type wall; - nFaces 18; - startFace 26577; -} - -defaultFaces -{ - type empty; - nFaces 26280; - startFace 26595; -} -) - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/constant/transportProperties b/tutorials/simpleFoam/pitzDaily3Blocks/constant/transportProperties deleted file mode 100644 index 0e8a2f9edb..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/constant/transportProperties +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -transportModel Newtonian; - -rho rho [1 -3 0 0 0 0 0] 1.0; -nu nu [0 2 -1 0 0 0 0] 1e-05; - -CrossPowerLawCoeffs -{ - rho rho [1 -3 0 0 0 0] 1.0; - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 1; -} - -BirdCarreauCoeffs -{ - rho rho [1 -3 0 0 0 0] 1.0; - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 0; - n n [0 0 0 0 0 0 0] 1; -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties deleted file mode 100644 index 283f8136c9..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties +++ /dev/null @@ -1,207 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object turbulenceProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -RASmodel kEpsilon; - -turbulence on; - -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4.0; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1.0; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.0750; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/system/controlDict b/tutorials/simpleFoam/pitzDaily3Blocks/system/controlDict deleted file mode 100644 index f7a980bb58..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/system/controlDict +++ /dev/null @@ -1,56 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object controlDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application simpleFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 1000; - -deltaT 1; - -writeControl timeStep; - -writeInterval 50; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression uncompressed; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/system/fvSchemes b/tutorials/simpleFoam/pitzDaily3Blocks/system/fvSchemes deleted file mode 100644 index cce03bb331..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/system/fvSchemes +++ /dev/null @@ -1,78 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default steadyState; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss upwind; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; - div(phi,R) Gauss upwind; - div(R) Gauss linear; - div(phi,nuTilda) Gauss upwind; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; - laplacian(DnuTildaEff,nuTilda) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/system/fvSolution b/tutorials/simpleFoam/pitzDaily3Blocks/system/fvSolution deleted file mode 100644 index c8e5ab6b3a..0000000000 --- a/tutorials/simpleFoam/pitzDaily3Blocks/system/fvSolution +++ /dev/null @@ -1,81 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p PCG - { - preconditioner DIC; - tolerance 1e-06; - relTol 0.01; - }; - U PBiCG - { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - k PBiCG - { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - epsilon PBiCG - { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - R PBiCG - { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - nuTilda PBiCG - { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; -} - -SIMPLE -{ - nNonOrthogonalCorrectors 0; -} - -relaxationFactors -{ - p 0.3; - U 0.7; - k 0.7; - epsilon 0.7; - R 0.7; - nuTilda 0.7; -} - - -// ************************************************************************* // diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties index 283f8136c9..47a08d2f2a 100644 --- a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties index 4f812b18a7..16ce7eec7e 100644 --- a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties +++ b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kOmegaSST; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties index 1e9b27636e..76cc87613c 100644 --- a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel LaunderSharmaKE; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties index 60c47b9acf..232967e8f1 100644 --- a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/turbFoam/cavity/constant/turbulenceProperties b/tutorials/turbFoam/cavity/constant/turbulenceProperties index 283f8136c9..47a08d2f2a 100644 --- a/tutorials/turbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/turbFoam/cavity/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence on; +turbulence on; + +printCoeffs on; laminarCoeffs { diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties index 165657e27c..b2483e1c0d 100644 --- a/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties @@ -26,7 +26,9 @@ FoamFile // Switch turbulence model on or off -turbulence on; +turbulence on; + +printCoeffs on; // Standard k-epsilon model coefficients diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties index cbd29fd836..b2483e1c0d 100644 --- a/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties @@ -26,7 +26,9 @@ FoamFile // Switch turbulence model on or off -turbulence off; +turbulence on; + +printCoeffs on; // Standard k-epsilon model coefficients diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties index 0046e64aad..511b65242b 100644 --- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties @@ -24,7 +24,9 @@ FoamFile RASmodel kEpsilon; -turbulence off; +turbulence off; + +printCoeffs off; kEpsilonCoeffs {