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

Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus into feature-shared-file

Browse Source 
Conflicts:
	applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
	applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
	applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
	applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
	applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
	applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
	applications/utilities/postProcessing/velocityField/Co/Co.C
	applications/utilities/postProcessing/velocityField/Pe/Pe.C
	applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
	applications/utilities/preProcessing/changeDictionary/changeDictionary.C
	applications/utilities/preProcessing/setFields/setFields.C
	applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
	applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
	applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
	applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
	src/OpenFOAM/db/IOobject/IOobject.C
	src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
	src/OpenFOAM/db/IOobjects/IOField/IOField.C
	src/OpenFOAM/db/IOobjects/IOList/IOList.C
	src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
	src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
	src/OpenFOAM/db/Time/findInstance.C
	src/OpenFOAM/db/regIOobject/regIOobject.C
	src/OpenFOAM/db/regIOobject/regIOobjectI.H
	src/OpenFOAM/db/regIOobject/regIOobjectRead.C
	src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
	src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
	src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
	src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
	src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
	src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
	src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
	src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
	src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
	src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
	src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
	src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
	src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
	src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
	src/lagrangian/basic/Cloud/CloudIO.C
	src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
	src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
	src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
	src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
	src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
	src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
This commit is contained in:
mattijs
2016-01-25 16:29:04 +00:00
parent e424059208 14aee79198
commit 9e3ce4ec7f
6907 changed files with 140540 additions and 44093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

