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 remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Mark Olesen
2019-01-23 21:22:10 +01:00
parent 5878b6edc5 34ca554f15
commit 812fa22dff
48 changed files with 1576 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
applications/utilities/postProcessing/postProcess/postProcess.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2018-2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -164,17 +164,22 @@ int main(int argc, char *argv[])
functionObjects::fileFieldSelection fields(mesh);
if (args.found("fields"))
{
fields.insert(args.getList<wordRe>("fields"));
fields.resetFieldFilters
(
HashSet<wordRe>(args.getList<wordRe>("fields"))
);
}
if (args.found("field"))
{
fields.insert(args.opt<wordRe>("field"));
fields.resetFieldFilters(args.opt<wordRe>("field"));
}
// Externally stored dictionary for functionObjectList
// if not constructed from runTime
dictionary functionsDict;
HashSet<wordRe> fieldFilters(fields.filters());
// Construct functionObjectList
autoPtr<functionObjectList> functionsPtr
(
@ -183,7 +188,7 @@ int main(int argc, char *argv[])
args,
runTime,
functionsDict,
fields
fieldFilters // include any additional command-line fields
)
);
@ -193,8 +198,6 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << endl;
fields.updateSelection();
if (mesh.readUpdate() != polyMesh::UNCHANGED)
{
// Update functionObjectList if mesh changes
@ -205,10 +208,14 @@ int main(int argc, char *argv[])
args,
runTime,
functionsDict,
fields
fieldFilters
);
}
fields.resetFieldFilters(fieldFilters);
fields.updateSelection();
const bool throwingIOErr = FatalIOError.throwExceptions();
try
@ -218,7 +225,7 @@ int main(int argc, char *argv[])
args,
runTime,
mesh,
fields.selection(),
fields.selectionNames(),
functionsPtr(),
timei == timeDirs.size()-1
);