From d9a071536155d226388c55019fdc373696a7e6d1 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 9 Jul 2009 13:25:17 +0100 Subject: [PATCH 1/6] clean-up of dictionary --- .../simplifiedSiwek/constant/RASProperties | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties index 907214c9f8..73b806fc21 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties @@ -19,42 +19,6 @@ RASModel kEpsilon; turbulence on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ -} - -LaunderSharmaKECoeffs -{ -} - -LRRCoeffs -{ -} - -LaunderGibsonRSTMCoeffs -{ -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - +printCoeffs yes; // ************************************************************************* // From e7109637ae2df23defd939bc339f8b6af7b6cdc5 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 9 Jul 2009 13:25:40 +0100 Subject: [PATCH 2/6] updating copyright notices --- .../reactingMultiphaseCloud/reactingMultiphaseCloud.C | 2 +- .../reactingMultiphaseCloud/reactingMultiphaseCloud.H | 2 +- .../intermediate/submodels/IO/DataEntry/polynomial/polynomial.C | 2 +- .../intermediate/submodels/IO/DataEntry/polynomial/polynomial.H | 2 +- .../submodels/IO/DataEntry/polynomial/polynomialIO.C | 2 +- .../intermediate/submodels/IO/IOList/makeParcelIOList.H | 2 +- .../PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C | 2 +- .../PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H | 2 +- .../Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C | 2 +- .../Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H | 2 +- .../PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C | 2 +- .../PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C | 2 +- .../PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C index 2fbe3815c9..5124bbfb97 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H index 4cbe6f6917..acac7fd148 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C index 276d54146b..6726b8c55f 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H index 6d3cd51f65..ccebe5f994 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C index 05c34b645f..6b40fd8004 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H b/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H index fb463a8289..010ae252ef 100644 --- a/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H +++ b/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C index 19429ba681..91274c2458 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H index 7e569736ca..6f0bf06c4b 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C index ee3779b22e..32a0c449ea 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H index 007fa73344..3b6effa402 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C index efb611522a..3b317c5b05 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C index b9fbdb2011..c60f1bf903 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H index 2e0f03a3f5..7445ea6264 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From 13ad54a518b4e9eeb1c42ae350eadc2c69c20191 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 9 Jul 2009 17:27:03 +0100 Subject: [PATCH 3/6] removing name - was big penalty in poly thermo --- .../functions/Polynomial/Polynomial.C | 19 +++++-------------- .../functions/Polynomial/Polynomial.H | 10 ++-------- .../functions/Polynomial/PolynomialIO.C | 3 +-- .../thermo/hPolynomial/hPolynomialThermo.C | 4 ++-- 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C index 8f3381ea45..e2d1463f7d 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C @@ -32,7 +32,6 @@ template Foam::Polynomial::Polynomial() : VectorSpace, scalar, PolySize>(), - name_("unknownPolynomialName"), logActive_(false), logCoeff_(0.0) {} @@ -42,16 +41,17 @@ template Foam::Polynomial::Polynomial(const word& name, Istream& is) : VectorSpace, scalar, PolySize>(), - name_(is), logActive_(false), logCoeff_(0.0) { - if (name_ != name) + word isName(is); + + if (isName != name) { FatalErrorIn ( "Polynomial::Polynomial(const word&, Istream&)" - ) << "Expected polynomial name " << name << " but read " << name_ + ) << "Expected polynomial name " << name << " but read " << isName << nl << exit(FatalError); } @@ -63,7 +63,7 @@ Foam::Polynomial::Polynomial(const word& name, Istream& is) FatalErrorIn ( "Polynomial::Polynomial(const word&, Istream&)" - ) << "Polynomial coefficients for entry " << name_ + ) << "Polynomial coefficients for entry " << isName << " are invalid (empty)" << nl << exit(FatalError); } } @@ -72,12 +72,10 @@ Foam::Polynomial::Polynomial(const word& name, Istream& is) template Foam::Polynomial::Polynomial ( - const word& name, const Polynomial& poly ) : VectorSpace, scalar, PolySize>(poly), - name_(name), logActive_(poly.logActive_), logCoeff_(poly.logCoeff_) {} @@ -85,13 +83,6 @@ Foam::Polynomial::Polynomial // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -const Foam::word& Foam::Polynomial::name() const -{ - return name_; -} - - template bool& Foam::Polynomial::logActive() { diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H index c1e2b58009..9d787f6c1b 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H @@ -82,9 +82,6 @@ class Polynomial { // Private data - //- Polynomial name - word name_; - //- Include the log term? - only activated using integrateMinus1() bool logActive_; @@ -107,17 +104,14 @@ public: //- Construct from name and Istream Polynomial(const word& name, Istream& is); - //- Copy constructor with name - Polynomial(const word& name, const Polynomial& poly); + //- Copy constructor + Polynomial(const Polynomial& poly); // Member Functions // Access - //- Return const access to the polynomial name - const word& name() const; - //- Return access to the log term active flag bool& logActive(); diff --git a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C index 2a0d2187aa..5da0a67d64 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C @@ -35,8 +35,7 @@ Foam::Ostream& Foam::operator<< const Polynomial& poly ) { - os << poly.name_ << token::SPACE - << static_cast + os << static_cast , scalar, PolySize> >(poly); // Check state of Ostream diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C index 294a96005a..284b9b7049 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C @@ -36,8 +36,8 @@ Foam::hPolynomialThermo::hPolynomialThermo(Istream& i Hf_(readScalar(is)), Sf_(readScalar(is)), cpPolynomial_("cpPolynomial", is), - dhPolynomial_("dhPolynomial", cpPolynomial_.integrate()), - sPolynomial_("sPolynomial", cpPolynomial_.integrateMinus1()) + dhPolynomial_(cpPolynomial_.integrate()), + sPolynomial_(cpPolynomial_.integrateMinus1()) {} From 8841735912cc5014888b6c54e4803e904dc4d7c1 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 9 Jul 2009 17:32:21 +0100 Subject: [PATCH 4/6] minor code formatting change --- .../specie/thermo/hPolynomial/hPolynomialThermo.C | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C index 284b9b7049..7264041083 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C @@ -30,7 +30,10 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::hPolynomialThermo::hPolynomialThermo(Istream& is) +Foam::hPolynomialThermo::hPolynomialThermo +( + Istream& is +) : EquationOfState(is), Hf_(readScalar(is)), From 0f98438bef35382967712ef7bc56e3f5765154bf Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 9 Jul 2009 18:12:01 +0100 Subject: [PATCH 5/6] using Switch instead of bool --- .../timeActivatedExplicitMulticomponentPointSource.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H index a1d74268f9..0247f26389 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H +++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H @@ -111,7 +111,7 @@ protected: const PtrList& carrierFields_; //- Active flag - bool active_; + Switch active_; //- List of point source properties List pointSources_; From 43607987479ef6cc592161a7c54f1d54773f8170 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 9 Jul 2009 18:15:02 +0100 Subject: [PATCH 6/6] activating point mass sources --- .../filter/constant/pointMassSourcesProperties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties index 063399d211..2f17b0b095 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active false; +active true; pointSources (