zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: consistency of HashSet setMany(), insertMany() with packed-list version

Browse Source 
- this also provides a better separation of the intent
  (ie, inserting a single value, or inserting multiply values)
This commit is contained in:
Mark Olesen
2018-03-14 21:08:29 +01:00
parent 5d1fb23555
commit d17bc72585
64 changed files with 516 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sampling/probes/probes.C
View File

@ -177,17 +177,17 @@ Foam::label Foam::probes::prepare()
{
wordHashSet currentFields;
currentFields.insert(scalarFields_);
currentFields.insert(vectorFields_);
currentFields.insert(sphericalTensorFields_);
currentFields.insert(symmTensorFields_);
currentFields.insert(tensorFields_);
currentFields.insertMany(scalarFields_);
currentFields.insertMany(vectorFields_);
currentFields.insertMany(sphericalTensorFields_);
currentFields.insertMany(symmTensorFields_);
currentFields.insertMany(tensorFields_);
currentFields.insert(surfaceScalarFields_);
currentFields.insert(surfaceVectorFields_);
currentFields.insert(surfaceSphericalTensorFields_);
currentFields.insert(surfaceSymmTensorFields_);
currentFields.insert(surfaceTensorFields_);
currentFields.insertMany(surfaceScalarFields_);
currentFields.insertMany(surfaceVectorFields_);
currentFields.insertMany(surfaceSphericalTensorFields_);
currentFields.insertMany(surfaceSymmTensorFields_);
currentFields.insertMany(surfaceTensorFields_);
DebugInfo
<< "Probing fields: " << currentFields << nl
@ -229,10 +229,8 @@ Foam::label Foam::probes::prepare()
}
// currentFields now just has the new fields - open streams for them
forAllConstIter(wordHashSet, currentFields, iter)
for (const word& fieldName : currentFields)
{
const word& fieldName = iter.key();
// Create directory if does not exist.
mkDir(probeDir);

10
src/sampling/surfMeshSampler/surfMeshSamplers/surfMeshSamplers.C
View File

@ -236,11 +236,11 @@ bool Foam::surfMeshSamplers::execute()
// The acceptable fields
wordHashSet acceptable(added);
acceptable.insert(acceptType<scalar>());
acceptable.insert(acceptType<vector>());
acceptable.insert(acceptType<sphericalTensor>());
acceptable.insert(acceptType<symmTensor>());
acceptable.insert(acceptType<tensor>());
acceptable.insertMany(acceptType<scalar>());
acceptable.insertMany(acceptType<vector>());
acceptable.insertMany(acceptType<sphericalTensor>());
acceptable.insertMany(acceptType<symmTensor>());
acceptable.insertMany(acceptType<tensor>());
const wordList fields = acceptable.sortedToc();
if (!fields.empty())