From b3cb7c3dd303b13f096ca8f5907ee9eba8bea607 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 18 Jun 2008 17:43:42 +0100 Subject: [PATCH] created incompressible namespace for incompressible LES models --- .../incompressible/channelOodles/createFields.H | 4 ++-- .../solvers/incompressible/oodles/createFields.H | 4 ++-- .../compressibleLesInterFoam/createFields.H | 4 ++-- .../interPhaseChangeFoam/createFields.H | 4 ++-- .../multiphase/lesCavitatingFoam/createFields.H | 4 ++-- .../lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C | 3 +++ .../lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H | 3 +++ .../multiphase/lesInterFoam/createFields.H | 4 ++-- .../execFlowFunctionObjects.C | 4 ++-- .../postProcessing/velocityField/Pe/Pe.C | 4 ++-- .../postProcessing/wall/yPlusLES/createFields.H | 4 ++-- .../postProcessing/wall/yPlusLES/yPlusLES.C | 4 ++-- src/postProcessing/forces/forces/forces.C | 6 +++--- .../LES/compressible/LESmodel/LESmodel.H | 2 +- .../DeardorffDiffStress/DeardorffDiffStress.C | 3 +++ .../DeardorffDiffStress/DeardorffDiffStress.H | 5 ++++- .../LES/incompressible/GenEddyVisc/GenEddyVisc.C | 3 +++ .../LES/incompressible/GenEddyVisc/GenEddyVisc.H | 5 ++++- .../incompressible/GenSGSStress/GenSGSStress.C | 3 +++ .../incompressible/GenSGSStress/GenSGSStress.H | 5 ++++- .../LES/incompressible/LESmodel/LESmodel.C | 3 +++ .../LES/incompressible/LESmodel/LESmodel.H | 7 +++++-- .../LES/incompressible/LESmodel/newLESmodel.C | 5 ++++- .../incompressible/LRRDiffStress/LRRDiffStress.C | 3 +++ .../incompressible/LRRDiffStress/LRRDiffStress.H | 5 ++++- .../LES/incompressible/Smagorinsky/Smagorinsky.C | 3 +++ .../LES/incompressible/Smagorinsky/Smagorinsky.H | 5 ++++- .../incompressible/Smagorinsky2/Smagorinsky2.C | 3 +++ .../incompressible/Smagorinsky2/Smagorinsky2.H | 5 ++++- .../SpalartAllmaras/SpalartAllmaras.C | 3 +++ .../SpalartAllmaras/SpalartAllmaras.H | 5 ++++- .../dynMixedSmagorinsky/dynMixedSmagorinsky.C | 3 +++ .../dynMixedSmagorinsky/dynMixedSmagorinsky.H | 5 ++++- .../incompressible/dynOneEqEddy/dynOneEqEddy.C | 3 +++ .../incompressible/dynOneEqEddy/dynOneEqEddy.H | 5 ++++- .../dynSmagorinsky/dynSmagorinsky.C | 3 +++ .../dynSmagorinsky/dynSmagorinsky.H | 5 ++++- .../LES/incompressible/laminar/laminar.C | 5 ++++- .../LES/incompressible/laminar/laminar.H | 9 ++++++--- .../locDynOneEqEddy/locDynOneEqEddy.C | 3 +++ .../locDynOneEqEddy/locDynOneEqEddy.H | 5 ++++- .../mixedSmagorinsky/mixedSmagorinsky.C | 3 +++ .../mixedSmagorinsky/mixedSmagorinsky.H | 5 ++++- .../LES/incompressible/oneEqEddy/oneEqEddy.C | 3 +++ .../LES/incompressible/oneEqEddy/oneEqEddy.H | 5 ++++- .../scaleSimilarity/scaleSimilarity.C | 3 +++ .../scaleSimilarity/scaleSimilarity.H | 5 ++++- .../incompressible/spectEddyVisc/spectEddyVisc.C | 3 +++ .../incompressible/spectEddyVisc/spectEddyVisc.H | 5 ++++- .../vanDriestDelta/vanDriestDelta.C | 3 +++ .../vanDriestDelta/vanDriestDelta.H | 5 ++++- .../nuSgsWallFunctionFvPatchScalarField.C | 15 +++++++++------ .../nuSgsWallFunctionFvPatchScalarField.H | 5 ++++- 53 files changed, 177 insertions(+), 54 deletions(-) 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.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/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..122cbc7895 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 * * * * * * * * * * * * * // @@ -132,6 +134,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..c1ddfe9de0 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 +{ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -70,7 +72,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 +85,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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //