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: make sourceInfo sub-dictionary optional for topoSet (#1060)

Browse Source 
- helps reduce clutter in the topoSetDict files.

  Caveats when using this.

  The older specification styles using "name" will conflict with the
  set name. Eg,

    {
        name    f0
        type    faceSet;
        action  add;
        source  patchToFace;
        sourceInfo
        {
            name   inlet;
        }
    }

    would flattened to the following
    {
        name    f0
        type    faceSet;
        action  add;
        source  patchToFace;
        name   inlet;
    }
    which overwrites the "name" used for the faceSet.

    The solution is to use the updated syntax:

    {
        name    f0
        type    faceSet;
        action  add;
        source  patchToFace;
        patch   inlet;
    }
This commit is contained in:
Mark Olesen
2018-11-07 10:33:36 +01:00
parent 6090faedef
commit 5f556ffb4a
120 changed files with 612 additions and 1851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View File

@ -251,8 +251,8 @@ int main(int argc, char *argv[])
|| action == topoSetSource::CLEAR
)
{
currentSet = topoSet::New(setType, mesh, setName, 10000);
Info<< "Created " << currentSet().type() << " "
currentSet = topoSet::New(setType, mesh, setName, 16384);
Info<< "Created " << currentSet().type() << ' '
<< setName << endl;
}
else if (action == topoSetSource::REMOVE)
@ -268,7 +268,7 @@ int main(int argc, char *argv[])
setName,
IOobject::MUST_READ
);
Info<< "Read set " << currentSet().type() << " "
Info<< "Read set " << currentSet().type() << ' '
<< setName << " with size "
<< returnReduce(currentSet().size(), sumOp<label>())
<< endl;
@ -283,14 +283,14 @@ int main(int argc, char *argv[])
case topoSetSource::ADD:
case topoSetSource::SUBTRACT:
{
const word sourceName(dict.get<word>("source"));
const word sourceType(dict.get<word>("source"));
Info<< " Applying source " << sourceName << endl;
Info<< " Applying source " << sourceType << endl;
autoPtr<topoSetSource> source = topoSetSource::New
(
sourceName,
sourceType,
mesh,
dict.subDict("sourceInfo")
dict.optionalSubDict("sourceInfo")
);
source().applyToSet(action, currentSet());
@ -308,14 +308,14 @@ int main(int argc, char *argv[])
case topoSetSource::SUBSET:
{
const word sourceName(dict.get<word>("source"));
const word sourceType(dict.get<word>("source"));
Info<< " Applying source " << sourceName << endl;
Info<< " Applying source " << sourceType << endl;
autoPtr<topoSetSource> source = topoSetSource::New
(
sourceName,
sourceType,
mesh,
dict.subDict("sourceInfo")
dict.optionalSubDict("sourceInfo")
);
// Backup current set.
@ -385,7 +385,7 @@ int main(int argc, char *argv[])
if (currentSet.valid())
{
Info<< " "
<< currentSet().type() << " "
<< currentSet().type() << ' '
<< currentSet().name() << " now size "
<< returnReduce(currentSet().size(), sumOp<label>())
<< endl;