From f58f6966e18f0cccec7193b316848c7156ecd60b Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 3 Sep 2013 12:17:10 +0100 Subject: [PATCH 01/10] BUG: Corrected doxygen tag usage --- .../oscillatingFixedValueFvPatchField.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H index da45cdcb85..949d481cea 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,9 +31,9 @@ Description This boundary condition provides an oscillating condition in terms of amplitude and frequency. - /f[ + \f[ x_p = (1 + a sin(\pi f t))x_{ref} + x_o - /f] + \f] where From 11f8a670bf877c19f4d426ff78332aefb4ab54f1 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 3 Sep 2013 12:18:47 +0100 Subject: [PATCH 02/10] STYLE: Corrected spelling --- applications/solvers/heatTransfer/thermoFoam/thermoFoam.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index f5f88232d2..f765ca86e8 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -25,7 +25,7 @@ Application thermoFoam Description - Evolves the thermodynamics on a forzen flow field + Evolves the thermodynamics on a frozen flow field \*---------------------------------------------------------------------------*/ From dcc33e748645c91af6fc40388c54155eac7d09db Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 3 Sep 2013 16:43:41 +0100 Subject: [PATCH 03/10] ENH: radiationModel - Added error message is request for inactive sub-model --- .../radiationModel/radiationModel/radiationModel.C | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C index 48cd417860..66cdfb99ad 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C @@ -250,6 +250,17 @@ Foam::tmp Foam::radiation::radiationModel::ST const Foam::radiation::absorptionEmissionModel& Foam::radiation::radiationModel::absorptionEmission() const { + if (!absorptionEmission_.valid()) + { + FatalErrorIn + ( + "const Foam::radiation::absorptionEmissionModel&" + "Foam::radiation::radiationModel::absorptionEmission() const" + ) + << "Requested radiation absorptionEmission model, but model is " + << "not activate" << abort(FatalError); + } + return absorptionEmission_(); } From 38c6d88b9f66f423d0b74839e196f7a9002ed32f Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 3 Sep 2013 16:44:02 +0100 Subject: [PATCH 04/10] STYLE: Updated function comment --- .../radiationModel/radiationModel/radiationModel.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H index d4c39bd958..a62821586c 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H @@ -231,7 +231,7 @@ public: volScalarField& T ) const; - //- Access to absorptionEmissionModel + //- Access to absorptionEmission model const absorptionEmissionModel& absorptionEmission() const; }; From 16e00bda6d52d68882951f0daf2a677a9106e482 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 4 Sep 2013 09:27:41 +0100 Subject: [PATCH 05/10] ENH: Tutorial updates --- .../les/oppositeBurningPanels/constant/reactingCloud1Properties | 1 - .../les/smallPoolFire2D/constant/reactingCloud1Properties | 1 - .../les/smallPoolFire3D/constant/reactingCloud1Properties | 1 - 3 files changed, 3 deletions(-) diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties index 9228607e91..87e8b7ae0d 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties @@ -63,7 +63,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; constantVolume false; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties index 9228607e91..87e8b7ae0d 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties @@ -63,7 +63,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; constantVolume false; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties index 9228607e91..87e8b7ae0d 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties @@ -63,7 +63,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; constantVolume false; } From 185eded8d29f2a268940128a11cae69d71a9b781 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 5 Sep 2013 12:11:15 +0100 Subject: [PATCH 06/10] ENH: doxygenXmlParser - replaced recursion --- .../doxygenXmlParser/doxygenXmlParser.C | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C index ac9c639c49..b3cc2da3e6 100644 --- a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C +++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C @@ -213,25 +213,21 @@ void Foam::doxygenXmlParser::skipForward ) const { // recurse to move forward in 'is' until come across - - // fast-forward until we reach a '<' - char c; - while (is.get(c) && c != '<') - {} - string entryName = ""; - while (is.get(c) && c != '>') - { - entryName = entryName + c; - } + char c; - if (entryName == blockName) + while (is.good() && (entryName != blockName)) { - return; - } - else - { - skipForward(is, blockName); + entryName = ""; + + // fast-forward until we reach a '<' + while (is.get(c) && c != '<') + {} + + while (is.get(c) && c != '>') + { + entryName = entryName + c; + } } } From f3871e0a91b79764fb301a68ad565f0f552264f0 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 5 Sep 2013 18:23:44 +0100 Subject: [PATCH 07/10] BUG: spray - ReitzKHRT break-up model - mantis #990 --- .../spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C index e714db22dc..7cea479484 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C +++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C @@ -165,8 +165,6 @@ bool Foam::ReitzKHRT::update if ((tc > 0) || (lambdaRT < d) ) { tc += dt; - scalar multiplier = d/lambdaRT; - d = cbrt(d3/multiplier); } // characteristic RT breakup time From 07c28f578630317ab61abbb050369bd342d2a62a Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 5 Sep 2013 18:24:02 +0100 Subject: [PATCH 08/10] ENH: Spray - usability updates to break-up models - mantis #993 --- .../BreakupModel/BreakupModel/BreakupModel.C | 21 +++++++------- .../BreakupModel/BreakupModel/BreakupModel.H | 5 ++-- .../spray/submodels/BreakupModel/ETAB/ETAB.C | 28 ++++--------------- .../spray/submodels/BreakupModel/ETAB/ETAB.H | 7 +---- .../spray/submodels/BreakupModel/TAB/TAB.C | 24 +++------------- .../spray/submodels/BreakupModel/TAB/TAB.H | 5 +--- 6 files changed, 24 insertions(+), 66 deletions(-) diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C index f714be34f4..521cc4d12d 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C +++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,11 +64,12 @@ Foam::BreakupModel::BreakupModel ( const dictionary& dict, CloudType& owner, - const word& type + const word& type, + bool solveOscillationEq ) : SubModelBase(owner, dict, typeName, type), - solveOscillationEq_(this->coeffDict().lookup("solveOscillationEq")), + solveOscillationEq_(solveOscillationEq), y0_(0.0), yDot0_(0.0), TABComega_(0.0), @@ -77,14 +78,12 @@ Foam::BreakupModel::BreakupModel { if (solveOscillationEq_) { - const dictionary TABcoeffsDict(dict.subDict("TABCoeffs")); - y0_ = TABcoeffsDict.template lookupOrDefault("y0", 0.0); - yDot0_ = TABcoeffsDict.template lookupOrDefault("yDot0", 0.0); - TABComega_ = - TABcoeffsDict.template lookupOrDefault("Comega", 8.0); - TABCmu_ = TABcoeffsDict.template lookupOrDefault("Cmu", 10.0); - TABWeCrit_ = - TABcoeffsDict.template lookupOrDefault("WeCrit", 12.0); + const dictionary coeffs(dict.subDict("TABCoeffs")); + y0_ = coeffs.template lookupOrDefault("y0", 0.0); + yDot0_ = coeffs.template lookupOrDefault("yDot0", 0.0); + TABComega_ = coeffs.template lookupOrDefault("Comega", 8.0); + TABCmu_ = coeffs.template lookupOrDefault("Cmu", 10.0); + TABWeCrit_ = coeffs.template lookupOrDefault("WeCrit", 12.0); } } diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H index e0672ca938..e10c56a0f7 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H +++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,8 @@ public: ( const dictionary& dict, CloudType& owner, - const word& type + const word& type, + bool solveOscillationEq = false ); //- Construct copy diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C index fb48040831..dec1e0bae0 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C +++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,36 +34,21 @@ Foam::ETAB::ETAB CloudType& owner ) : - BreakupModel(dict, owner, typeName), - Cmu_(10.0), - Comega_(8.0), + BreakupModel(dict, owner, typeName, true), k1_(0.2), k2_(0.2), - WeCrit_(12.0), WeTransition_(100.0), AWe_(0.0) { if (!this->defaultCoeffs(true)) { - this->coeffDict().lookup("Cmu") >> Cmu_; - this->coeffDict().lookup("Comega") >> Comega_; this->coeffDict().lookup("k1") >> k1_; this->coeffDict().lookup("k2") >> k2_; - this->coeffDict().lookup("WeCrit") >> WeCrit_; this->coeffDict().lookup("WeTransition") >> WeTransition_; } scalar k21 = k2_/k1_; AWe_ = (k21*sqrt(WeTransition_) - 1.0)/pow4(WeTransition_); - - if (!BreakupModel::solveOscillationEq_) - { - Info<< "Warning: solveOscillationEq is set to " - << BreakupModel::solveOscillationEq_ << nl - << " Setting it to true in order for the ETAB model to work." - << endl; - BreakupModel::solveOscillationEq_ = true; - } } @@ -71,11 +56,8 @@ template Foam::ETAB::ETAB(const ETAB& bum) : BreakupModel(bum), - Cmu_(bum.Cmu_), - Comega_(bum.Comega_), k1_(bum.k1_), k2_(bum.k2_), - WeCrit_(bum.WeCrit_), WeTransition_(bum.WeTransition_), AWe_(bum.AWe_) {} @@ -123,10 +105,10 @@ bool Foam::ETAB::update scalar semiMass = nParticle*pow3(d); // inverse of characteristic viscous damping time - scalar rtd = 0.5*Cmu_*mu/(rho*r2); + scalar rtd = 0.5*this->TABCmu_*mu/(rho*r2); // oscillation frequency (squared) - scalar omega2 = Comega_*sigma/(rho*r3) - rtd*rtd; + scalar omega2 = this->TABComega_*sigma/(rho*r3) - rtd*rtd; if (omega2 > 0) { @@ -134,7 +116,7 @@ bool Foam::ETAB::update scalar romega = 1.0/omega; scalar We = rhoc*sqr(Urmag)*r/sigma; - scalar Wetmp = We/WeCrit_; + scalar Wetmp = We/this->TABWeCrit_; scalar y1 = y - Wetmp; scalar y2 = yDot*romega; diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H index 86d27e934d..9b8b45c04f 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H +++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,13 +71,8 @@ private: // Model constants - // Cmu_ and Comega_ are the same as in the TAB model - scalar Cmu_; - scalar Comega_; - scalar k1_; scalar k2_; - scalar WeCrit_; scalar WeTransition_; scalar AWe_; diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C index 0fe325fbac..817542ad7c 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C +++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C @@ -34,10 +34,7 @@ Foam::TAB::TAB CloudType& owner ) : - BreakupModel(dict, owner, typeName), - Cmu_(BreakupModel::TABCmu_), - Comega_(BreakupModel::TABComega_), - WeCrit_(BreakupModel::TABWeCrit_), + BreakupModel(dict, owner, typeName, true), SMDCalcMethod_(this->coeffDict().lookup("SMDCalculationMethod")) { // calculate the inverse function of the Rossin-Rammler Distribution @@ -52,16 +49,6 @@ Foam::TAB::TAB (1.0 - exp(-xx)*(1.0 + xx + sqr(xx)/2.0 + pow3(xx)/6.0))*rrd100; } - if (!BreakupModel::solveOscillationEq_) - { - WarningIn("Foam::TAB::TAB(const dictionary&, CloudType&)") - << "solveOscillationEq is set to " - << BreakupModel::solveOscillationEq_ << nl - << " Setting it to true in order for the TAB model to work." - << endl; - BreakupModel::solveOscillationEq_ = true; - } - if (SMDCalcMethod_ == "method1") { SMDMethod_ = method1; @@ -84,9 +71,6 @@ template Foam::TAB::TAB(const TAB& bum) : BreakupModel(bum), - Cmu_(bum.Cmu_), - Comega_(bum.Comega_), - WeCrit_(bum.WeCrit_), SMDCalcMethod_(bum.SMDCalcMethod_) {} @@ -135,16 +119,16 @@ bool Foam::TAB::update scalar semiMass = nParticle*pow3(d); // inverse of characteristic viscous damping time - scalar rtd = 0.5*Cmu_*mu/(rho*r2); + scalar rtd = 0.5*this->TABCmu_*mu/(rho*r2); // oscillation frequency (squared) - scalar omega2 = Comega_*sigma/(rho*r3) - rtd*rtd; + scalar omega2 = this->TABComega_*sigma/(rho*r3) - rtd*rtd; if (omega2 > 0) { scalar omega = sqrt(omega2); scalar We = rhoc*sqr(Urmag)*r/sigma; - scalar Wetmp = We/WeCrit_; + scalar Wetmp = We/this->TABWeCrit_; scalar y1 = y - Wetmp; scalar y2 = yDot/omega; diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H index e5c9234666..462953f1ee 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H +++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,9 +83,6 @@ private: // Model constants - scalar Cmu_; - scalar Comega_; - scalar WeCrit_; word SMDCalcMethod_; SMDMethods SMDMethod_; From 7a641be93f8adeeb8c6f3255ddcf0dc80ead217e Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 6 Sep 2013 12:48:25 +0100 Subject: [PATCH 09/10] ENH: Moved atmBoundaryLayerInletVelocity BC to general turbulence model level --- src/turbulenceModels/incompressible/RAS/Make/files | 1 - src/turbulenceModels/incompressible/turbulenceModel/Make/files | 1 + .../atmBoundaryLayerInletVelocityFvPatchVectorField.C | 0 .../atmBoundaryLayerInletVelocityFvPatchVectorField.H | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename src/turbulenceModels/incompressible/{RAS => turbulenceModel}/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C (100%) rename src/turbulenceModels/incompressible/{RAS => turbulenceModel}/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H (100%) diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files index 1f248358c7..cd9a9bfdb6 100644 --- a/src/turbulenceModels/incompressible/RAS/Make/files +++ b/src/turbulenceModels/incompressible/RAS/Make/files @@ -59,7 +59,6 @@ $(v2WallFunctions)/v2WallFunction/v2WallFunctionFvPatchScalarField.C derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C -derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C diff --git a/src/turbulenceModels/incompressible/turbulenceModel/Make/files b/src/turbulenceModels/incompressible/turbulenceModel/Make/files index a44faf2238..c83a939fae 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/Make/files +++ b/src/turbulenceModels/incompressible/turbulenceModel/Make/files @@ -1,5 +1,6 @@ turbulenceModel.C laminar/laminar.C derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C +derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModel diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C similarity index 100% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C rename to src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H similarity index 100% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H rename to src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H From 25817d9572ff3356afb4fbd47077427737e043be Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 6 Sep 2013 12:53:01 +0100 Subject: [PATCH 10/10] ENH: Updated BC header documentation --- .../atmBoundaryLayerInletEpsilonFvPatchScalarField.H | 6 +++--- .../atmBoundaryLayerInletVelocityFvPatchVectorField.H | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H index b94500ae52..e01d679f78 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ Description \table Property | Description | Required | Default value - z | vertical co-ordinate [m] | yes | + z | vertical direction of z-axis | yes | kappa | Karman's constanat | no | 0.41 Uref | reference velocity [m/s] | yes | Href | reference height [m] | yes | @@ -75,7 +75,7 @@ Description myPatch { type atmBoundaryLayerInletEpsilon; - z 1.0; + z (0 1 0); kappa 0.41; Uref 1.0; Href 0.0; diff --git a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H index b37c40a3da..c766c5ad96 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ Description \table Property | Description | Required | Default value n | flow direction | yes | - z | vertical co-ordinate [m] | yes | + z | vertical direction of z-axis | yes | kappa | Karman's constanat | no | 0.41 Uref | reference velocity [m/s] | yes | Href | reference height [m] | yes | @@ -83,7 +83,7 @@ Description { type atmBoundaryLayerInletVelocity; n (0 1 0); - z 1.0; + z (0 1 0); kappa 0.41; Uref 1.0; Href 0.0; @@ -135,7 +135,7 @@ class atmBoundaryLayerInletVelocityFvPatchVectorField //- Direction of the z-coordinate vector z_; - //- Surface roughness lenght + //- Surface roughness length scalarField z0_; //- Von Karman constant