reconstructPar: Added '-noFields' option

This commit is contained in:
Henry Weller
2016-05-17 09:25:29 +01:00
parent cfb6d6c84e
commit d6ce71f39a

View File

@ -91,6 +91,11 @@ int main(int argc, char *argv[])
"specify a list of fields to be reconstructed. Eg, '(U T p)' - " "specify a list of fields to be reconstructed. Eg, '(U T p)' - "
"regular expressions not currently supported" "regular expressions not currently supported"
); );
argList::addBoolOption
(
"noFields",
"skip reconstructing fields"
);
argList::addOption argList::addOption
( (
"lagrangianFields", "lagrangianFields",
@ -124,6 +129,14 @@ int main(int argc, char *argv[])
args.optionLookup("fields")() >> selectedFields; args.optionLookup("fields")() >> selectedFields;
} }
const bool noFields = args.optionFound("noFields");
if (noFields)
{
Info<< "Skipping reconstructing fields"
<< nl << endl;
}
const bool noLagrangian = args.optionFound("noLagrangian"); const bool noLagrangian = args.optionFound("noLagrangian");
if (noLagrangian) if (noLagrangian)
@ -368,6 +381,7 @@ int main(int argc, char *argv[])
databases[0].timeName() databases[0].timeName()
); );
if (!noFields)
{ {
// If there are any FV fields, reconstruct them // If there are any FV fields, reconstruct them
Info<< "Reconstructing FV fields" << nl << endl; Info<< "Reconstructing FV fields" << nl << endl;
@ -466,6 +480,7 @@ int main(int argc, char *argv[])
} }
} }
if (!noFields)
{ {
Info<< "Reconstructing point fields" << nl << endl; Info<< "Reconstructing point fields" << nl << endl;
@ -744,6 +759,8 @@ int main(int argc, char *argv[])
} }
} }
if (cSetNames.size() || fSetNames.size() || pSetNames.size())
{
// Construct all sets // Construct all sets
PtrList<cellSet> cellSets(cSetNames.size()); PtrList<cellSet> cellSets(cSetNames.size());
PtrList<faceSet> faceSets(fSetNames.size()); PtrList<faceSet> faceSets(fSetNames.size());
@ -752,15 +769,18 @@ int main(int argc, char *argv[])
Info<< "Reconstructing sets:" << endl; Info<< "Reconstructing sets:" << endl;
if (cSetNames.size()) if (cSetNames.size())
{ {
Info<< " cellSets " << cSetNames.sortedToc() << endl; Info<< " cellSets "
<< cSetNames.sortedToc() << endl;
} }
if (fSetNames.size()) if (fSetNames.size())
{ {
Info<< " faceSets " << fSetNames.sortedToc() << endl; Info<< " faceSets "
<< fSetNames.sortedToc() << endl;
} }
if (pSetNames.size()) if (pSetNames.size())
{ {
Info<< " pointSets " << pSetNames.sortedToc() << endl; Info<< " pointSets "
<< pSetNames.sortedToc() << endl;
} }
// Load sets // Load sets
@ -771,7 +791,7 @@ int main(int argc, char *argv[])
IOobjectList objects IOobjectList objects
( (
procMesh, procMesh,
databases[0].timeName(), //procMesh.facesInstance(), databases[0].timeName(),
polyMesh::meshSubDir/"sets" polyMesh::meshSubDir/"sets"
); );
@ -779,7 +799,11 @@ int main(int argc, char *argv[])
const labelList& cellMap = const labelList& cellMap =
procMeshes.cellProcAddressing()[proci]; procMeshes.cellProcAddressing()[proci];
IOobjectList cSets(objects.lookupClass(cellSet::typeName)); IOobjectList cSets
(
objects.lookupClass(cellSet::typeName)
);
forAllConstIter(IOobjectList, cSets, iter) forAllConstIter(IOobjectList, cSets, iter)
{ {
// Load cellSet // Load cellSet
@ -790,7 +814,12 @@ int main(int argc, char *argv[])
cellSets.set cellSets.set
( (
setI, setI,
new cellSet(mesh, iter.key(), procSet.size()) new cellSet
(
mesh,
iter.key(),
procSet.size()
)
); );
} }
cellSet& cSet = cellSets[setI]; cellSet& cSet = cellSets[setI];
@ -806,7 +835,11 @@ int main(int argc, char *argv[])
const labelList& faceMap = const labelList& faceMap =
procMeshes.faceProcAddressing()[proci]; procMeshes.faceProcAddressing()[proci];
IOobjectList fSets(objects.lookupClass(faceSet::typeName)); IOobjectList fSets
(
objects.lookupClass(faceSet::typeName)
);
forAllConstIter(IOobjectList, fSets, iter) forAllConstIter(IOobjectList, fSets, iter)
{ {
// Load faceSet // Load faceSet
@ -817,7 +850,12 @@ int main(int argc, char *argv[])
faceSets.set faceSets.set
( (
setI, setI,
new faceSet(mesh, iter.key(), procSet.size()) new faceSet
(
mesh,
iter.key(),
procSet.size()
)
); );
} }
faceSet& fSet = faceSets[setI]; faceSet& fSet = faceSets[setI];
@ -832,7 +870,10 @@ int main(int argc, char *argv[])
const labelList& pointMap = const labelList& pointMap =
procMeshes.pointProcAddressing()[proci]; procMeshes.pointProcAddressing()[proci];
IOobjectList pSets(objects.lookupClass(pointSet::typeName)); IOobjectList pSets
(
objects.lookupClass(pointSet::typeName)
);
forAllConstIter(IOobjectList, pSets, iter) forAllConstIter(IOobjectList, pSets, iter)
{ {
// Load pointSet // Load pointSet
@ -843,7 +884,12 @@ int main(int argc, char *argv[])
pointSets.set pointSets.set
( (
setI, setI,
new pointSet(mesh, iter.key(), propSet.size()) new pointSet
(
mesh,
iter.key(),
propSet.size()
)
); );
} }
pointSet& pSet = pointSets[setI]; pointSet& pSet = pointSets[setI];
@ -870,6 +916,7 @@ int main(int argc, char *argv[])
pointSets[i].write(); pointSets[i].write();
} }
} }
}
// Reconstruct refinement data // Reconstruct refinement data