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

8
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -268,7 +268,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
}
else
{
FatalErrorIn("fvMeshDistribute::mergeSharedPoints()")
FatalErrorInFunction
<< "Problem. oldPointI:" << oldPointI
<< " newPointI:" << newPointI << abort(FatalError);
}
@ -301,7 +301,7 @@ boundBox procBounds
if (pointsInstance != databases[procI].timeName())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Your time was specified as " << databases[procI].timeName()
<< " but there is no polyMesh/points in that time." << endl
<< "(there is a points file in " << pointsInstance
@ -497,7 +497,7 @@ int main(int argc, char *argv[])
if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << endl
<< "Your merging tolerance (" << mergeTol << ") is finer than this."
@ -726,7 +726,7 @@ int main(int argc, char *argv[])
if (!masterMesh.write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}