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: simplify sampling grouping using new IOobjectList methods

Browse Source
This commit is contained in:
Mark Olesen
2017-05-17 16:25:20 +02:00
parent b2edd73881
commit aeae8e70de
5 changed files with 204 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/sampling/probes/probes.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -133,45 +133,46 @@ protected:
//- Load fields from files (not from objectRegistry) //- Load fields from files (not from objectRegistry)
bool loadFromFiles_; bool loadFromFiles_;
// Read from dictonary
//- Names of fields to probe // Read from dictonary
wordReList fieldSelection_;
//- Fixed locations, default = yes //- Names of fields to probe
// Note: set to false for moving mesh calculations where locations wordReList fieldSelection_;
// should move with the mesh
bool fixedLocations_;
//- Interpolation scheme name //- Fixed locations, default = yes
// Note: only possible when fixedLocations_ is true // Note: set to false for moving mesh calculations where locations
word interpolationScheme_; // should move with the mesh
bool fixedLocations_;
//- Interpolation scheme name
// Note: only possible when fixedLocations_ is true
word interpolationScheme_;
// Calculated // Calculated
//- Categorized scalar/vector/tensor vol fields //- Categorized scalar/vector/tensor vol fields
fieldGroup<scalar> scalarFields_; fieldGroup<scalar> scalarFields_;
fieldGroup<vector> vectorFields_; fieldGroup<vector> vectorFields_;
fieldGroup<sphericalTensor> sphericalTensorFields_; fieldGroup<sphericalTensor> sphericalTensorFields_;
fieldGroup<symmTensor> symmTensorFields_; fieldGroup<symmTensor> symmTensorFields_;
fieldGroup<tensor> tensorFields_; fieldGroup<tensor> tensorFields_;
//- Categorized scalar/vector/tensor surf fields //- Categorized scalar/vector/tensor surf fields
fieldGroup<scalar> surfaceScalarFields_; fieldGroup<scalar> surfaceScalarFields_;
fieldGroup<vector> surfaceVectorFields_; fieldGroup<vector> surfaceVectorFields_;
fieldGroup<sphericalTensor> surfaceSphericalTensorFields_; fieldGroup<sphericalTensor> surfaceSphericalTensorFields_;
fieldGroup<symmTensor> surfaceSymmTensorFields_; fieldGroup<symmTensor> surfaceSymmTensorFields_;
fieldGroup<tensor> surfaceTensorFields_; fieldGroup<tensor> surfaceTensorFields_;
// Cells to be probed (obtained from the locations) // Cells to be probed (obtained from the locations)
labelList elementList_; labelList elementList_;
// Faces to be probed // Faces to be probed
labelList faceList_; labelList faceList_;
//- Current open files //- Current open files
HashPtrTable<OFstream> probeFilePtrs_; HashPtrTable<OFstream> probeFilePtrs_;
// Protected Member Functions // Protected Member Functions
@ -179,16 +180,13 @@ protected:
//- Clear old field groups //- Clear old field groups
void clearFieldGroups(); void clearFieldGroups();
//- Append fieldName to the appropriate group
label appendFieldGroup(const word& fieldName, const word& fieldType);
//- Classify field types, returns the number of fields //- Classify field types, returns the number of fields
label classifyFields(); label classifyFields();
//- Find cells and faces containing probes //- Find cells and faces containing probes
virtual void findElements(const fvMesh&); virtual void findElements(const fvMesh& mesh);
//- Classify field type and Open/close file streams, //- Classify field type and open/close file streams,
// returns number of fields to sample // returns number of fields to sample
label prepare(); label prepare();
@ -219,10 +217,10 @@ private:
void sampleAndWriteSurfaceFields(const fieldGroup<Type>&); void sampleAndWriteSurfaceFields(const fieldGroup<Type>&);
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct
probes(const probes&); probes(const probes&) = delete;
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const probes&); void operator=(const probes&) = delete;
public: public:

146
src/sampling/probes/probesGrouping.C
View File

