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

10
applications/utilities/surface/surfaceSubset/surfaceSubset.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -93,7 +93,7 @@ int main(int argc, char *argv[])
if (markedZone.size() && markedZone.size() != 2)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "zone specification should be two points, min and max of "
<< "the boundingbox" << endl
<< "zone:" << markedZone
@ -132,7 +132,7 @@ int main(int argc, char *argv[])
|| markedPoints[pointI] >= surf1.nPoints()
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "localPoint label " << markedPoints[pointI]
<< "out of range."
<< " The mesh has got "
@ -170,7 +170,7 @@ int main(int argc, char *argv[])
|| markedEdges[edgeI] >= surf1.nEdges()
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "edge label " << markedEdges[edgeI]
<< "out of range."
<< " The mesh has got "
@ -323,7 +323,7 @@ int main(int argc, char *argv[])
|| markedFaces[faceI] >= surf1.size()
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face label " << markedFaces[faceI] << "out of range."
<< " The mesh has got "
<< surf1.size() << " faces."