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: replace keyType with wordRe for matching selectors.

Browse Source 
- The keyType is primarily used within dictionary reading, whereas
  wordRe and wordRes are used for selectors in code.
  Unifying on wordRe and wordRes reduces the number matching options.
This commit is contained in:
Mark Olesen
2021-04-08 13:42:38 +02:00
committed by Andrew Heather
parent 95cd8ee75c
commit 2b7b3700c2
28 changed files with 255 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/functionObjects/field/externalCoupled/externalCoupled.C
View File

@ -278,7 +278,7 @@ void Foam::functionObjects::externalCoupled::writeGeometry
(
mesh.boundaryMesh().patchSet
(
List<wordRe>{groupName}
wordRes(one{}, groupName)
).sortedToc()
);

26
src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015-2020 OpenCFD Ltd.
Copyright (C) 2015-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -80,7 +80,10 @@ bool Foam::functionObjects::externalCoupled::readData
}
const wordRes patchSelection(one{}, groupName);
label nFound = 0;
for (const fvMesh& mesh : meshes)
{
const volFieldType* vfptr = mesh.findObject<volFieldType>(fieldName);
@ -89,7 +92,7 @@ bool Foam::functionObjects::externalCoupled::readData
{
continue;
}
nFound++;
++nFound;
typename volFieldType::Boundary& bf =
const_cast<volFieldType*>(vfptr)->boundaryFieldRef();
@ -97,10 +100,7 @@ bool Foam::functionObjects::externalCoupled::readData
// Get the patches
const labelList patchIDs
(
mesh.boundaryMesh().patchSet
(
List<wordRe>{groupName}
).sortedToc()
mesh.boundaryMesh().patchSet(patchSelection).sortedToc()
);
// Handle column-wise reading of patch data. Supports most easy types
@ -261,7 +261,7 @@ bool Foam::functionObjects::externalCoupled::readData
}
}
return nFound > 0;
return nFound;
}
@ -352,8 +352,9 @@ bool Foam::functionObjects::externalCoupled::writeData
}
bool headerDone = false;
const wordRes patchSelection(one{}, groupName);
bool headerDone = false;
label nFound = 0;
for (const fvMesh& mesh : meshes)
@ -364,7 +365,7 @@ bool Foam::functionObjects::externalCoupled::writeData
{
continue;
}
nFound++;
++nFound;
const typename volFieldType::Boundary& bf =
vfptr->boundaryField();
@ -372,10 +373,7 @@ bool Foam::functionObjects::externalCoupled::writeData
// Get the patches
const labelList patchIDs
(
mesh.boundaryMesh().patchSet
(
List<wordRe>{groupName}
).sortedToc()
mesh.boundaryMesh().patchSet(patchSelection).sortedToc()
);
// Handle column-wise writing of patch data. Supports most easy types
@ -474,7 +472,7 @@ bool Foam::functionObjects::externalCoupled::writeData
}
}
return nFound > 0;
return nFound;
}