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

GIT: Resolve conflict with upstream merge from Foundation

Browse Source
This commit is contained in:
Andrew Heather
2015-12-07 17:07:20 +00:00
parent e35afa35bf 736621b945
commit 3f55f752fc
2154 changed files with 44622 additions and 24766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
View File

@ -147,7 +147,7 @@ int main(int argc, char *argv[])
{
if (noLagrangian)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot specify noLagrangian and lagrangianFields "
<< "options together."
<< exit(FatalError);
@ -170,7 +170,7 @@ int main(int argc, char *argv[])
if (!nProcs)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No processor* directories found"
<< exit(FatalError);
}
@ -209,7 +209,7 @@ int main(int argc, char *argv[])
if (timeDirs.empty())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No times selected"
<< exit(FatalError);
}
@ -349,7 +349,7 @@ int main(int argc, char *argv[])
}
else if (meshStat != procStat)
{
WarningIn(args.executable())
WarningInFunction
<< "readUpdate for the reconstructed mesh:"
<< meshStat << nl
<< "readUpdate for the processor meshes :"
@ -794,6 +794,7 @@ int main(int argc, char *argv[])
);
}
cellSet& cSet = cellSets[setI];
cSet.instance() = runTime.timeName();
forAllConstIter(cellSet, procSet, iter)
{
@ -820,6 +821,7 @@ int main(int argc, char *argv[])
);
}
faceSet& fSet = faceSets[setI];
fSet.instance() = runTime.timeName();
forAllConstIter(faceSet, procSet, iter)
{
@ -845,6 +847,7 @@ int main(int argc, char *argv[])
);
}
pointSet& pSet = pointSets[setI];
pSet.instance() = runTime.timeName();
forAllConstIter(pointSet, propSet, iter)
{