zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

streamLines: Write out the streamline age

Browse Source 
The streamLines function object now writes out "age" by default. This is
calculated as the total integration time from the starting point of the
streamline. This value can be negative if tracking is performed in the
reverse direction. Writing "age" can be deactivated by means of a
"writeAge no;" entry in the function object specification.
This commit is contained in:
Will Bainbridge
2018-07-20 16:16:50 +01:00
parent 4cd71d9d0d
commit aa4cb44b1e
4 changed files with 122 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/functionObjects/field/streamLine/streamLine.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -244,6 +244,8 @@ void Foam::functionObjects::streamLine::track()
// Size to maximum expected sizes.
allTracks_.clear();
allTracks_.setCapacity(nSeeds);
allAges_.clear();
allAges_.setCapacity(nSeeds);
allScalars_.setSize(vsInterp.size());
forAll(allScalars_, i)
{
@ -272,6 +274,7 @@ void Foam::functionObjects::streamLine::track()
trackLength_, // fixed track length
allTracks_,
allAges_,
allScalars_,
allVectors_
);
@ -342,6 +345,8 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict)
<< exit(FatalIOError);
}
writeAge_ = dict.lookupOrDefault<Switch>("writeAge", true);
// The trackForward entry is maintained here for backwards compatibility
if (!dict.found("direction") && dict.found("trackForward"))
{
@ -498,9 +503,9 @@ bool Foam::functionObjects::streamLine::write()
);
// Distribute the scalars
forAll(allScalars_, scalarI)
forAll(allScalars_, scalari)
{
allScalars_[scalarI].shrink();
allScalars_[scalari].shrink();
mapDistributeBase::distribute
(
Pstream::commsTypes::scheduled,
@ -510,15 +515,15 @@ bool Foam::functionObjects::streamLine::write()
false,
distMap.constructMap(),
false,
allScalars_[scalarI],
allScalars_[scalari],
flipOp()
);
allScalars_[scalarI].setCapacity(allScalars_[scalarI].size());
allScalars_[scalari].setCapacity(allScalars_[scalari].size());
}
// Distribute the vectors
forAll(allVectors_, vectorI)
forAll(allVectors_, vectori)
{
allVectors_[vectorI].shrink();
allVectors_[vectori].shrink();
mapDistributeBase::distribute
(
Pstream::commsTypes::scheduled,
@ -528,10 +533,10 @@ bool Foam::functionObjects::streamLine::write()
false,
distMap.constructMap(),
false,
allVectors_[vectorI],
allVectors_[vectori],
flipOp()
);
allVectors_[vectorI].setCapacity(allVectors_[vectorI].size());
allVectors_[vectori].setCapacity(allVectors_[vectori].size());
}
}
@ -587,21 +592,46 @@ bool Foam::functionObjects::streamLine::write()
// Convert scalar values
if (allScalars_.size() > 0)
if (allScalars_.size() > 0 || writeAge_)
{
List<List<scalarField>> scalarValues(allScalars_.size());
List<List<scalarField>> ageAndScalarValues
(
allScalars_.size() + writeAge_
);
wordList ageAndScalarNames(allScalars_.size() + writeAge_);
forAll(allScalars_, scalarI)
if (writeAge_)
{
DynamicList<scalarList>& allTrackVals =
allScalars_[scalarI];
scalarValues[scalarI].setSize(allTrackVals.size());
DynamicList<scalarList>& allTrackAges = allAges_;
ageAndScalarValues[0].setSize(allTrackAges.size());
forAll(allTrackAges, trackI)
{
ageAndScalarValues[0][trackI].transfer
(
allTrackAges[trackI]
);
}
ageAndScalarNames[0] = "age";
}
forAll(allScalars_, scalari)
{
const label ageAndScalari = scalari + writeAge_;
DynamicList<scalarList>& allTrackVals = allScalars_[scalari];
ageAndScalarValues[ageAndScalari].setSize(allTrackVals.size());
forAll(allTrackVals, trackI)
{
scalarList& trackVals = allTrackVals[trackI];
scalarValues[scalarI][trackI].transfer(trackVals);
ageAndScalarValues[ageAndScalari][trackI].transfer
(
allTrackVals[trackI]
);
}
ageAndScalarNames[ageAndScalari] = scalarNames_[scalari];
}
fileName vtkFile
@ -610,7 +640,7 @@ bool Foam::functionObjects::streamLine::write()
/ scalarFormatterPtr_().getFileName
(
tracks[0],
scalarNames_
ageAndScalarNames
)
);
@ -620,8 +650,8 @@ bool Foam::functionObjects::streamLine::write()
(
true, // writeTracks
tracks,
scalarNames_,
scalarValues,
ageAndScalarNames,
ageAndScalarValues,
OFstream(vtkFile)()
);
}
@ -632,16 +662,17 @@ bool Foam::functionObjects::streamLine::write()
{
List<List<vectorField>> vectorValues(allVectors_.size());
forAll(allVectors_, vectorI)
forAll(allVectors_, vectori)
{
DynamicList<vectorList>& allTrackVals =
allVectors_[vectorI];
vectorValues[vectorI].setSize(allTrackVals.size());
DynamicList<vectorList>& allTrackVals = allVectors_[vectori];
vectorValues[vectori].setSize(allTrackVals.size());
forAll(allTrackVals, trackI)
{
vectorList& trackVals = allTrackVals[trackI];
vectorValues[vectorI][trackI].transfer(trackVals);
vectorValues[vectori][trackI].transfer
(
allTrackVals[trackI]
);
}
}
@ -655,6 +686,8 @@ bool Foam::functionObjects::streamLine::write()
)
);
Info<< " Writing data to " << vtkFile.path() << endl;
vectorFormatterPtr_().write
(
true, // writeTracks