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

29
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
View File

@ -859,22 +859,16 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
if (!decomposer_().parallelAware())
{
FatalErrorIn
(
"distributedTriSurfaceMesh::independentlyDistributedBbs"
"(const triSurface&)"
) << "The decomposition method " << decomposer_().typeName
FatalErrorInFunction
<< "The decomposition method " << decomposer_().typeName
<< " does not decompose in parallel."
<< " Please choose one that does." << exit(FatalError);
}
if (!isA<geomDecomp>(decomposer_()))
{
FatalErrorIn
(
"distributedTriSurfaceMesh::independentlyDistributedBbs"
"(const triSurface&)"
) << "The decomposition method " << decomposer_().typeName
FatalErrorInFunction
<< "The decomposition method " << decomposer_().typeName
<< " is not a geometric decomposition method." << endl
<< "Only geometric decomposition methods are currently"
<< " supported."
@ -1407,8 +1401,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
)
)
{
FatalErrorIn("Foam::distributedTriSurfaceMesh::read()")
<< " distributedTriSurfaceMesh is being constructed\n"
FatalErrorInFunction
<< " using 'timeStampMaster' or 'inotifyMaster.'\n"
<< " Modify the entry fileModificationChecking\n"
<< " in the etc/controlDict.\n"
@ -1491,8 +1484,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
)
)
{
FatalErrorIn("Foam::distributedTriSurfaceMesh::read()")
<< " distributedTriSurfaceMesh is being constructed\n"
FatalErrorInFunction
<< " using 'timeStampMaster' or 'inotifyMaster.'\n"
<< " Modify the entry fileModificationChecking\n"
<< " in the etc/controlDict.\n"
@ -2030,11 +2022,8 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
List<volumeType>& volType
) const
{
FatalErrorIn
(
"distributedTriSurfaceMesh::getVolumeType"
"(const pointField&, List<volumeType>&) const"
) << "Volume type not supported for distributed surfaces."
FatalErrorInFunction
<< "Volume type not supported for distributed surfaces."
<< exit(FatalError);
}
@ -2116,7 +2105,7 @@ void Foam::distributedTriSurfaceMesh::distribute
break;
default:
FatalErrorIn("distributedTriSurfaceMesh::distribute(..)")
FatalErrorInFunction
<< "Unsupported distribution type." << exit(FatalError);
break;
}