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: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 5c9dff6146
2311 changed files with 44971 additions and 26546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/mesh/advanced/PDRMesh/Make/options
View File

@ -10,4 +10,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lmeshTools \
-ldynamicMesh \
-lfiniteVolume
-lfiniteVolume \
-lfvOptions

14
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -531,7 +531,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
if (patchI == -1)
{
FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Illegal patch " << patchName
<< nl << "Valid patches are " << patches.names()
<< exit(FatalError);
@ -544,7 +544,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
if (newPatch != patchI)
{
FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Patch " << patchName
<< " should have the same patch index on all processors." << nl
<< "On my processor it has index " << patchI
@ -652,7 +652,7 @@ int main(int argc, char *argv[])
{
if (wantedPatch[iter.key()] != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << iter.key()
<< " is in faceSet " << setsAndPatches[setI][0]
<< " destined for patch " << setsAndPatches[setI][1]
@ -690,7 +690,7 @@ int main(int argc, char *argv[])
{
if (coupledWantedPatch[iter.key()] != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << iter.key()
<< " is in faceSet " << coupledAndPatches[setI][0]
<< " destined for patch " << coupledAndPatches[setI][1]
@ -1152,7 +1152,7 @@ int main(int argc, char *argv[])
if (cellRegion.nRegions() > 1)
{
WarningIn(args.executable())
WarningInFunction
<< "Removing blocked faces and cells created "
<< cellRegion.nRegions()
<< " regions that are not connected via a face." << nl
@ -1168,7 +1168,7 @@ int main(int argc, char *argv[])
if (startFrom != "latestTime")
{
WarningIn(args.executable())
WarningInFunction
<< "To run splitMeshRegions please set your"
<< " startFrom entry to latestTime" << endl;
}

6
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -365,7 +365,7 @@ bool limitRefinementLevel
{
if (refLevel[cellI] - refLevel[nbr] >= limitDiff)
{
FatalErrorIn("limitRefinementLevel")
FatalErrorInFunction
<< "Level difference between neighbouring cells "
<< cellI << " and " << nbr
<< " greater than or equal to " << limitDiff << endl
@ -705,7 +705,7 @@ int main(int argc, char *argv[])
if (nCutLayers > 0 && selectInside)
{
WarningIn(args.executable())
WarningInFunction
<< "Illogical settings : Both nCutLayers>0 and selectInside true."
<< endl
<< "This would mean that inside cells get removed but should be"
@ -728,7 +728,7 @@ int main(int argc, char *argv[])
if (queryMesh.findCell(outsidePoint, -1, false) == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "outsidePoint " << outsidePoint
<< " is not inside any cell"
<< exit(FatalError);

2
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
if (collapseFaces && collapseFaceSet)
{
FatalErrorIn("main(int, char*[])")
FatalErrorInFunction
<< "Both face zone collapsing and face collapsing have been"
<< "selected. Choose only one of:" << nl
<< " -collapseFaces" << nl

2
applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
View File

@ -177,7 +177,7 @@ label mergePatchFaces
if (newVertI < 0)
{
FatalErrorIn("mergePatchFaces")
FatalErrorInFunction
<< "In set:" << setI << " old face labels:"
<< allFaceSets[setI] << " new face vertices:"
<< setFaceVerts[i] << " are unmapped vertices!"

2
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View File

@ -399,7 +399,7 @@ int main(int argc, char *argv[])
|| (collapseEdge && cellsToSplit)
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Used more than one mesh modifying module "
<< "(boundary cutting, cell splitting, edge collapsing)" << nl
<< "Please do them in separate passes." << exit(FatalError);

2
applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
View File

@ -86,7 +86,7 @@ int main(int argc, char *argv[])
if (!patchSet.size())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find any patches in set " << patches << endl
<< "Valid patches are " << mesh.boundaryMesh().names()
<< exit(FatalError);

4
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.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 |
-------------------------------------------------------------------------------
License
@ -240,7 +240,7 @@ int main(int argc, char *argv[])
if (!readLevel && refHeader.headerOk())
{
WarningIn(args.executable())
WarningInFunction
<< "Detected " << refHeader.name() << " file in "
<< polyMesh::defaultRegion << " directory. Please remove to"
<< " recreate it or use the -readLevel option to use it"

4
applications/utilities/mesh/advanced/selectCells/selectCells.C
View File

@ -174,7 +174,7 @@ void cutBySurface
}
else
{
FatalErrorIn("cutBySurface")
FatalErrorInFunction
<< "Multiple mesh regions in original mesh" << endl
<< "Please use splitMeshRegions to separate these"
<< exit(FatalError);
@ -393,7 +393,7 @@ int main(int argc, char *argv[])
label cellI = queryMesh.findCell(outsidePoint, -1, false);
if (returnReduce(cellI, maxOp<label>()) == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "outsidePoint " << outsidePoint
<< " is not inside any cell"
<< exit(FatalError);

4
applications/utilities/mesh/advanced/splitCells/splitCells.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 |
-------------------------------------------------------------------------------
License
@ -261,7 +261,7 @@ bool splitHex
if (leftI == -1 || rightI == -1)
{
FatalErrorIn("splitHex") << "Problem : leftI:" << leftI
FatalErrorInFunction
<< " rightI:" << rightI << abort(FatalError);
}