From 49331bf9176d176f6be6bce4fa41bd2e8ef56652 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 22 Nov 2010 15:16:42 +0000 Subject: [PATCH 01/12] ENH: added xfer function to Field (stopped falling through to List) --- src/OpenFOAM/fields/Fields/Field/Field.C | 7 +++++++ src/OpenFOAM/fields/Fields/Field/Field.H | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C index 979442ac86..398772b4e8 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.C +++ b/src/OpenFOAM/fields/Fields/Field/Field.C @@ -578,6 +578,13 @@ tmp > Field::T() const } +template +Xfer > Field::xfer() +{ + return xferMove(*this); +} + + template void Field::writeEntry(const word& keyword, Ostream& os) const { diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H index a886dd3755..b3b9826154 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.H +++ b/src/OpenFOAM/fields/Fields/Field/Field.H @@ -302,6 +302,9 @@ public: //- Return the field transpose (only defined for second rank tensors) tmp > T() const; + //- Transfer contents to the Xfer container + Xfer > xfer(); + //- Write the field as a dictionary entry void writeEntry(const word& keyword, Ostream& os) const; From eddccf3ec3f7cc2b681249b49a66dd83facf424d Mon Sep 17 00:00:00 2001 From: graham Date: Tue, 23 Nov 2010 12:49:29 +0000 Subject: [PATCH 02/12] ENH: SRF non-inertial frame acceleration terms for particle motion. --- .../general/SRF/SRFModel/SRFModel/SRFModel.H | 1 - .../include/makeParcelSurfaceFilmModels.H | 2 - .../particleForces/particleForces.C | 42 +++++++++++++++++++ .../particleForces/particleForces.H | 10 +++++ .../NoSurfaceFilm/NoSurfaceFilm.C | 5 ++- .../NoSurfaceFilm/NoSurfaceFilm.H | 5 ++- 6 files changed, 58 insertions(+), 7 deletions(-) diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H index 8056e9ac93..d10c5adda3 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H @@ -185,4 +185,3 @@ public: #endif // ************************************************************************* // - diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H index b150710a4f..045d26612e 100644 --- a/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H +++ b/src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H @@ -51,5 +51,3 @@ License #endif // ************************************************************************* // - - diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C index 3b3e1ec1e6..be189ba3e1 100644 --- a/src/lagrangian/intermediate/particleForces/particleForces.C +++ b/src/lagrangian/intermediate/particleForces/particleForces.C @@ -29,6 +29,7 @@ License #include "fvcGrad.H" #include "mathematicalConstants.H" #include "electromagneticConstants.H" +#include "SRFModel.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -63,6 +64,7 @@ Foam::particleForces::particleForces(const fvMesh& mesh) pressureGradient_(false), paramagnetic_(false), magneticSusceptibility_(0.0), + refFrame_(rfInertial), UName_("undefined_UName"), HdotGradHName_("undefined_HdotGradHName") {} @@ -86,6 +88,7 @@ Foam::particleForces::particleForces pressureGradient_(dict_.lookup("pressureGradient")), paramagnetic_(dict_.lookup("paramagnetic")), magneticSusceptibility_(0.0), + refFrame_(rfInertial), UName_(dict_.lookupOrDefault("UName", "U")), HdotGradHName_(dict_.lookupOrDefault("HdotGradHName", "HdotGradH")) { @@ -98,6 +101,30 @@ Foam::particleForces::particleForces { dict_.lookup("magneticSusceptibility") >> magneticSusceptibility_; } + + if (dict_.found("referenceFrame")) + { + word rf(dict_.lookup("referenceFrame")); + + if (rf == "SRF") + { + refFrame_ = rfSRF; + } + else if (rf != "inertial") + { + FatalErrorIn + ( + "Foam::particleForces::particleForces" + "(" + "const fvMesh& mesh," + "const dictionary& dict," + "const vector& g" + ")" + ) + << "Unknown referenceFrame, options are inertial and SRF." + << abort(FatalError); + } + } } @@ -114,6 +141,7 @@ Foam::particleForces::particleForces(const particleForces& f) pressureGradient_(f.pressureGradient_), paramagnetic_(f.paramagnetic_), magneticSusceptibility_(f.magneticSusceptibility_), + refFrame_(f.refFrame_), UName_(f.UName_), HdotGradHName_(f.HdotGradHName_) {} @@ -305,6 +333,20 @@ Foam::vector Foam::particleForces::calcNonCoupled // acceleration } + if (refFrame_ == rfSRF) + { + const SRF::SRFModel& srf = + mesh_.lookupObject("SRFProperties"); + + const vector& omega = srf.omega().value(); + const vector& axis = srf.axis(); + + vector r = position - axis*(axis & position); + + // Coriolis and centrifugal acceleration terms + accelTot += 2*(U ^ omega) + (omega ^ (r ^ omega)); + } + return accelTot; } diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H index efbba75b64..5c537ff540 100644 --- a/src/lagrangian/intermediate/particleForces/particleForces.H +++ b/src/lagrangian/intermediate/particleForces/particleForces.H @@ -59,6 +59,13 @@ class particleForces { // Private data + //- Reference frame type + enum refFrame + { + rfInertial, + rfSRF + }; + //- Reference to the mesh database const fvMesh& mesh_; @@ -95,6 +102,9 @@ class particleForces //- Magnetic susceptibility of particle scalar magneticSusceptibility_; + //- Reference frame accelerations + refFrame refFrame_; + // Additional info diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C index 651648ee64..30be8e1577 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C @@ -69,8 +69,9 @@ bool Foam::NoSurfaceFilm::active() const template bool Foam::NoSurfaceFilm::transferParcel ( - const parcelType&, - const label + parcelType&, + const polyPatch&, + bool& ) { return false; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H index 9ef7814f82..1cc6fc2e92 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H @@ -98,8 +98,9 @@ public: // Returns true if parcel is to be transferred virtual bool transferParcel ( - const parcelType& p, - const label patchI + parcelType& p, + const polyPatch& pp, + bool& keepParticle ); //- Set parcel properties From d21d66ef8cdd8b61f89377df5a799b79fbdc5fd9 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Nov 2010 15:37:00 +0000 Subject: [PATCH 03/12] BUG: Corrected kappat Jayatilleke wall function --- .../kappatJayatillekeWallFunctionFvPatchScalarField.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C index 6efef7364b..4f92d0db57 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C @@ -235,7 +235,7 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() if (yPlus > yPlusTherm) { scalar nu = nuw[faceI]; - scalar kt = nu*(yPlus/(Prt_/kappa_*log(E_*yPlusTherm) + P) - 1/Pr); + scalar kt = nu*(yPlus/(Prt_*(log(E_*yPlus)/kappa_ + P)) - 1/Pr) kappatw[faceI] = max(0.0, kt); } else From 45fcad70a8271db22452837f06a8f2e48e81027a Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Nov 2010 17:14:06 +0000 Subject: [PATCH 04/12] ENH: Updated GPL 2->3 headers --- .../primitives/random/cachedRandom/cachedRandom.C | 11 +++++------ .../primitives/random/cachedRandom/cachedRandom.H | 11 +++++------ .../primitives/random/cachedRandom/cachedRandomI.H | 11 +++++------ .../random/cachedRandom/cachedRandomTemplates.C | 11 +++++------ .../swirlFlowRateInletVelocityFvPatchVectorField.H | 11 +++++------ .../structuredDecomp/topoDistanceData.C | 11 +++++------ .../structuredDecomp/topoDistanceData.H | 11 +++++------ .../structuredDecomp/topoDistanceDataI.H | 11 +++++------ .../SLGThermo/SLGThermo/SLGThermo.C | 11 +++++------ .../SLGThermo/SLGThermo/SLGThermo.H | 11 +++++------ .../noChemistrySolver/noChemistrySolver.C | 11 +++++------ .../noChemistrySolver/noChemistrySolver.H | 11 +++++------ .../incompressible/LES/dynLagrangian/dynLagrangian.H | 11 +++++------ 13 files changed, 65 insertions(+), 78 deletions(-) diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C index 3865f60fe1..b48c1f4e63 100644 --- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C +++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H index 76da5228e6..ce176be5ae 100644 --- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H +++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . Class Foam::cachedRandom diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H index 32bf5acf45..98d1456f45 100644 --- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H +++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C index 727450b0c2..bee06751a7 100644 --- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C +++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H index 2edd7fdf86..f0052bf1f1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . Class Foam::swirlFlowRateInletVelocityFvPatchVectorField diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.C b/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.C index f9b99318c6..8c74b47a6f 100644 --- a/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.C +++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.C @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.H b/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.H index d5c6e840d8..96708c65f9 100644 --- a/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.H +++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceData.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . Class Foam::topoDistanceData diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceDataI.H b/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceDataI.H index 5fcf99511c..71fdb087c3 100644 --- a/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceDataI.H +++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/topoDistanceDataI.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C index 53587d1eb4..5eb9dffedc 100644 --- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C +++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H index 7a3b520171..36fb8f3bb3 100644 --- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H +++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . Class Foam::SLGThermo diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C index 895ca0db2a..0d64b3fb85 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H index a844033bc0..7382beba85 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . Class Foam::noChemistry diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H index a18e4aa973..1407eb528e 100644 --- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H +++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H @@ -8,10 +8,10 @@ License This file is part of OpenFOAM. - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -19,8 +19,7 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with OpenFOAM. If not, see . Class Foam::incompressible::LESModels::dynLagrangian From d6cc4f00865a6aeed59cb946ae70ad383d254d23 Mon Sep 17 00:00:00 2001 From: graham Date: Tue, 23 Nov 2010 17:18:47 +0000 Subject: [PATCH 05/12] STYLE: Comment about axis. --- .../cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H index d10c5adda3..52a72d8b6c 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H @@ -75,7 +75,7 @@ protected: //- Reference to the mesh const fvMesh& mesh_; - //- Axis of rotation + //- Axis of rotation, a direction vector which passes through the origin vector axis_; //- SRF model coeficients dictionary From d549a7a4c7d52602330b1c4ead6b5eb0f1cc9595 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Nov 2010 18:14:59 +0000 Subject: [PATCH 06/12] BUG: corrected typo in commit of d21d66ef8cdd --- .../kappatJayatillekeWallFunctionFvPatchScalarField.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C index 4f92d0db57..005c3be5db 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C @@ -235,7 +235,7 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() if (yPlus > yPlusTherm) { scalar nu = nuw[faceI]; - scalar kt = nu*(yPlus/(Prt_*(log(E_*yPlus)/kappa_ + P)) - 1/Pr) + scalar kt = nu*(yPlus/(Prt_*(log(E_*yPlus)/kappa_ + P)) - 1/Pr); kappatw[faceI] = max(0.0, kt); } else From 4530a47356185eb5dbc3e552f81b7c3f95b94aa3 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Nov 2010 18:24:00 +0000 Subject: [PATCH 07/12] ENH: updates to Xfer after commit 49331bf9176d17 --- .../steadyParticleTracks/steadyParticleTracksTemplates.C | 2 +- src/OpenFOAM/fields/Fields/Field/Field.C | 9 ++++++++- src/OpenFOAM/fields/Fields/Field/Field.H | 3 +++ src/fileFormats/starcd/STARCDCore.C | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C index 9cd3ce34ff..d64a36dda5 100644 --- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C +++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C @@ -83,7 +83,7 @@ PtrList > readFields { Info<< " reading field " << obj.name() << endl; IOField newField(obj); - values.set(fieldI++, new List(newField.xfer())); + values.set(fieldI++, new List(newField.xferList())); break; } } diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C index 398772b4e8..861486cd83 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.C +++ b/src/OpenFOAM/fields/Fields/Field/Field.C @@ -164,7 +164,7 @@ Field::Field(const Xfer >& f) template Field::Field(const Xfer >& f) : - List(f) + List(f().xferList()) {} @@ -585,6 +585,13 @@ Xfer > Field::xfer() } +template +Xfer > Field::xferList() +{ + return List::xfer(); +} + + template void Field::writeEntry(const word& keyword, Ostream& os) const { diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H index b3b9826154..b2457153ed 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.H +++ b/src/OpenFOAM/fields/Fields/Field/Field.H @@ -305,6 +305,9 @@ public: //- Transfer contents to the Xfer container Xfer > xfer(); + //- Transfer contents to a List Xfer container + Xfer > xferList(); + //- Write the field as a dictionary entry void writeEntry(const word& keyword, Ostream& os) const; diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C index 6bfb02ad69..8645cb9feb 100644 --- a/src/fileFormats/starcd/STARCDCore.C +++ b/src/fileFormats/starcd/STARCDCore.C @@ -117,7 +117,7 @@ bool Foam::fileFormats::STARCDCore::readPoints // reuse memory if possible - DynamicList dynPoints(points.xfer()); + DynamicList dynPoints(points.xferList()); DynamicList