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-pre-release

Browse Source
This commit is contained in:
Andrew Heather
2018-05-18 12:18:13 +01:00
parent 6180e0db8b 48d654cf19
commit ad25e18c7f
63 changed files with 745 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -813,28 +813,33 @@ int main(int argc, char *argv[])
// Read all fields in time and constant directories
IOobjectList objects(mesh, runTime.timeName());
IOobjectList timeObjects(IOobjectList(mesh, mesh.facesInstance()));
forAllConstIter(IOobjectList, timeObjects, iter)
{
if
(
iter()->headerClassName() == volScalarField::typeName
|| iter()->headerClassName() == volVectorField::typeName
|| iter()->headerClassName() == volSphericalTensorField::typeName
|| iter()->headerClassName() == volTensorField::typeName
|| iter()->headerClassName() == volSymmTensorField::typeName
|| iter()->headerClassName() == surfaceScalarField::typeName
|| iter()->headerClassName() == surfaceVectorField::typeName
|| iter()->headerClassName()
== surfaceSphericalTensorField::typeName
|| iter()->headerClassName() == surfaceSymmTensorField::typeName
|| iter()->headerClassName() == surfaceTensorField::typeName
)
IOobjectList timeObjects(mesh, mesh.facesInstance());
// Transfer specific types
forAllIters(timeObjects, iter)
{
objects.add(*iter());
autoPtr<IOobject> objPtr(timeObjects.remove(iter));
const auto& obj = *objPtr;
if
(
obj.headerClassName() == volScalarField::typeName
|| obj.headerClassName() == volVectorField::typeName
|| obj.headerClassName() == volSphericalTensorField::typeName
|| obj.headerClassName() == volTensorField::typeName
|| obj.headerClassName() == volSymmTensorField::typeName
|| obj.headerClassName() == surfaceScalarField::typeName
|| obj.headerClassName() == surfaceVectorField::typeName
|| obj.headerClassName() == surfaceSphericalTensorField::typeName
|| obj.headerClassName() == surfaceSymmTensorField::typeName
|| obj.headerClassName() == surfaceTensorField::typeName
)
{
objects.add(objPtr);
}
}
}
// Read vol fields and subset.
wordList scalarNames(objects.names(volScalarField::typeName));