39
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -25,16 +25,15 @@ Application
surfaceBooleanFeatures
Description
Generates the extendedFeatureEdgeMesh for the interface between a boolean
operation on two surfaces. Assumes that the orientation of the surfaces is
correct:
operation on two surfaces.
+ if the operation is union or intersection, that both surface's normals
Assumes that the orientation of the surfaces iscorrect:
- if the operation is union or intersection, that both surface's normals
(n) have the same orientation with respect to a point, i.e. surfaces and b
are orientated the same with respect to point x:
@verbatim
\verbatim
_______
| |--> n
| ___|___ x
@ -43,14 +42,14 @@ Description
| |
|_______|
@endverbatim
\endverbatim
+ if the operation is a subtraction, the surfaces should be oppositely
- if the operation is a subtraction, the surfaces should be oppositely
oriented with respect to a point, i.e. for (a - b), then b's orientation
should be such that x is "inside", and a's orientation such that x is
"outside"
@verbatim
\verbatim
_______
| |--> n
| ___|___ x
@ -59,7 +58,7 @@ Description
| n <--|
|_______|
@endverbatim
\endverbatim
When the operation is peformed - for union, all of the edges generates where
one surfaces cuts another are all "internal" for union, and "external" for
@ -406,8 +405,9 @@ void visitPointRegion
}
else
{
FatalErrorIn("visitPointRegion(..)")
FatalErrorInFunction
<< "problem" << exit(FatalError);
nextFaceI = -1;
}
@ -440,7 +440,7 @@ void visitPointRegion
if (nextEdgeI == -1)
{
FatalErrorIn("visitPointRegion()")
FatalErrorInFunction
<< "Problem: cannot find edge out of " << fEdges
<< "on face " << nextFaceI << " that uses point " << pointI
<< " and is not edge " << startEdgeI << abort(FatalError);
@ -576,7 +576,7 @@ label dupNonManifoldPoints(triSurface& s, labelList& pointMap)
if (mag(dupPt-sPt) > SMALL)
{
FatalErrorIn("dupNonManifoldPoints(..)")
FatalErrorInFunction
<< "dupPt:" << dupPt
<< " sPt:" << sPt
<< exit(FatalError);
@ -803,7 +803,8 @@ labelList matchEdges
{
if (pointMap.size() != subSurf.nPoints())
{
FatalErrorIn("findEdges(..)") << "problem" << exit(FatalError);
FatalErrorInFunction
<< "problem" << exit(FatalError);
}
labelList edgeMap(subSurf.nEdges(), -1);
@ -835,7 +836,7 @@ labelList matchEdges
}
else if (edgeMap[subEdgeI] != edgeI)
{
WarningIn("findEdges(..)") << "sub edge "
FatalErrorInFunction
<< subE << " points:"
<< subE.line(subSurf.localPoints())
<< " matches to " << edgeI
@ -851,7 +852,7 @@ labelList matchEdges
if (edgeMap[subEdgeI] == -1)
{
FatalErrorIn("findEdges(..)") << "did not find edge matching "
FatalErrorInFunction
<< subE << " at:" << subSurf.localPoints()[subE[0]]
<< subSurf.localPoints()[subE[1]]
<< exit(FatalError);
@ -1449,7 +1450,7 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
}
else
{
FatalErrorIn("createEdgeMesh(..)")
FatalErrorInFunction
<< "Unsupported booleanSurface:booleanOpType and space "
<< action << " " << invertedSpace
<< abort(FatalError);
@ -1563,7 +1564,7 @@ int main(int argc, char *argv[])
if (!validActions.found(action))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Unsupported action " << action << endl
<< "Supported actions:" << validActions.toc() << abort(FatalError);
}
@ -1620,7 +1621,7 @@ int main(int argc, char *argv[])
if (invertedSpace && validActions[action] == booleanSurface::DIFFERENCE)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Inverted space only makes sense for union or intersection."
<< exit(FatalError);
}

21
applications/utilities/surface/surfaceCheck/surfaceCheck.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -57,7 +57,7 @@ bool validTri
{
if (f[fp] < 0 || f[fp] >= surf.points().size())
{
WarningIn("validTri(const triSurface&, const label)")
WarningInFunction
<< "triangle " << faceI << " vertices " << f
<< " uses point indices outside point range 0.."
<< surf.points().size()-1 << endl;
@ -67,7 +67,7 @@ bool validTri
if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
{
WarningIn("validTri(const triSurface&, const label)")
WarningInFunction
<< "triangle " << faceI
<< " uses non-unique vertices " << f
<< " coords:" << f.points(surf.points())
@ -100,7 +100,7 @@ bool validTri
&& ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
)
{
WarningIn("validTri(const triSurface&, const label)")
WarningInFunction
<< "triangle " << faceI << " vertices " << f
<< " has the same vertices as triangle " << nbrFaceI
<< " vertices " << nbrF
@ -146,11 +146,8 @@ labelList countBins
if ((index < 0) || (index >= nBins))
{
WarningIn
(
"countBins(const scalar, const scalar, const label"
", const scalarField&)"
) << "value " << val << " at index " << i
WarningInFunction
<< "value " << val << " at index " << i
<< " outside range " << min << " .. " << max << endl;
if (index < 0)
@ -366,7 +363,7 @@ int main(int argc, char *argv[])
if (region < 0 || region >= regionSize.size())
{
WarningIn(args.executable())
WarningInFunction
<< "Triangle " << faceI << " vertices " << surf[faceI]
<< " has region " << region << " which is outside the range"
<< " of regions 0.." << surf.patches().size()-1
@ -433,7 +430,7 @@ int main(int argc, char *argv[])
if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
{
//WarningIn(args.executable())
//WarningInFunction
// << "Illegal triangle " << faceI << " vertices " << f
// << " coords " << f.points(surf.points()) << endl;
}
@ -480,7 +477,7 @@ int main(int argc, char *argv[])
if (triQ[minIndex] < SMALL)
{
WarningIn(args.executable()) << "Minimum triangle quality is "
WarningInFunction
<< triQ[minIndex] << ". This might give problems in"
<< " self-intersection testing later on." << endl;
}

24
applications/utilities/surface/surfaceClean/collapseBase.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -175,7 +175,7 @@ static void splitTri
}
else
{
FatalErrorIn("splitTri(..)")
FatalErrorInFunction
<< "Edge " << e << " not part of triangle " << f
<< " fp:" << fp
<< " fp1:" << fp1
@ -206,14 +206,14 @@ static bool insertSorted
{
if (findIndex(sortedVerts, vertI) != -1)
{
FatalErrorIn("insertSorted(..)") << "Trying to insert vertex " << vertI
FatalErrorInFunction
<< " which is already in list of sorted vertices "
<< sortedVerts << abort(FatalError);
}
if (weight <= 0 || weight >= 1)
{
FatalErrorIn("insertSorted(..)") << "Trying to insert vertex " << vertI
FatalErrorInFunction
<< " with illegal weight " << weight
<< " into list of sorted vertices "
<< sortedVerts << abort(FatalError);
@ -228,7 +228,7 @@ static bool insertSorted
if (mag(w - weight) < SMALL)
{
WarningIn("insertSorted(..)")
WarningInFunction
<< "Trying to insert weight " << weight << " which is close to"
<< " existing weight " << w << " in " << sortedWeights
<< endl;
@ -359,7 +359,7 @@ static void markCollapsedFaces
// Mark face as being collapsed
if (faceToEdge[faceI] != -1)
{
FatalErrorIn("markCollapsedFaces(..)")
FatalErrorInFunction
<< "Cannot collapse face " << faceI << " since "
<< " is marked to be collapsed both to edge "
<< faceToEdge[faceI] << " and " << edgeI
@ -386,7 +386,7 @@ static void markRegion
{
if (faceToEdge[faceI] == -1 || collapseRegion[faceI] != -1)
{
FatalErrorIn("markRegion(..)")
FatalErrorInFunction
<< "Problem : crossed into uncollapsed/regionized face"
<< abort(FatalError);
}
@ -422,7 +422,7 @@ static void markRegion
}
else if (collapseRegion[nbrFaceI] != regionI)
{
FatalErrorIn("markRegion(..)")
FatalErrorInFunction
<< "Edge:" << edgeI << " between face " << faceI
<< " with region " << regionI
<< " and face " << nbrFaceI
@ -494,7 +494,7 @@ static label edgeType
}
else if (usesRegion != region)
{
FatalErrorIn("edgeRegion") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
}
else
{
@ -519,7 +519,7 @@ static label edgeType
{
if (usesRegion == -1)
{
FatalErrorIn("edgeRegion") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
return -2;
}
else
@ -640,7 +640,7 @@ static void projectNonSpanPoints
if (!pHit.hit())
{
FatalErrorIn("projectNonSpanPoints")
FatalErrorInFunction
<< abort(FatalError);
}
@ -737,7 +737,7 @@ static void getSplitVerts
if (i0 == -1 || i1 == -1)
{
FatalErrorIn("getSplitVerts")
FatalErrorInFunction
<< "Did not find edge in projected vertices." << nl
<< "region:" << regionI << nl
<< "spanPoints:" << spanPoints

3
applications/utilities/surface/surfaceClean/surfaceClean.C
View File

@ -25,6 +25,9 @@ Application
surfaceClean
Description
Utility to clean surfaces.
Current functionality
- removes baffles
- collapses small edges, removing triangles.
- converts sliver triangles into split edges by projecting point onto

9
applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.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
@ -25,12 +25,15 @@ Application
surfaceCoarsen
Description
Surface coarsening using 'bunnylod':
Surface coarsening using `bunnylod'
Reference:
\verbatim
Polygon Reduction Demo
By Stan Melax (c) 1998
mailto:melax@cs.ualberta.ca
http://www.cs.ualberta.ca/~melax
\endverbatim
\*---------------------------------------------------------------------------*/
@ -77,7 +80,7 @@ int main(int argc, char *argv[])
if (reduction <= 0 || reduction > 1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Reduction factor " << reduction
<< " should be within 0..1" << endl
<< "(it is the reduction in number of vertices)"

4
applications/utilities/surface/surfaceConvert/surfaceConvert.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
@ -107,7 +107,7 @@ int main(int argc, char *argv[])
if (importName == exportName)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}

8
applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.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
@ -61,15 +61,15 @@ int main(int argc, char *argv[])
const fileName importName = args[1];
const fileName exportName = args[2];
// disable inplace editing
// Disable inplace editing
if (importName == exportName)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
// check that reading/writing is supported
// Check that reading/writing is supported
if
(
!edgeMesh::canReadType(importName.ext(), true)

16
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -73,7 +73,7 @@ scalar calcVertexNormalWeight
if (index == -1)
{
FatalErrorIn("calcVertexNormals()")
FatalErrorInFunction
<< "Point not in face" << abort(FatalError);
}
@ -853,7 +853,7 @@ surfaceFeatures::edgeStatus checkFlatRegionEdge
}
else if (dir == 0)
{
FatalErrorIn("problem.")
FatalErrorInFunction
<< exit(FatalError);
}
else
@ -1083,7 +1083,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No initial feature set. Provide either one"
<< " of extractFromFile (to read existing set)" << nl
<< " or extractFromSurface (to construct new set from angle)"
@ -1454,7 +1454,7 @@ int main(int argc, char *argv[])
{
drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
// FatalErrorIn(args.executable())
// FatalErrorInFunction
// << "findLineAll did not hit its own face."
// << exit(FatalError);
}
@ -1462,7 +1462,7 @@ int main(int argc, char *argv[])
{
if (!hitInfo[0].hit())
{
// FatalErrorIn(args.executable())
// FatalErrorInFunction
// << "findLineAll did not hit any face."
// << exit(FatalError);
}
@ -1478,7 +1478,7 @@ int main(int argc, char *argv[])
hitInfo
);
// FatalErrorIn(args.executable())
// FatalErrorInFunction
// << "findLineAll did not hit its own face."
// << exit(FatalError);
}
@ -1511,7 +1511,7 @@ int main(int argc, char *argv[])
hitInfo
);
// FatalErrorIn(args.executable())
// FatalErrorInFunction
// << "findLineAll did not hit its own face."
// << exit(FatalError);
}

4
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
View File

@ -471,7 +471,7 @@ int main(int argc, char *argv[])
if (eFaces.size() != 1)
{
WarningIn(args.executable())
WarningInFunction
<< "Edge is attached to " << eFaces.size()
<< " faces." << endl;

4
applications/utilities/surface/surfaceHookUp/surfaceHookUpDict
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

15
applications/utilities/surface/surfaceInertia/surfaceInertia.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
@ -26,8 +26,9 @@ Application
Description
Calculates the inertia tensor, principal axes and moments of a
command line specified triSurface. Inertia can either be of the
solid body or of a thin shell.
command line specified triSurface.
Inertia can either be of the solid body or of a thin shell.
\*---------------------------------------------------------------------------*/
@ -103,7 +104,7 @@ int main(int argc, char *argv[])
if (m < 0)
{
WarningIn(args.executable() + "::main")
WarningInFunction
<< "Negative mass detected, the surface may be inside-out." << endl;
}
@ -117,7 +118,7 @@ int main(int argc, char *argv[])
while ((magSqr(eVal) < VSMALL) && pertI < 10)
{
WarningIn(args.executable() + "::main")
WarningInFunction
<< "No eigenValues found, shape may have symmetry, "
<< "perturbing inertia tensor diagonal" << endl;
@ -320,7 +321,7 @@ int main(int argc, char *argv[])
}
else
{
WarningIn(args.executable() + "::main")
WarningInFunction
<< "Non-unique eigenvectors, cannot compute transformation "
<< "from Cartesian axes" << endl;
@ -337,7 +338,7 @@ int main(int argc, char *argv[])
if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
{
WarningIn(args.executable())
WarningInFunction
<< "Illegal triangle " << faceI << " vertices " << f
<< " coords " << f.points(surf.points()) << endl;
}

9
applications/utilities/surface/surfaceInflate/surfaceInflate.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -71,7 +71,7 @@ scalar calcVertexNormalWeight
if (index == -1)
{
FatalErrorIn("calcVertexNormals()")
FatalErrorInFunction
<< "Point not in face" << abort(FatalError);
}
@ -199,7 +199,8 @@ tmp<vectorField> calcPointNormals
{
if (mag(mag(pointNormals[pointI])-1) > SMALL)
{
FatalErrorIn("calcPointNormals()") << "unitialised"
FatalErrorInFunction
<< "unitialised"
<< exit(FatalError);
}
}
@ -626,7 +627,7 @@ int main(int argc, char *argv[])
if (extendFactor < 1 || extendFactor > 10)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Illegal safety factor " << extendFactor
<< ". It is usually 1..2"
<< exit(FatalError);

8
applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.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
@ -109,7 +109,7 @@ void getFixedPoints
if (!matchedAll)
{
WarningIn("getFixedPoints(const edgeMesh&, const pointField&)")
WarningInFunction
<< "Did not match all feature points to points on the surface"
<< endl;
}
@ -150,14 +150,14 @@ int main(int argc, char *argv[])
if (lambda < 0 || lambda > 1)
{
FatalErrorIn(args.executable()) << "Illegal relaxation factor "
FatalErrorInFunction
<< lambda << endl
<< "0: no change 1: move vertices to average of neighbours"
<< exit(FatalError);
}
if (mu < 0 || mu > 1)
{
FatalErrorIn(args.executable()) << "Illegal relaxation factor "
FatalErrorInFunction
<< mu << endl
<< "0: no change 1: move vertices to average of neighbours"
<< exit(FatalError);

4
applications/utilities/surface/surfaceMeshConvert/coordinateSystems
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

14
applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.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
@ -124,7 +124,7 @@ int main(int argc, char *argv[])
// disable inplace editing
if (importName == exportName)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
@ -196,8 +196,7 @@ int main(int argc, char *argv[])
if (!csDictIoPtr->typeHeaderOk<coordinateSystems>(false))
{
FatalErrorIn(args.executable())
<< "Cannot open coordinateSystems file\n "
FatalErrorInFunction
<< csDictIoPtr->objectPath() << nl
<< exit(FatalError);
}
@ -211,7 +210,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -from " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -227,7 +226,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -to " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -240,8 +239,7 @@ int main(int argc, char *argv[])
// maybe fix this later
if (fromCsys.valid() && toCsys.valid())
{
FatalErrorIn(args.executable())
<< "Only allowed '-from' or '-to' option at the moment."
FatalErrorInFunction
<< exit(FatalError);
}
}

2
applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[])
if (importName == exportName)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}

12
applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.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
@ -176,8 +176,7 @@ int main(int argc, char *argv[])
if (!ioPtr->typeHeaderOk<coordinateSystems>(false))
{
FatalErrorIn(args.executable())
<< "Cannot open coordinateSystems file\n "
FatalErrorInFunction
<< ioPtr->objectPath() << nl
<< exit(FatalError);
}
@ -191,7 +190,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -from " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -207,7 +206,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -to " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -220,8 +219,7 @@ int main(int argc, char *argv[])
// maybe fix this later
if (fromCsys.valid() && toCsys.valid())
{
FatalErrorIn(args.executable())
<< "Only allowed '-from' or '-to' option at the moment."
FatalErrorInFunction
<< exit(FatalError);
}
}

12
applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.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
@ -189,8 +189,7 @@ int main(int argc, char *argv[])
if (!ioPtr->typeHeaderOk<coordinateSystems>(false))
{
FatalErrorIn(args.executable())
<< "Cannot open coordinateSystems file\n "
FatalErrorInFunction
<< ioPtr->objectPath() << nl
<< exit(FatalError);
}
@ -204,7 +203,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -from " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -220,7 +219,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -to " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -233,8 +232,7 @@ int main(int argc, char *argv[])
// maybe fix this later
if (fromCsys.valid() && toCsys.valid())
{
FatalErrorIn(args.executable())
<< "Only allowed '-from' or '-to' option at the moment."
FatalErrorInFunction
<< exit(FatalError);
}
}

4
applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.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
@ -162,7 +162,7 @@ int main(int argc, char *argv[])
if (zoneIDs.empty())
{
WarningIn(args.executable())
WarningInFunction
<< "Cannot find any faceZone name matching "
<< zoneName << endl;
}

2
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

4
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -75,7 +75,7 @@ public:
//- Clone
autoPtr<searchableSurfaceModifier> clone() const
{
notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
NotImplemented;
return autoPtr<searchableSurfaceModifier>(NULL);
}

12
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -118,14 +118,8 @@ Foam::triSurface& Foam::searchableSurfaceModifiers::cut::triangulate
}
else
{
FatalErrorIn
(
"searchableSurfaceModifiers::cut::triangulate\n"
"(\n"
" const searchableSurface&,\n"
" triSurface&\n"
")"
) << "Triangulation only supported for triSurfaceMesh, searchableBox"
FatalErrorInFunction
<< "Triangulation only supported for triSurfaceMesh, searchableBox"
<< ", not for surface " << cutter.name()
<< " of type " << cutter.type()
<< exit(FatalError);

4
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -99,7 +99,7 @@ public:
//- Clone
autoPtr<searchableSurfaceModifier> clone() const
{
notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
NotImplemented;
return autoPtr<searchableSurfaceModifier>(NULL);
}

9
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -69,11 +69,8 @@ Foam::searchableSurfaceModifier::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"searchableSurfaceModifier::New"
"(const word&, const searchableSurfaces&, const dictionary&)"
) << "Unknown searchableSurfaceModifier type "
FatalErrorInFunction
<< "Unknown searchableSurfaceModifier type "
<< type << nl << nl
<< "Valid searchableSurfaceModifier types : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()

4
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -95,7 +95,7 @@ public:
//- Clone
autoPtr<searchableSurfaceModifier> clone() const
{
notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
NotImplemented;
return autoPtr<searchableSurfaceModifier>(NULL);
}

4
applications/utilities/surface/surfacePatch/surfacePatchDict
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

121
applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
View File

@ -2,8 +2,8 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -75,13 +75,16 @@ void writeProcStats
forAll(surfBb, procI)
{
const List<treeBoundBox>& bbs = meshBb[procI];
Info<< "processor" << procI << nl;
Info<< "processor" << procI << nl
<< "\tMesh bounds : " << bbs[0] << nl;
for (label i = 1; i < bbs.size(); i++)
const List<treeBoundBox>& bbs = meshBb[procI];
if (bbs.size())
{
Info<< "\t " << bbs[i]<< nl;
Info<< "\tMesh bounds : " << bbs[0] << nl;
for (label i = 1; i < bbs.size(); i++)
{
Info<< "\t " << bbs[i]<< nl;
}
}
Info<< "\tSurface bounding box : " << surfBb[procI] << nl
<< "\tTriangles : " << nFaces[procI] << nl
@ -113,12 +116,13 @@ int main(int argc, char *argv[])
runTime.functionObjects().off();
const fileName surfFileName = args[1];
const word distType = args[2];
const word distTypeName = args[2];
const label distType =
distributedTriSurfaceMesh::distributionTypeNames_[distTypeName];
Info<< "Reading surface from " << surfFileName << nl << nl
<< "Using distribution method "
<< distributedTriSurfaceMesh::distributionTypeNames_[distType]
<< " " << distType << nl << endl;
<< distTypeName << nl << endl;
const bool keepNonMapped = args.options().found("keepNonMapped");
@ -134,7 +138,7 @@ int main(int argc, char *argv[])
if (!Pstream::parRun())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Please run this program on the decomposed case."
<< " It will read surface " << surfFileName
<< " and decompose it such that it overlaps the mesh bounding box."
@ -142,13 +146,14 @@ int main(int argc, char *argv[])
}
#include "createPolyMesh.H"
Random rndGen(653213);
// Determine mesh bounding boxes:
List<List<treeBoundBox> > meshBb(Pstream::nProcs());
if (distType == distributedTriSurfaceMesh::FOLLOW)
{
#include "createPolyMesh.H"
meshBb[Pstream::myProcNo()] = List<treeBoundBox>
(
1,
@ -177,82 +182,48 @@ int main(int argc, char *argv[])
fileName localPath(actualPath);
localPath.replace(runTime.rootPath() + '/', "");
autoPtr<distributedTriSurfaceMesh> surfMeshPtr;
if (actualPath == io.objectPath())
{
Info<< "Loading local (decomposed) surface " << localPath << nl <<endl;
surfMeshPtr.reset(new distributedTriSurfaceMesh(io));
}
else
{
Info<< "Loading undecomposed surface " << localPath << nl << endl;
}
Info<< "Loading undecomposed surface " << localPath
<< " on master only" << endl;
triSurface s;
List<treeBoundBox> bbs;
if (Pstream::master())
{
// Actually load the surface
triSurfaceMesh surf(io);
s = surf;
bbs = List<treeBoundBox>(1, treeBoundBox(boundBox::greatBox));
}
else
{
bbs = List<treeBoundBox>(1, treeBoundBox(boundBox::invertedBox));
}
// Create dummy dictionary for bounding boxes if does not exist.
if (!isFile(actualPath / "Dict"))
{
dictionary dict;
dict.add("bounds", meshBb[Pstream::myProcNo()]);
dict.add("distributionType", distType);
dict.add("distributionType", distTypeName);
dict.add("mergeDistance", SMALL);
dict.add("bounds", bbs);
localIOdictionary ioDict
(
IOobject
(
io.name() + "Dict",
io.instance(),
io.local(),
io.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
dict
);
// Scatter patch information
Pstream::scatter(s.patches());
Info<< "Writing dummy bounds dictionary to " << ioDict.name()
<< nl << endl;
// Force writing in ascii
ioDict.regIOobject::writeObject
(
IOstream::ASCII,
IOstream::currentVersion,
ioDict.time().writeCompression()
);
// Construct distributedTrisurfaceMesh from components
IOobject notReadIO(io);
notReadIO.readOpt() = IOobject::NO_READ;
surfMeshPtr.reset(new distributedTriSurfaceMesh(notReadIO, s, dict));
}
// Load surface
distributedTriSurfaceMesh surfMesh(io);
Info<< "Loaded surface" << nl << endl;
// Generate a test field
{
const triSurface& s = static_cast<const triSurface&>(surfMesh);
autoPtr<triSurfaceVectorField> fcPtr
(
new triSurfaceVectorField
(
IOobject
(
"faceCentres", // name
surfMesh.searchableSurface::time().timeName(), // instance
surfMesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
surfMesh,
dimLength,
s.faceCentres()
)
);
// Steal pointer and store object on surfMesh
fcPtr.ptr()->store();
}
distributedTriSurfaceMesh& surfMesh = surfMeshPtr();
// Write per-processor stats

8
applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
View File

@ -26,10 +26,16 @@ Application
Description
Refine by splitting all three edges of triangle ('red' refinement).
Neighbouring triangles (which are not marked for refinement get split
in half ('green' refinement). (R. Verfuerth, "A review of a posteriori
in half ('green' refinement).
Reference:
\verbatim
R. Verfuerth, "A review of a posteriori
error estimation and adaptive mesh refinement techniques",
Wiley-Teubner, 1996)
\endverbatim
\*---------------------------------------------------------------------------*/

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,10 +22,10 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
Strips any baffle parts of a surface.
Strips any baffle parts of a surface. A baffle region is one which is
reached by walking from an open edge, and stopping when a multiply connected
edge is reached.
A baffle region is one which is reached by walking from an open edge, and
stopping when a multiply connected edge is reached.
\*---------------------------------------------------------------------------*/
@ -151,7 +151,7 @@ int main(int argc, char *argv[])
if (iterationNo == iterationLimit)
{
WarningIn("surfaceSplitByTopology")
WarningInFunction
<< "Iteration limit of " << iterationLimit << "reached" << endl;
}

20
applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.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
@ -26,7 +26,9 @@ Application
Description
Takes multiply connected surface and tries to split surface at
multiply connected edges by duplicating points. Introduces concept of
multiply connected edges by duplicating points.
Introduces concept of
- borderEdge. Edge with 4 faces connected to it.
- borderPoint. Point connected to exactly 2 borderEdges.
- borderLine. Connected list of borderEdges.
@ -152,14 +154,14 @@ void testSortedEdgeFaces(const triSurface& surf)
{
if (findIndex(sortMyFaces, myFaces[i]) == -1)
{
FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
}
}
forAll(sortMyFaces, i)
{
if (findIndex(myFaces, sortMyFaces[i]) == -1)
{
FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
}
}
}
@ -299,7 +301,7 @@ label findEdge
}
FatalErrorIn("findEdge(..)") << "Cannot find edge with labels " << v0
FatalErrorInFunction
<< ' ' << v1 << " in candidates " << edgeLabels
<< " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)()
<< abort(FatalError);
@ -338,7 +340,7 @@ label otherEdge
}
}
FatalErrorIn("otherEdge(..)") << "Cannot find other edge on face " << faceI
FatalErrorInFunction
<< " verts:" << surf.localPoints()[faceI]
<< " connected to point " << pointI
<< " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
@ -404,7 +406,7 @@ void walkSplitLine
if (eFaces.size() != 2)
{
FatalErrorIn("walkSplitPoint(..)")
FatalErrorInFunction
<< "Can only handle edges with 2 or 4 edges for now."
<< abort(FatalError);
}
@ -419,7 +421,7 @@ void walkSplitLine
}
else
{
FatalErrorIn("walkSplitPoint(..)") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
}
}
while (true);
@ -539,7 +541,7 @@ void calcPointVecs
surf.write("errorSurf.obj");
FatalErrorIn("calcPointVecs(..)")
FatalErrorInFunction
<< "Cannot find two faces using border edge " << edgeI
<< " verts:" << edges[edgeI]
<< " eFaces:" << eFaces << endl

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."

4
applications/utilities/surface/surfaceSubset/surfaceSubsetDict
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.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
@ -106,7 +106,7 @@ int main(int argc, char *argv[])
if (args.options().empty())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No options supplied, please use one or more of "
"-translate, -rotate or -scale options."
<< exit(FatalError);