@ -47,106 +47,74 @@ void Foam::probes::clearFieldGroups()
} }
Foam::label Foam::probes::appendFieldGroup
(
const word& fieldName,
const word& fieldType
)
{
if (fieldType == volScalarField::typeName)
{
scalarFields_.append(fieldName);
return 1;
}
else if (fieldType == volVectorField::typeName)
{
vectorFields_.append(fieldName);
return 1;
}
else if (fieldType == volSphericalTensorField::typeName)
{
sphericalTensorFields_.append(fieldName);
return 1;
}
else if (fieldType == volSymmTensorField::typeName)
{
symmTensorFields_.append(fieldName);
return 1;
}
else if (fieldType == volTensorField::typeName)
{
tensorFields_.append(fieldName);
return 1;
}
else if (fieldType == surfaceScalarField::typeName)
{
surfaceScalarFields_.append(fieldName);
return 1;
}
else if (fieldType == surfaceVectorField::typeName)
{
surfaceVectorFields_.append(fieldName);
return 1;
}
else if (fieldType == surfaceSphericalTensorField::typeName)
{
surfaceSphericalTensorFields_.append(fieldName);
return 1;
}
else if (fieldType == surfaceSymmTensorField::typeName)
{
surfaceSymmTensorFields_.append(fieldName);
return 1;
}
else if (fieldType == surfaceTensorField::typeName)
{
surfaceTensorFields_.append(fieldName);
return 1;
}
return 0;
}
Foam::label Foam::probes::classifyFields() Foam::label Foam::probes::classifyFields()
{ {
label nFields = 0; label nFields = 0;
clearFieldGroups(); clearFieldGroups();
if (loadFromFiles_) HashTable<wordHashSet> available =
(
loadFromFiles_
? IOobjectList(mesh_, mesh_.time().timeName()).classes(fieldSelection_)
: mesh_.classes(fieldSelection_)
);
forAllConstIters(available, iter)
{ {
// Check files for a particular time const word& fieldType = iter.key();
IOobjectList objects(mesh_, mesh_.time().timeName()); const wordList fieldNames = iter.object().sortedToc();
wordList allFields = objects.sortedNames();
labelList indices = findStrings(fieldSelection_, allFields); const label count = fieldNames.size(); // pre-filtered, so non-empty
forAll(indices, fieldi) if (fieldType == volScalarField::typeName)
{ {
const word& fieldName = allFields[indices[fieldi]]; scalarFields_.append(fieldNames);
nFields += count;
nFields += appendFieldGroup
(
fieldName,
objects.find(fieldName)()->headerClassName()
);
} }
} else if (fieldType == volVectorField::typeName)
else
{
// Check currently available fields
wordList allFields = mesh_.sortedNames();
labelList indices = findStrings(fieldSelection_, allFields);
forAll(indices, fieldi)
{ {
const word& fieldName = allFields[indices[fieldi]]; vectorFields_.append(fieldNames);
nFields += count;
nFields += appendFieldGroup }
( else if (fieldType == volSphericalTensorField::typeName)
fieldName, {
mesh_.find(fieldName)()->type() sphericalTensorFields_.append(fieldNames);
); nFields += count;
}
else if (fieldType == volSymmTensorField::typeName)
{
symmTensorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == volTensorField::typeName)
{
tensorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == surfaceScalarField::typeName)
{
surfaceScalarFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == surfaceVectorField::typeName)
{
surfaceVectorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == surfaceSphericalTensorField::typeName)
{
surfaceSphericalTensorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == surfaceSymmTensorField::typeName)
{
surfaceSymmTensorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == surfaceTensorField::typeName)
{
surfaceTensorFields_.append(fieldNames);
nFields += count;
} }
} }

42
src/sampling/sampledSet/sampledSets/sampledSets.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -104,7 +104,6 @@ class sampledSets
{ {
formatter = writer<Type>::New(writeFormat); formatter = writer<Type>::New(writeFormat);
} }
}; };
@ -173,31 +172,31 @@ class sampledSets
meshSearch searchEngine_; meshSearch searchEngine_;
// Read from dictonary // Read from dictonary
//- Names of fields to sample //- Names of fields to sample
wordReList fieldSelection_; wordReList fieldSelection_;
//- Interpolation scheme to use //- Interpolation scheme to use
word interpolationScheme_; word interpolationScheme_;
//- Output format to use //- Output format to use
word writeFormat_; word writeFormat_;
// Categorized scalar/vector/tensor fields // Categorized scalar/vector/tensor fields
fieldGroup<scalar> scalarFields_; fieldGroup<scalar> scalarFields_;
fieldGroup<vector> vectorFields_; fieldGroup<vector> vectorFields_;
fieldGroup<sphericalTensor> sphericalTensorFields_; fieldGroup<sphericalTensor> sphericalTensorFields_;
fieldGroup<symmTensor> symmTensorFields_; fieldGroup<symmTensor> symmTensorFields_;
fieldGroup<tensor> tensorFields_; fieldGroup<tensor> tensorFields_;
// Merging structures // Merging structures
PtrList<coordSet> masterSampledSets_; PtrList<coordSet> masterSampledSets_;
labelListList indexSets_; labelListList indexSets_;
// Private Member Functions // Private Member Functions
@ -205,9 +204,6 @@ class sampledSets
//- Clear old field groups //- Clear old field groups
void clearFieldGroups(); void clearFieldGroups();
//- Append fieldName to the appropriate group
label appendFieldGroup(const word& fieldName, const word& fieldType);
//- Classify field types, returns the number of fields //- Classify field types, returns the number of fields
label classifyFields(); label classifyFields();
@ -245,8 +241,8 @@ class sampledSets
//- Disallow default bitwise copy construct and assignment //- Disallow default bitwise copy construct and assignment
sampledSets(const sampledSets&); sampledSets(const sampledSets&) = delete;
void operator=(const sampledSets&); void operator=(const sampledSets&) = delete;
public: public:

