mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
- the very old 'writer' class was fully stateless and always templated on an particular output type. This is now replaced with a 'coordSetWriter' with similar concepts as previously introduced for surface writers (#1206). - writers change from being a generic state-less set of routines to more properly conforming to the normal notion of a writer. - Parallel data is done *outside* of the writers, since they are used in a wide variety of contexts and the caller is currently still in a better position for deciding how to combine parallel data. ENH: update sampleSets to sample on per-field basis (#2347) - sample/write a field in a single step. - support for 'sampleOnExecute' to obtain values at execution intervals without writing. - support 'sets' input as a dictionary entry (as well as a list), which is similar to the changes for sampled-surface and permits use of changeDictionary to modify content. - globalIndex for gather to reduce parallel communication, less code - qualify the sampleSet results (properties) with the name of the set. The sample results were previously without a qualifier, which meant that only the last property value was actually saved (previous ones overwritten). For example, ``` sample1 { scalar { average(line,T) 349.96521; min(line,T) 349.9544281; max(line,T) 350; average(cells,T) 349.9854619; min(cells,T) 349.6589286; max(cells,T) 350.4967271; average(line,epsilon) 0.04947733869; min(line,epsilon) 0.04449639927; max(line,epsilon) 0.06452856475; } label { size(line,T) 79; size(cells,T) 1720; size(line,epsilon) 79; } } ``` ENH: update particleTracks application - use globalIndex to manage original parcel addressing and for gathering. Simplify code by introducing a helper class, storing intermediate fields in hash tables instead of separate lists. ADDITIONAL NOTES: - the regionSizeDistribution largely retains separate writers since the utility of placing sum/dev/count for all fields into a single file is questionable. - the streamline writing remains a "soft" upgrade, which means that scalar and vector fields are still collected a priori and not on-the-fly. This is due to how the streamline infrastructure is currently handled (should be upgraded in the future).
164 lines
4.7 KiB
C
164 lines
4.7 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2011-2016 OpenFOAM Foundation
|
|
-------------------------------------------------------------------------------
|
|
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 <http://www.gnu.org/licenses/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "midPointAndFaceSet.H"
|
|
#include "polyMesh.H"
|
|
#include "addToRunTimeSelectionTable.H"
|
|
|
|
|
|
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
|
|
|
namespace Foam
|
|
{
|
|
defineTypeNameAndDebug(midPointAndFaceSet, 0);
|
|
addToRunTimeSelectionTable(sampledSet, midPointAndFaceSet, word);
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
|
|
|
void Foam::midPointAndFaceSet::genSamples()
|
|
{
|
|
// Generate midpoints and add to face points
|
|
|
|
List<point> mpfSamplePoints(3*size());
|
|
labelList mpfSampleCells(3*size());
|
|
labelList mpfSampleFaces(3*size());
|
|
labelList mpfSampleSegments(3*size());
|
|
scalarList mpfSampleCurveDist(3*size());
|
|
|
|
label mpfSamplei = 0;
|
|
label samplei = 0;
|
|
|
|
while (size() > 0)
|
|
{
|
|
// Add first face
|
|
mpfSamplePoints[mpfSamplei] = points()[samplei];
|
|
mpfSampleCells[mpfSamplei] = cells_[samplei];
|
|
mpfSampleFaces[mpfSamplei] = faces_[samplei];
|
|
mpfSampleSegments[mpfSamplei] = segments_[samplei];
|
|
mpfSampleCurveDist[mpfSamplei] = distance_[samplei];
|
|
++mpfSamplei;
|
|
|
|
while
|
|
(
|
|
(samplei < size() - 1)
|
|
&& (segments_[samplei] == segments_[samplei+1])
|
|
)
|
|
{
|
|
point midPoint(0.5*(points()[samplei] + points()[samplei+1]));
|
|
label cellm = pointInCell(midPoint, samplei);
|
|
|
|
if (cellm != -1)
|
|
{
|
|
mpfSamplePoints[mpfSamplei] = midPoint;
|
|
mpfSampleCells[mpfSamplei] = cellm;
|
|
mpfSampleFaces[mpfSamplei] = -1;
|
|
mpfSampleSegments[mpfSamplei] = segments_[samplei];
|
|
mpfSampleCurveDist[mpfSamplei] =
|
|
mag(mpfSamplePoints[mpfSamplei] - start());
|
|
|
|
++mpfSamplei;
|
|
}
|
|
|
|
// Add second face
|
|
mpfSamplePoints[mpfSamplei] = operator[](samplei+1);
|
|
mpfSampleCells[mpfSamplei] = cells_[samplei+1];
|
|
mpfSampleFaces[mpfSamplei] = faces_[samplei+1];
|
|
mpfSampleSegments[mpfSamplei] = segments_[samplei+1];
|
|
mpfSampleCurveDist[mpfSamplei] =
|
|
mag(mpfSamplePoints[mpfSamplei] - start());
|
|
|
|
++mpfSamplei;
|
|
|
|
++samplei;
|
|
}
|
|
|
|
if (samplei == size() - 1)
|
|
{
|
|
break;
|
|
}
|
|
++samplei;
|
|
}
|
|
|
|
mpfSamplePoints.setSize(mpfSamplei);
|
|
mpfSampleCells.setSize(mpfSamplei);
|
|
mpfSampleFaces.setSize(mpfSamplei);
|
|
mpfSampleSegments.setSize(mpfSamplei);
|
|
mpfSampleCurveDist.setSize(mpfSamplei);
|
|
|
|
// Move into *this
|
|
setSamples
|
|
(
|
|
std::move(mpfSamplePoints),
|
|
std::move(mpfSampleCells),
|
|
std::move(mpfSampleFaces),
|
|
std::move(mpfSampleSegments),
|
|
std::move(mpfSampleCurveDist)
|
|
);
|
|
|
|
if (debug)
|
|
{
|
|
write(Info);
|
|
}
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
Foam::midPointAndFaceSet::midPointAndFaceSet
|
|
(
|
|
const word& name,
|
|
const polyMesh& mesh,
|
|
const meshSearch& searchEngine,
|
|
const word& axis,
|
|
const point& start,
|
|
const point& end
|
|
)
|
|
:
|
|
faceOnlySet(name, mesh, searchEngine, axis, start, end)
|
|
{
|
|
genSamples();
|
|
}
|
|
|
|
|
|
Foam::midPointAndFaceSet::midPointAndFaceSet
|
|
(
|
|
const word& name,
|
|
const polyMesh& mesh,
|
|
const meshSearch& searchEngine,
|
|
const dictionary& dict
|
|
)
|
|
:
|
|
faceOnlySet(name, mesh, searchEngine, dict)
|
|
{
|
|
genSamples();
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|