From 069117eb8573650826d9ca404a8617d88611924b Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 7 Dec 2010 15:47:07 +0000 Subject: [PATCH 1/3] ENH: patchProbes additions. Test probes at patches --- src/sampling/Make/files | 1 + src/sampling/probes/IOprobes.H | 2 + src/sampling/probes/patchProbes.C | 162 ++++++++++++++++++ src/sampling/probes/patchProbes.H | 152 ++++++++++++++++ src/sampling/probes/patchProbesTemplates.C | 162 ++++++++++++++++++ src/sampling/probes/probes.C | 22 +-- src/sampling/probes/probes.H | 14 +- .../probesFunctionObject.C | 7 + .../probesFunctionObject.H | 2 + src/sampling/probes/probesTemplates.C | 4 +- 10 files changed, 510 insertions(+), 18 deletions(-) create mode 100644 src/sampling/probes/patchProbes.C create mode 100644 src/sampling/probes/patchProbes.H create mode 100644 src/sampling/probes/patchProbesTemplates.C diff --git a/src/sampling/Make/files b/src/sampling/Make/files index 6fee75b8f7..505719685f 100644 --- a/src/sampling/Make/files +++ b/src/sampling/Make/files @@ -1,4 +1,5 @@ probes/probes.C +probes/patchProbes.C probes/probesGrouping.C probes/probesFunctionObject/probesFunctionObject.C diff --git a/src/sampling/probes/IOprobes.H b/src/sampling/probes/IOprobes.H index e0c7b2e5ae..a7c279b853 100644 --- a/src/sampling/probes/IOprobes.H +++ b/src/sampling/probes/IOprobes.H @@ -33,6 +33,7 @@ Description #define IOprobes_H #include "probes.H" +#include "patchProbes.H" #include "IOOutputFilter.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -40,6 +41,7 @@ Description namespace Foam { typedef IOOutputFilter IOprobes; + typedef IOOutputFilter IOpatchProbes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C new file mode 100644 index 0000000000..55ae5cd09d --- /dev/null +++ b/src/sampling/probes/patchProbes.C @@ -0,0 +1,162 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 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 "patchProbes.H" +#include "volFields.H" +#include "dictionary.H" +#include "Time.H" +#include "IOmanip.H" +#include "directMappedPatchBase.C" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(patchProbes, 0); +} + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +void Foam::patchProbes::findElements(const fvMesh& mesh) +{ + + elementList_.clear(); + elementList_.setSize(size()); + // All the info for nearest. Construct to miss + List nearest(this->size()); + + // Octree based search engine + meshSearch meshSearchEngine(mesh, false); + + forAll(*this, probeI) + { + const vector& sample = operator[](probeI); + label faceI = meshSearchEngine.findNearestBoundaryFace(sample); + if (faceI == -1) + { + nearest[probeI].second().first() = Foam::sqr(GREAT); + nearest[probeI].second().second() = Pstream::myProcNo(); + } + else + { + const point& fc = mesh.faceCentres()[faceI]; + nearest[probeI].first() = pointIndexHit + ( + true, + fc, + faceI + ); + nearest[probeI].second().first() = magSqr(fc-sample); + nearest[probeI].second().second() = Pstream::myProcNo(); + } + } + + + // Find nearest. + Pstream::listCombineGather(nearest, nearestEqOp()); + Pstream::listCombineScatter(nearest); + + if (debug) + { + Info<< "patchProbes::findElements" << " : " << endl; + forAll(nearest, sampleI) + { + label procI = nearest[sampleI].second().second(); + label localI = nearest[sampleI].first().index(); + + Info<< " " << sampleI << " coord:"<< operator[](sampleI) + << " found on processor:" << procI + << " in local cell/face:" << localI + << " with cc:" << nearest[sampleI].first().rawPoint() << endl; + } + } + + + + // Check if all patchProbes have been found. + forAll(nearest, sampleI) + { + label localI = nearest[sampleI].first().index(); + + if (localI == -1) + { + if (Pstream::master()) + { + WarningIn("patchProbes::findElements()") + << "Did not find location " + << nearest[sampleI].second().first() + << " in any cell. Skipping location." << endl; + } + } + else + { + elementList_[sampleI] = localI; + } + } +} + + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::patchProbes::patchProbes +( + const word& name, + const objectRegistry& obr, + const dictionary& dict, + const bool loadFromFiles +) +: + probes(name, obr, dict, loadFromFiles) +{ + read(dict); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::patchProbes::~patchProbes() +{} + + +void Foam::patchProbes::write() +{ + if (this->size() && prepare()) + { + sampleAndWrite(scalarFields_); + sampleAndWrite(vectorFields_); + sampleAndWrite(sphericalTensorFields_); + sampleAndWrite(symmTensorFields_); + sampleAndWrite(tensorFields_); + } +} + +void Foam::patchProbes::read(const dictionary& dict) +{ + probes::read(dict); +} + + +// ************************************************************************* // diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H new file mode 100644 index 0000000000..01a3559bad --- /dev/null +++ b/src/sampling/probes/patchProbes.H @@ -0,0 +1,152 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 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 . + +Class + Foam::patchProbes + +Description + Set of locations to sample.at patches + + Call write() to sample and write files. + +SourceFiles + patchProbes.C + +\*---------------------------------------------------------------------------*/ + +#ifndef patchProbes_H +#define patchProbes_H + +#include "HashPtrTable.H" +#include "OFstream.H" +#include "polyMesh.H" +#include "pointField.H" +#include "volFieldsFwd.H" +#include "probes.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +class objectRegistry; +class dictionary; +class fvMesh; +class mapPolyMesh; + +/*---------------------------------------------------------------------------*\ + Class patchProbes Declaration +\*---------------------------------------------------------------------------*/ + +class patchProbes +: + public probes +{ + + // Private Member Functions + + //- Sample and write a particular volume field + template + void sampleAndWrite + ( + const GeometricField& + ); + + + //- Sample and write all the fields of the given type + template + void sampleAndWrite(const fieldGroup&); + + + //- Sample a volume field at all locations + template + tmp > sample + ( + const GeometricField& + ) const; + + + //- Sample a single field on all sample locations + template + tmp > sample(const word& fieldName) const; + + + //- Disallow default bitwise copy construct + patchProbes(const patchProbes&); + + //- Disallow default bitwise assignment + void operator=(const patchProbes&); + + +public: + + //- Runtime type information + TypeName("patchProbes"); + + + // Constructors + + //- Construct for given objectRegistry and dictionary. + // Allow the possibility to load fields from files + patchProbes + ( + const word& name, + const objectRegistry&, + const dictionary&, + const bool loadFromFiles = false + ); + + + //- Destructor + virtual ~patchProbes(); + + //- Public members + + //- Sample and write + virtual void write(); + + //- Read + virtual void read(const dictionary&); + + //- Find elements containing patchProbes + virtual void findElements(const fvMesh&); + + +}; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "patchProbesTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C new file mode 100644 index 0000000000..c8176fb398 --- /dev/null +++ b/src/sampling/probes/patchProbesTemplates.C @@ -0,0 +1,162 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 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 "patchProbes.H" +#include "volFields.H" +#include "IOmanip.H" + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +void Foam::patchProbes::sampleAndWrite +( + const GeometricField& vField +) +{ + Field values = sample(vField); + + if (Pstream::master()) + { + unsigned int w = IOstream::defaultPrecision() + 7; + OFstream& probeStream = *probeFilePtrs_[vField.name()]; + + probeStream << setw(w) << vField.time().value(); + + forAll(values, probeI) + { + probeStream << ' ' << setw(w) << values[probeI]; + } + probeStream << endl; + } +} + + +template +void Foam::patchProbes::sampleAndWrite +( + const fieldGroup& fields +) +{ + forAll(fields, fieldI) + { + if (loadFromFiles_) + { + sampleAndWrite + ( + GeometricField + ( + IOobject + ( + fields[fieldI], + mesh_.time().timeName(), + mesh_, + IOobject::MUST_READ, + IOobject::NO_WRITE, + false + ), + mesh_ + ) + ); + } + else + { + objectRegistry::const_iterator iter = mesh_.find(fields[fieldI]); + + if + ( + iter != objectRegistry::end() + && iter()->type() + == GeometricField::typeName + ) + { + sampleAndWrite + ( + mesh_.lookupObject + > + ( + fields[fieldI] + ) + ); + } + } + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +Foam::tmp > +Foam::patchProbes::sample +( + const GeometricField& vField +) const +{ + const Type unsetVal(-VGREAT*pTraits::one); + + tmp > tValues + ( + new Field(this->size(), unsetVal) + ); + + Field& values = tValues(); + + const polyBoundaryMesh& patches = mesh_.boundaryMesh(); + + forAll(*this, probeI) + { + label faceI = elementList_[probeI]; + + if (faceI >= 0) + { + label patchI = patches.whichPatch(faceI); + label localFaceI = patches[patchI].whichFace(faceI); + values[probeI] = vField.boundaryField()[patchI][localFaceI]; + } + } + + Pstream::listCombineGather(values, isNotEqOp()); + Pstream::listCombineScatter(values); + + return tValues; +} + + +template +Foam::tmp > +Foam::patchProbes::sample(const word& fieldName) const +{ + return sample + ( + mesh_.lookupObject > + ( + fieldName + ) + ); +} + + +// ************************************************************************* // diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C index 6ca13f1da2..11bf67af89 100644 --- a/src/sampling/probes/probes.C +++ b/src/sampling/probes/probes.C @@ -36,30 +36,30 @@ defineTypeNameAndDebug(Foam::probes, 0); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::probes::findCells(const fvMesh& mesh) +void Foam::probes::findElements(const fvMesh& mesh) { - cellList_.clear(); - cellList_.setSize(size()); + elementList_.clear(); + elementList_.setSize(size()); forAll(*this, probeI) { const vector& location = operator[](probeI); - cellList_[probeI] = mesh.findCell(location); + elementList_[probeI] = mesh.findCell(location); - if (debug && cellList_[probeI] != -1) + if (debug && elementList_[probeI] != -1) { Pout<< "probes : found point " << location - << " in cell " << cellList_[probeI] << endl; + << " in cell " << elementList_[probeI] << endl; } } // Check if all probes have been found. - forAll(cellList_, probeI) + forAll(elementList_, probeI) { const vector& location = operator[](probeI); - label cellI = cellList_[probeI]; + label cellI = elementList_[probeI]; // Check at least one processor with cell. reduce(cellI, maxOp