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

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Browse Source
This commit is contained in:
mattijs
2017-05-15 10:17:57 +01:00
parent 3cf7820160 8728e8353f
commit 1889ea83e3
16 changed files with 109 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
View File

@ -924,8 +924,8 @@ int main(int argc, char *argv[])
}
}
HashTable<labelList,word> cellZones;
HashTable<labelList,word> faceZones;
HashTable<labelList> cellZones;
HashTable<labelList> faceZones;
List<bool> isAPatch(patchNames.size(),true);
if (dofVertIndices.size())

25
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
View File

@ -233,21 +233,16 @@ void Foam::vtkPVFoam::updateInfoPatches
if (meshPtr_)
{
const polyBoundaryMesh& patches = meshPtr_->boundaryMesh();
const HashTable<labelList, word>& groups = patches.groupPatchIDs();
const HashTable<labelList>& groups = patches.groupPatchIDs();
const wordList allPatchNames = patches.names();
// Add patch groups
// ~~~~~~~~~~~~~~~~
for
(
HashTable<labelList, word>::const_iterator iter = groups.begin();
iter != groups.end();
++iter
)
forAllConstIters(groups, iter)
{
const word& groupName = iter.key();
const labelList& patchIDs = iter();
const labelList& patchIDs = iter.object();
label nFaces = 0;
forAll(patchIDs, i)
@ -349,7 +344,7 @@ void Foam::vtkPVFoam::updateInfoPatches
// Add (non-zero) patch groups to the list of mesh parts
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
HashTable<labelList, word> groups(patchEntries.size());
HashTable<labelList> groups(patchEntries.size());
forAll(patchEntries, patchi)
{
@ -360,7 +355,7 @@ void Foam::vtkPVFoam::updateInfoPatches
forAll(groupNames, groupI)
{
HashTable<labelList, word>::iterator iter = groups.find
HashTable<labelList>::iterator iter = groups.find
(
groupNames[groupI]
);
@ -375,16 +370,10 @@ void Foam::vtkPVFoam::updateInfoPatches
}
}
for
(
HashTable<labelList, word>::const_iterator iter =
groups.begin();
iter != groups.end();
++iter
)
forAllConstIters(groups, iter)
{
const word& groupName = iter.key();
const labelList& patchIDs = iter();
const labelList& patchIDs = iter.object();
label nFaces = 0;
forAll(patchIDs, i)