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).
227 lines
5.9 KiB
C
227 lines
5.9 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2016-2022 OpenCFD Ltd.
|
|
-------------------------------------------------------------------------------
|
|
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 "particleDistribution.H"
|
|
#include "addToRunTimeSelectionTable.H"
|
|
#include "general.H"
|
|
#include "fvMesh.H"
|
|
#include "cloud.H"
|
|
|
|
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
|
|
|
namespace Foam
|
|
{
|
|
namespace functionObjects
|
|
{
|
|
defineTypeNameAndDebug(particleDistribution, 0);
|
|
addToRunTimeSelectionTable
|
|
(
|
|
functionObject,
|
|
particleDistribution,
|
|
dictionary
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
Foam::functionObjects::particleDistribution::particleDistribution
|
|
(
|
|
const word& name,
|
|
const Time& runTime,
|
|
const dictionary& dict
|
|
)
|
|
:
|
|
fvMeshFunctionObject(name, runTime, dict),
|
|
writeFile(runTime, name),
|
|
cloudName_("unknown-cloudName"),
|
|
tagFieldName_("none"),
|
|
rndGen_(),
|
|
nameVsBinWidth_(),
|
|
writerPtr_(nullptr)
|
|
{
|
|
read(dict);
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
|
|
bool Foam::functionObjects::particleDistribution::read(const dictionary& dict)
|
|
{
|
|
if (fvMeshFunctionObject::read(dict) && writeFile::read(dict))
|
|
{
|
|
dict.readEntry("cloud", cloudName_);
|
|
dict.readIfPresent("tagField", tagFieldName_);
|
|
dict.readEntry("nameVsBinWidth", nameVsBinWidth_);
|
|
|
|
const word setFormat(dict.get<word>("setFormat"));
|
|
writerPtr_ = coordSetWriter::New
|
|
(
|
|
setFormat,
|
|
dict.subOrEmptyDict("formatOptions").optionalSubDict(setFormat)
|
|
);
|
|
|
|
Info<< type() << " " << name() << " output:" << nl
|
|
<< " Processing cloud : " << cloudName_ << nl
|
|
<< endl;
|
|
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
|
|
bool Foam::functionObjects::particleDistribution::execute()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
|
|
bool Foam::functionObjects::particleDistribution::write()
|
|
{
|
|
Log << type() << " " << name() << " output:" << endl;
|
|
|
|
if (!mesh_.foundObject<cloud>(cloudName_))
|
|
{
|
|
WarningInFunction
|
|
<< "Unable to find cloud " << cloudName_
|
|
<< " in the mesh database. Available clouds include:"
|
|
<< flatOutput(mesh_.sortedNames<cloud>()) << endl;
|
|
|
|
return false;
|
|
}
|
|
|
|
const cloud& c = mesh_.lookupObject<cloud>(cloudName_);
|
|
|
|
objectRegistry cloudObr
|
|
(
|
|
IOobject
|
|
(
|
|
scopedName("CloudRegistry"),
|
|
mesh_.time().timeName(),
|
|
cloud::prefix,
|
|
mesh_.time(),
|
|
IOobject::NO_READ,
|
|
IOobject::NO_WRITE
|
|
)
|
|
);
|
|
|
|
c.writeObjects(cloudObr);
|
|
|
|
List<DynamicList<label>> tagAddr;
|
|
if
|
|
(
|
|
tagFieldName_ != "none"
|
|
&& cloudObr.foundObject<IOField<scalar>>(tagFieldName_)
|
|
)
|
|
{
|
|
// Tag field present - generate distribution per tag
|
|
const IOField<label>& tag =
|
|
cloudObr.lookupObject<IOField<label>>(tagFieldName_);
|
|
const labelHashSet tagMap(tag);
|
|
const label tagMax = tagMap.size();
|
|
|
|
List<DynamicList<label>> tagAddr(tagMax);
|
|
forAll(tag, i)
|
|
{
|
|
label newTag = tagMap[tag[i]];
|
|
tagAddr[newTag].append(i);
|
|
}
|
|
}
|
|
|
|
|
|
forAll(nameVsBinWidth_, i)
|
|
{
|
|
const bool ok
|
|
(
|
|
processField<scalar>(cloudObr, i, tagAddr)
|
|
|| processField<vector>(cloudObr, i, tagAddr)
|
|
|| processField<tensor>(cloudObr, i, tagAddr)
|
|
|| processField<sphericalTensor>(cloudObr, i, tagAddr)
|
|
|| processField<symmTensor>(cloudObr, i, tagAddr)
|
|
|| processField<tensor>(cloudObr, i, tagAddr)
|
|
);
|
|
|
|
if (log && !ok)
|
|
{
|
|
WarningInFunction
|
|
<< "Unable to find field " << nameVsBinWidth_[i].first()
|
|
<< " in the " << cloudName_ << " cloud database" << endl;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
void Foam::functionObjects::particleDistribution::generateDistribution
|
|
(
|
|
const word& fieldName,
|
|
const scalarField& field,
|
|
const scalar binWidth,
|
|
const label tag
|
|
)
|
|
{
|
|
if (field.empty())
|
|
{
|
|
return;
|
|
}
|
|
|
|
word fldName(fieldName);
|
|
if (tag != -1)
|
|
{
|
|
fldName += '_' + Foam::name(tag);
|
|
}
|
|
|
|
distributionModels::general distribution
|
|
(
|
|
field,
|
|
binWidth,
|
|
rndGen_
|
|
);
|
|
|
|
Field<scalar> distX(distribution.x());
|
|
Field<scalar> distY(distribution.y());
|
|
|
|
pointField xBin(distX.size(), Zero);
|
|
xBin.replace(vector::X, distX);
|
|
|
|
const coordSet coords(fldName, "x", std::move(xBin), std::move(distX));
|
|
|
|
writerPtr_->open(coords, baseTimeDir() / fldName);
|
|
fileName outFile = writerPtr_->write(fldName, distY);
|
|
writerPtr_->close(true);
|
|
|
|
Log << " Wrote distribution of " << fieldName
|
|
<< " to " << time_.relativePath(outFile) << endl;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|