143
src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -27,6 +27,7 @@ License
#include "volFields.H" #include "volFields.H"
#include "IOobjectList.H" #include "IOobjectList.H"
#include "stringListOps.H" #include "stringListOps.H"
#include "UIndirectList.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -40,107 +41,81 @@ void Foam::sampledSets::clearFieldGroups()
} }
Foam::label Foam::sampledSets::appendFieldGroup
(
const word& fieldName,
const word& fieldType
)
{
if (fieldType == volScalarField::typeName)
{
scalarFields_.append(fieldName);
return 1;
}
else if (fieldType == volVectorField::typeName)
{
vectorFields_.append(fieldName);
return 1;
}
else if (fieldType == volSphericalTensorField::typeName)
{
sphericalTensorFields_.append(fieldName);
return 1;
}
else if (fieldType == volSymmTensorField::typeName)
{
symmTensorFields_.append(fieldName);
return 1;
}
else if (fieldType == volTensorField::typeName)
{
tensorFields_.append(fieldName);
return 1;
}
return 0;
}
Foam::label Foam::sampledSets::classifyFields() Foam::label Foam::sampledSets::classifyFields()
{ {
label nFields = 0; label nFields = 0;
clearFieldGroups(); clearFieldGroups();
wordList allFields; // Just needed for warnings
HashTable<wordHashSet> available;
if (loadFromFiles_) if (loadFromFiles_)
{ {
// Check files for a particular time // Check files for a particular time
IOobjectList objects(mesh_, mesh_.time().timeName()); IOobjectList objects(mesh_, mesh_.time().timeName());
wordList allFields = objects.sortedNames();
forAll(fieldSelection_, i) allFields = objects.names();
{ available = objects.classes(fieldSelection_);
labelList indices = findStrings(fieldSelection_[i], allFields);
if (indices.size())
{
forAll(indices, fieldi)
{
const word& fieldName = allFields[indices[fieldi]];
nFields += appendFieldGroup
(
fieldName,
objects.find(fieldName)()->headerClassName()
);
}
}
else
{
WarningInFunction
<< "Cannot find field file matching "
<< fieldSelection_[i] << endl;
}
}
} }
else else
{ {
// Check currently available fields // Check currently available fields
wordList allFields = mesh_.sortedNames(); allFields = mesh_.names();
labelList indices = findStrings(fieldSelection_, allFields); available = mesh_.classes(fieldSelection_);
}
forAll(fieldSelection_, i) DynamicList<label> missed(fieldSelection_.size());
// Detect missing fields
forAll(fieldSelection_, i)
{
if (findStrings(fieldSelection_[i], allFields).empty())
{ {
labelList indices = findStrings(fieldSelection_[i], allFields); missed.append(i);
}
}
if (indices.size()) if (missed.size())
{ {
forAll(indices, fieldi) WarningInFunction
{ << nl
const word& fieldName = allFields[indices[fieldi]]; << "Cannot find "
<< (loadFromFiles_ ? "field file" : "registered field")
<< " matching "
<< UIndirectList<wordRe>(fieldSelection_, missed) << endl;
}
nFields += appendFieldGroup forAllConstIters(available, iter)
( {
fieldName, const word& fieldType = iter.key();
mesh_.find(fieldName)()->type() const wordList fieldNames = iter.object().sortedToc();
);
} const label count = fieldNames.size(); // pre-filtered, so non-empty
}
else if (fieldType == volScalarField::typeName)
{ {
WarningInFunction scalarFields_.append(fieldNames);
<< "Cannot find registered field matching " nFields += count;
<< fieldSelection_[i] << endl; }
} else if (fieldType == volVectorField::typeName)
{
vectorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == volSphericalTensorField::typeName)
{
sphericalTensorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == volSymmTensorField::typeName)
{
symmTensorFields_.append(fieldNames);
nFields += count;
}
else if (fieldType == volTensorField::typeName)
{
tensorFields_.append(fieldNames);
nFields += count;
} }
} }

66
src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,9 +24,9 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "sampledSurfaces.H" #include "sampledSurfaces.H"
#include "volFields.H"
#include "IOobjectList.H" #include "IOobjectList.H"
#include "stringListOps.H" #include "stringListOps.H"
#include "UIndirectList.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -34,50 +34,52 @@ Foam::label Foam::sampledSurfaces::classifyFields()
{ {
label nFields = 0; label nFields = 0;
wordList allFields; // Just needed for warnings
HashTable<wordHashSet> available;
if (loadFromFiles_) if (loadFromFiles_)
{ {
// Check files for a particular time // Check files for a particular time
IOobjectList objects(obr_, obr_.time().timeName()); IOobjectList objects(obr_, obr_.time().timeName());
wordList allFields = objects.sortedNames();
forAll(fieldSelection_, i) allFields = objects.names();
{ available = objects.classes(fieldSelection_);
labelList indices = findStrings(fieldSelection_[i], allFields);
if (indices.size())
{
nFields += indices.size();
}
else
{
WarningInFunction
<< "Cannot find field file matching "
<< fieldSelection_[i] << endl;
}
}
} }
else else
{ {
// Check currently available fields // Check currently available fields
wordList allFields = obr_.sortedNames(); allFields = obr_.names();
available = obr_.classes(fieldSelection_);
}
forAll(fieldSelection_, i) DynamicList<label> missed(fieldSelection_.size());
// Detect missing fields
forAll(fieldSelection_, i)
{
if (findStrings(fieldSelection_[i], allFields).empty())
{ {
labelList indices = findStrings(fieldSelection_[i], allFields); missed.append(i);
if (indices.size())
{
nFields += indices.size();
}
else
{
WarningInFunction
<< "Cannot find registered field matching "
<< fieldSelection_[i] << endl;
}
} }
} }
if (missed.size())
{
WarningInFunction
<< nl
<< "Cannot find "
<< (loadFromFiles_ ? "field file" : "registered field")
<< " matching "
<< UIndirectList<wordRe>(fieldSelection_, missed) << endl;
}
// Total number selected
forAllConstIters(available, iter)
{
nFields += iter.object().size();
}
return nFields; return nFields;
} }