From 92a85ac9d6075bf629512f02c61a17deaea5af3b Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 2 Dec 2015 09:14:54 +0000 Subject: [PATCH] COMP: pressurePIDControlInletVelocity: moved templated functions to Templates.C --- ...IDControlInletVelocityFvPatchVectorField.C | 48 ----------- ...IDControlInletVelocityFvPatchVectorField.H | 6 ++ ...InletVelocityFvPatchVectorFieldTemplates.C | 79 +++++++++++++++++++ 3 files changed, 85 insertions(+), 48 deletions(-) create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C index f4098267d8..fd1ff0040e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C @@ -68,54 +68,6 @@ Foam::pressurePIDControlInletVelocityFvPatchVectorField::facePressure() const } -template -void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage -( - const word& name, - const GeometricField& field, - scalar& area, - Type& average -) const -{ - const fvMesh& mesh(patch().boundaryMesh().mesh()); - - PackedBoolList isMasterFace(syncTools::getInternalOrMasterFaces(mesh)); - - const faceZone& zone = mesh.faceZones()[name]; - - area = 0; - average = pTraits::zero; - - forAll(zone, faceI) - { - const label f(zone[faceI]); - - if (mesh.isInternalFace(f)) - { - const scalar da(mesh.magSf()[f]); - - area += da; - average += da*field[f]; - } - else if (isMasterFace[f]) - { - const label bf(f-mesh.nInternalFaces()); - const label patchID = mesh.boundaryMesh().patchID()[bf]; - const label lf(mesh.boundaryMesh()[patchID].whichFace(f)); - const scalar da(mesh.magSf().boundaryField()[patchID][lf]); - - area += da; - average += da*field.boundaryField()[patchID][lf]; - } - } - - reduce(area, sumOp()); - reduce(average, sumOp()); - - average /= area; -} - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::pressurePIDControlInletVelocityFvPatchVectorField:: diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.H index d6f6cf765e..dac45b242d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.H @@ -274,6 +274,12 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#ifdef NoRepository +# include "pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #endif // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C new file mode 100644 index 0000000000..6bd1d95bc5 --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C @@ -0,0 +1,79 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +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 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 + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "surfaceFields.H" +#include "syncTools.H" + +// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // + +template +void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage +( + const word& name, + const GeometricField& field, + scalar& area, + Type& average +) const +{ + const fvMesh& mesh(patch().boundaryMesh().mesh()); + + PackedBoolList isMasterFace(syncTools::getInternalOrMasterFaces(mesh)); + + const faceZone& zone = mesh.faceZones()[name]; + + area = 0; + average = pTraits::zero; + + forAll(zone, faceI) + { + const label f(zone[faceI]); + + if (mesh.isInternalFace(f)) + { + const scalar da(mesh.magSf()[f]); + + area += da; + average += da*field[f]; + } + else if (isMasterFace[f]) + { + const label bf(f-mesh.nInternalFaces()); + const label patchID = mesh.boundaryMesh().patchID()[bf]; + const label lf(mesh.boundaryMesh()[patchID].whichFace(f)); + const scalar da(mesh.magSf().boundaryField()[patchID][lf]); + + area += da; + average += da*field.boundaryField()[patchID][lf]; + } + } + + reduce(area, sumOp()); + reduce(average, sumOp()); + + average /= area; +} + + +// ************************************************************************* //