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

12
src/sampling/cuttingPlane/cuttingPlane.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
@ -203,7 +203,7 @@ bool Foam::cuttingPlane::walkCell
if (nextEdgeI == -1)
{
// Did not find another cut edge on faceI. Do what?
WarningIn("Foam::cuttingPlane::walkCell")
WarningInFunction
<< "Did not find closed walk along surface of cell " << cellI
<< " starting from edge " << startEdgeI
<< " in " << nIter << " iterations." << nl
@ -219,7 +219,7 @@ bool Foam::cuttingPlane::walkCell
if (nIter > 1000)
{
WarningIn("Foam::cuttingPlane::walkCell")
WarningInFunction
<< "Did not find closed walk along surface of cell " << cellI
<< " starting from edge " << startEdgeI
<< " in " << nIter << " iterations." << nl
@ -237,7 +237,7 @@ bool Foam::cuttingPlane::walkCell
}
else
{
WarningIn("Foam::cuttingPlane::walkCell")
WarningInFunction
<< "Did not find closed walk along surface of cell " << cellI
<< " starting from edge " << startEdgeI << nl
<< "Collected cutPoints so far:" << faceVerts
@ -287,7 +287,7 @@ void Foam::cuttingPlane::walkCellCuts
// Check for the unexpected ...
if (startEdgeI == -1)
{
FatalErrorIn("Foam::cuttingPlane::walkCellCuts(..)")
FatalErrorInFunction
<< "Cannot find cut edge for cut cell " << cellI
<< abort(FatalError);
}
@ -413,7 +413,7 @@ void Foam::cuttingPlane::operator=(const cuttingPlane& rhs)
// Check for assignment to self
if (this == &rhs)
{
FatalErrorIn ("Foam::cuttingPlane::operator=(const cuttingPlane&)")
FatalErrorInFunction
<< "Attempted assignment to self"
<< abort(FatalError);
}

12
src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
View File

@ -69,17 +69,7 @@ bool Foam::mapNearestMethod::findInitialSeeds
}
else
{
FatalErrorIn
(
"bool Foam::mapNearestMethod::findInitialSeeds"
"("
"const labelList&, "
"const boolList&, "
"const label, "
"label&, "
"label&"
") const"
)
FatalErrorInFunction
<< "Unable to find nearest target cell"
<< " for source cell " << srcI
<< " with centre " << srcCc

11
src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C
View File

@ -44,15 +44,8 @@ Foam::autoPtr<Foam::meshToMeshMethod> Foam::meshToMeshMethod::New
if (cstrIter == componentsConstructorTablePtr_->end())
{
FatalErrorIn
(
"Foam::autoPtr<Foam::meshToMeshMethod> Foam::meshToMeshMethod::New"
"("
"const word&, "
"const polyMesh&, "
"const polyMesh&"
")"
) << "Unknown meshToMesh type "
FatalErrorInFunction
<< "Unknown meshToMesh type "
<< methodName << nl << nl
<< "Valid meshToMesh types are:" << nl
<< componentsConstructorTablePtr_->sortedToc() << exit(FatalError);

23
src/sampling/meshToMesh/meshToMesh.C
View File

@ -640,14 +640,7 @@ Foam::meshToMesh::interpolationMethodAMI(const interpolationMethod method)
}
default:
{
FatalErrorIn
(
"Foam::AMIPatchToPatchInterpolation::interpolationMethod"
"Foam::meshToMesh::interpolationMethodAMI"
"("
"const interpolationMethod method"
") const"
)
FatalErrorInFunction
<< "Unhandled enumeration " << method
<< abort(FatalError);
}
@ -661,7 +654,7 @@ void Foam::meshToMesh::calculatePatchAMIs(const word& AMIMethodName)
{
if (!patchAMIs_.empty())
{
FatalErrorIn("meshToMesh::calculatePatchAMIs()")
FatalErrorInFunction
<< "patch AMI already calculated"
<< exit(FatalError);
}
@ -732,16 +725,8 @@ void Foam::meshToMesh::constructNoCuttingPatches
}
else
{
FatalErrorIn
(
"Foam::meshToMesh::meshToMesh"
"("
"const polyMesh&, "
"const polyMesh&, "
"const interpolationMethod&, "
"bool"
")"
) << "Source patch " << pp.name()
FatalErrorInFunction
<< "Source patch " << pp.name()
<< " not found in target mesh. "
<< "Available target patches are " << tgtBM.names()
<< exit(FatalError);

16
src/sampling/meshToMesh/meshToMeshParallelOps.C
View File

@ -794,21 +794,7 @@ void Foam::meshToMesh::distributeAndMergeCells
if (tgtFaceI == -1)
{
FatalErrorIn
(
"void Foam::meshToMesh::"
"distributeAndMergeCells"
"("
"const mapDistribute&, "
"const polyMesh&, "
"const globalIndex&, "
"pointField&, "
"faceList&, "
"labelList&, "
"labelList&, "
"labelList&"
") const"
)
FatalErrorInFunction
<< "Unvisited " << key
<< abort(FatalError);
}

22
src/sampling/meshToMesh/meshToMeshTemplates.C
View File

@ -88,15 +88,8 @@ void Foam::meshToMesh::mapSrcToTgt
{
if (result.size() != tgtToSrcCellAddr_.size())
{
FatalErrorIn
(
"void Foam::meshToMesh::mapSrcToTgt"
"("
"const UList<Type>&, "
"const CombineOp&, "
"List<Type>&"
") const"
) << "Supplied field size is not equal to target mesh size" << nl
FatalErrorInFunction
<< "Supplied field size is not equal to target mesh size" << nl
<< " source mesh = " << srcToTgtCellAddr_.size() << nl
<< " target mesh = " << tgtToSrcCellAddr_.size() << nl
<< " supplied field = " << result.size()
@ -316,15 +309,8 @@ void Foam::meshToMesh::mapTgtToSrc
{
if (result.size() != srcToTgtCellAddr_.size())
{
FatalErrorIn
(
"void Foam::meshToMesh::mapTgtToSrc"
"("
"const UList<Type>&, "
"const CombineOp&, "
"List<Type>&"
") const"
) << "Supplied field size is not equal to source mesh size" << nl
FatalErrorInFunction
<< "Supplied field size is not equal to source mesh size" << nl
<< " source mesh = " << srcToTgtCellAddr_.size() << nl
<< " target mesh = " << tgtToSrcCellAddr_.size() << nl
<< " supplied field = " << result.size()

2
src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
View File

@ -153,7 +153,7 @@ void Foam::meshToMesh0::calcAddressing()
if (fromPatch.empty())
{
WarningIn("meshToMesh0::calcAddressing()")
WarningInFunction
<< "Source patch " << fromPatch.name()
<< " has no faces. Not performing mapping for it."
<< endl;

6
src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
View File

@ -38,7 +38,7 @@ void Foam::meshToMesh0::calculateInverseDistanceWeights() const
if (inverseDistanceWeightsPtr_)
{
FatalErrorIn("meshToMesh0::calculateInverseDistanceWeights()")
FatalErrorInFunction
<< "weighting factors already calculated"
<< exit(FatalError);
}
@ -140,7 +140,7 @@ void Foam::meshToMesh0::calculateInverseVolumeWeights() const
if (inverseVolumeWeightsPtr_)
{
FatalErrorIn("meshToMesh0::calculateInverseVolumeWeights()")
FatalErrorInFunction
<< "weighting factors already calculated"
<< exit(FatalError);
}
@ -203,7 +203,7 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
if (cellToCellAddressingPtr_)
{
FatalErrorIn("meshToMesh0::calculateCellToCellAddressing()")
FatalErrorInFunction
<< "addressing already calculated"
<< exit(FatalError);
}

30
src/sampling/meshToMesh0/meshToMesh0.C
View File

@ -87,13 +87,8 @@ Foam::meshToMesh0::meshToMesh0
}
else
{
WarningIn
(
"meshToMesh0::meshToMesh0"
"(const fvMesh& meshFrom, const fvMesh& meshTo,"
"const HashTable<word>& patchMap,"
"const wordList& cuttingPatchNames)"
) << "Cannot find cutting-patch " << cuttingPatchNames[i]
WarningInFunction
<< "Cannot find cutting-patch " << cuttingPatchNames[i]
<< " in destination mesh" << endl;
}
}
@ -134,11 +129,8 @@ Foam::meshToMesh0::meshToMesh0
// of boundary patches
if (fromMesh_.boundary().size() != toMesh_.boundary().size())
{
FatalErrorIn
(
"meshToMesh0::meshToMesh0"
"(const fvMesh& meshFrom, const fvMesh& meshTo)"
) << "Incompatible meshes: different number of patches, "
FatalErrorInFunction
<< "Incompatible meshes: different number of patches, "
<< "fromMesh = " << fromMesh_.boundary().size()
<< ", toMesh = " << toMesh_.boundary().size()
<< exit(FatalError);
@ -152,11 +144,8 @@ Foam::meshToMesh0::meshToMesh0
!= toMesh_.boundaryMesh()[patchi].name()
)
{
FatalErrorIn
(
"meshToMesh0::meshToMesh0"
"(const fvMesh& meshFrom, const fvMesh& meshTo)"
) << "Incompatible meshes: different patch names for patch "
FatalErrorInFunction
<< "Incompatible meshes: different patch names for patch "
<< patchi
<< ", fromMesh = " << fromMesh_.boundary()[patchi].name()
<< ", toMesh = " << toMesh_.boundary()[patchi].name()
@ -169,11 +158,8 @@ Foam::meshToMesh0::meshToMesh0
!= toMesh_.boundaryMesh()[patchi].type()
)
{
FatalErrorIn
(
"meshToMesh0::meshToMesh0"
"(const fvMesh& meshFrom, const fvMesh& meshTo)"
) << "Incompatible meshes: different patch types for patch "
FatalErrorInFunction
<< "Incompatible meshes: different patch types for patch "
<< patchi
<< ", fromMesh = " << fromMesh_.boundary()[patchi].type()
<< ", toMesh = " << toMesh_.boundary()[patchi].type()

41
src/sampling/meshToMesh0/meshToMesh0Templates.C
View File

@ -158,12 +158,8 @@ void Foam::meshToMesh0::interpolateInternalField
{
if (fromVf.mesh() != fromMesh_)
{
FatalErrorIn
(
"meshToMesh0::interpolateInternalField(Field<Type>&, "
"const GeometricField<Type, fvPatchField, volMesh>&, "
"meshToMesh0::order, const CombineOp&) const"
) << "the argument field does not correspond to the right mesh. "
FatalErrorInFunction
<< "the argument field does not correspond to the right mesh. "
<< "Field size: " << fromVf.size()
<< " mesh size: " << fromMesh_.nCells()
<< exit(FatalError);
@ -171,12 +167,8 @@ void Foam::meshToMesh0::interpolateInternalField
if (toF.size() != toMesh_.nCells())
{
FatalErrorIn
(
"meshToMesh0::interpolateInternalField(Field<Type>&, "
"const GeometricField<Type, fvPatchField, volMesh>&, "
"meshToMesh0::order, const CombineOp&) const"
) << "the argument field does not correspond to the right mesh. "
FatalErrorInFunction
<< "the argument field does not correspond to the right mesh. "
<< "Field size: " << toF.size()
<< " mesh size: " << toMesh_.nCells()
<< exit(FatalError);
@ -229,12 +221,8 @@ void Foam::meshToMesh0::interpolateInternalField
break;
}
default:
FatalErrorIn
(
"meshToMesh0::interpolateInternalField(Field<Type>&, "
"const GeometricField<Type, fvPatchField, volMesh>&, "
"meshToMesh0::order, const CombineOp&) const"
) << "unknown interpolation scheme " << ord
FatalErrorInFunction
<< "unknown interpolation scheme " << ord
<< exit(FatalError);
}
}
@ -317,13 +305,8 @@ void Foam::meshToMesh0::interpolate
}
default:
FatalErrorIn
(
"meshToMesh0::interpolate("
"GeometricField<Type, fvPatchField, volMesh>&, "
"const GeometricField<Type, fvPatchField, volMesh>&, "
"meshToMesh0::order, const CombineOp&) const"
) << "unknown interpolation scheme " << ord
FatalErrorInFunction
<< "unknown interpolation scheme " << ord
<< exit(FatalError);
}
@ -398,12 +381,8 @@ Foam::meshToMesh0::interpolate
// of boundary patches
if (fromMesh_.boundary().size() != toMesh_.boundary().size())
{
FatalErrorIn
(
"meshToMesh0::interpolate"
"(const GeometricField<Type, fvPatchField, volMesh>&,"
"meshToMesh0::order, const CombineOp&) const"
) << "Incompatible meshes: different number of boundaries, "
FatalErrorInFunction
<< "Incompatible meshes: different number of boundaries, "
"only internal field may be interpolated"
<< exit(FatalError);
}

8
src/sampling/probes/patchProbes.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
@ -49,7 +49,6 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
// All the info for nearest. Construct to miss
List<mappedPatchBase::nearInfo> nearest(this->size());
const labelList patchIDs(bm.patchSet(patchNames_).sortedToc());
label nFaces = 0;
@ -124,10 +123,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
if (isA<emptyPolyPatch>(bm[patchi]))
{
WarningIn
(
" Foam::patchProbes::findElements(const fvMesh&)"
)
WarningInFunction
<< " The sample point: " << sample
<< " belongs to " << patchi
<< " which is an empty patch. This is not permitted. "

21
src/sampling/probes/probes.C
View File

@ -108,7 +108,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
{
if (Pstream::master())
{
WarningIn("findElements::findElements(const fvMesh&)")
WarningInFunction
<< "Did not find location " << location
<< " in any cell. Skipping location." << endl;
}
@ -117,7 +117,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
{
if (Pstream::master())
{
WarningIn("probes::findElements(const fvMesh&)")
WarningInFunction
<< "Did not find location " << location
<< " in any face. Skipping location." << endl;
}
@ -127,7 +127,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
// Make sure location not on two domains.
if (elementList_[probeI] != -1 && elementList_[probeI] != cellI)
{
WarningIn("probes::findElements(const fvMesh&)")
WarningInFunction
<< "Location " << location
<< " seems to be on multiple domains:"
<< " cell " << elementList_[probeI]
@ -141,7 +141,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
if (faceList_[probeI] != -1 && faceList_[probeI] != faceI)
{
WarningIn("probes::findElements(const fvMesh&)")
WarningInFunction
<< "Location " << location
<< " seems to be on multiple domains:"
<< " cell " << faceList_[probeI]
@ -368,6 +368,19 @@ void Foam::probes::read(const dictionary& dict)
readDict(dict);
// Find the elements
dict.readIfPresent("fixedLocations", fixedLocations_);
if (dict.readIfPresent("interpolationScheme", interpolationScheme_))
{
if (!fixedLocations_ && interpolationScheme_ != "cell")
{
WarningInFunction
<< "Only cell interpolation can be applied when "
<< "not using fixedLocations. InterpolationScheme "
<< "entry will be ignored";
}
}
// Initialise cells to sample from supplied locations
findElements(mesh_);
// Open the probe streams

13
src/sampling/sampledSet/circle/circleSet.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
@ -76,7 +76,7 @@ void Foam::circleSet::calcSamples
}
else
{
WarningIn(funcName)
WarningInFunction
<< "Unable to find cell at point id " << 0
<< " at location " << startPoint_ << endl;
}
@ -92,7 +92,7 @@ void Foam::circleSet::calcSamples
if (mag(axis1 & circleAxis_) > SMALL)
{
WarningIn(funcName)
WarningInFunction
<< "Vector defined by (startPoint - origin) not orthogonal to "
<< "circleAxis:" << nl
<< " startPoint - origin = " << axis1 << nl
@ -118,13 +118,16 @@ void Foam::circleSet::calcSamples
samplingCells.append(cellI);
samplingFaces.append(-1);
samplingSegments.append(nPoint);
samplingCurveDist.append(mag(pt - startPoint_));
samplingCurveDist.append
(
radius*constant::mathematical::pi/180.0*theta
);
nPoint++;
}
else
{
WarningIn(funcName)
WarningInFunction
<< "Unable to find cell at point id " << nPoint
<< " at location " << pt << endl;
}

2
src/sampling/sampledSet/face/faceOnlySet.C
View File

@ -102,7 +102,7 @@ void Foam::faceOnlySet::calcSamples
// distance vector between sampling points
if (mag(end_ - start_) < SMALL)
{
FatalErrorIn("faceOnlySet::calcSamples()")
FatalErrorInFunction
<< "Incorrect sample specification :"
<< " start equals end point." << endl
<< " start:" << start_

5
src/sampling/sampledSet/midPoint/midPointSet.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
@ -68,8 +68,7 @@ void Foam::midPointSet::genSamples()
if (cell1 != cell2)
{
FatalErrorIn("midPointSet::genSamples()")
<< " sampleI:" << sampleI
FatalErrorInFunction
<< " midI:" << midI
<< " sampleI:" << sampleI
<< " pts[sampleI]:" << operator[](sampleI)

5
src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.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
@ -81,8 +81,7 @@ void Foam::midPointAndFaceSet::genSamples()
if (cell1 != cell2)
{
FatalErrorIn("midPointAndFaceSet::genSamples()")
<< " sampleI:" << sampleI
FatalErrorInFunction
<< " newSampleI:" << newSampleI
<< " pts[sampleI]:" << operator[](sampleI)
<< " face[sampleI]:" << faces_[sampleI]

6
src/sampling/sampledSet/polyLine/polyLineSet.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
@ -137,7 +137,7 @@ void Foam::polyLineSet::calcSamples
// Check sampling points
if (sampleCoords_.size() < 2)
{
FatalErrorIn("polyLineSet::calcSamples()")
FatalErrorInFunction
<< "Incorrect sample specification. Too few points:"
<< sampleCoords_ << exit(FatalError);
}
@ -146,7 +146,7 @@ void Foam::polyLineSet::calcSamples
{
if (mag(sampleCoords_[sampleI] - oldPoint) < SMALL)
{
FatalErrorIn("polyLineSet::calcSamples()")
FatalErrorInFunction
<< "Incorrect sample specification."
<< " Point " << sampleCoords_[sampleI-1]
<< " at position " << sampleI-1

36
src/sampling/sampledSet/sampledSet/sampledSet.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
@ -57,10 +57,8 @@ Foam::label Foam::sampledSet::getCell
{
if (faceI == -1)
{
FatalErrorIn
(
"sampledSet::getCell(const label, const point&)"
) << "Illegal face label " << faceI
FatalErrorInFunction
<< "Illegal face label " << faceI
<< abort(FatalError);
}
@ -70,10 +68,8 @@ Foam::label Foam::sampledSet::getCell
if (!mesh().pointInCell(sample, cellI, searchEngine_.decompMode()))
{
FatalErrorIn
(
"sampledSet::getCell(const label, const point&)"
) << "Found cell " << cellI << " using face " << faceI
FatalErrorInFunction
<< "Found cell " << cellI << " using face " << faceI
<< ". But cell does not contain point " << sample
<< abort(FatalError);
}
@ -99,10 +95,8 @@ Foam::label Foam::sampledSet::getCell
}
else
{
FatalErrorIn
(
"sampledSet::getCell(const label, const point&)"
) << "None of the neighbours of face "
FatalErrorInFunction
<< "None of the neighbours of face "
<< faceI << " contains point " << sample
<< abort(FatalError);
@ -220,10 +214,8 @@ Foam::point Foam::sampledSet::pushIn
if (tetFaceI == -1)
{
FatalErrorIn
(
"sampledSet::pushIn(const point&, const label)"
) << "After pushing " << facePt << " to " << newPosition
FatalErrorInFunction
<< "After pushing " << facePt << " to " << newPosition
<< " it is still outside face " << faceI
<< " at " << mesh().faceCentres()[faceI]
<< " of cell " << cellI
@ -378,7 +370,7 @@ void Foam::sampledSet::setSamples
|| (curveDist_.size() != size())
)
{
FatalErrorIn("sampledSet::setSamples()")
FatalErrorInFunction
<< "sizes not equal : "
<< " points:" << size()
<< " cells:" << cells_.size()
@ -459,12 +451,8 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
if (cstrIter == wordConstructorTablePtr_->end())
{
FatalErrorIn
(
"sampledSet::New"
"(const word&, const polyMesh&, const meshSearch&"
", const dictionary&)"
) << "Unknown sample type "
FatalErrorInFunction
<< "Unknown sample type "
<< sampleType << nl << nl
<< "Valid sample types : " << endl
<< wordConstructorTablePtr_->sortedToc()

4
src/sampling/sampledSet/sampledSet/sampledSet.H
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
@ -223,7 +223,7 @@ public:
//- Clone
autoPtr<sampledSet> clone() const
{
notImplemented("autoPtr<sampledSet> clone() const");
NotImplemented;
return autoPtr<sampledSet>(NULL);
}

8
src/sampling/sampledSet/sampledSets/sampledSets.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
@ -35,8 +35,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(sampledSets, 0);
bool sampledSets::verbose_ = false;
defineTypeNameAndDebug(sampledSets, 0);
bool sampledSets::verbose_ = false;
}
@ -102,7 +102,7 @@ void Foam::sampledSets::combineSampledSets
if (Pstream::master() && allCurveDist.size() == 0)
{
WarningIn("sampledSets::combineSampledSets(..)")
WarningInFunction
<< "Sample set " << samplePts.name()
<< " has zero points." << endl;
}

4
src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C
View File

@ -106,7 +106,7 @@ Foam::label Foam::sampledSets::classifyFields()
}
else
{
WarningIn("sampledSets::classifyFields()")
WarningInFunction
<< "Cannot find field file matching "
<< fieldSelection_[i] << endl;
}
@ -137,7 +137,7 @@ Foam::label Foam::sampledSets::classifyFields()
}
else
{
WarningIn("sampledSets::classifyFields()")
WarningInFunction
<< "Cannot find registered field matching "
<< fieldSelection_[i] << endl;
}

15
src/sampling/sampledSet/sampledSets/sampledSetsTemplates.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
@ -166,17 +166,8 @@ void Foam::sampledSets::writeSampleFile
}
else
{
WarningIn
(
"void Foam::sampledSets::writeSampleFile"
"("
"const coordSet&, "
"const PtrList<volFieldSampler<Type> >&, "
"const label, "
"const fileName&, "
"const writer<Type>&"
")"
) << "File " << ofs.name() << " could not be opened. "
WarningInFunction
<< "File " << ofs.name() << " could not be opened. "
<< "No data will be written" << endl;
}
}

2
src/sampling/sampledSet/uniform/uniformSet.C
View File

@ -217,7 +217,7 @@ void Foam::uniformSet::calcSamples
// distance vector between sampling points
if ((nPoints_ < 2) || (mag(end_ - start_) < SMALL))
{
FatalErrorIn("uniformSet::calcSamples()")
FatalErrorInFunction
<< "Incorrect sample specification. Either too few points or"
<< " start equals end point." << endl
<< "nPoints:" << nPoints_

18
src/sampling/sampledSurface/distanceSurface/distanceSurface.C
View File

@ -113,10 +113,8 @@ void Foam::distanceSurface::createGeometry()
}
else
{
FatalErrorIn
(
"void Foam::distanceSurface::createGeometry()"
) << "getVolumeType failure, neither INSIDE or OUTSIDE"
FatalErrorInFunction
<< "getVolumeType failure, neither INSIDE or OUTSIDE"
<< exit(FatalError);
}
}
@ -165,10 +163,8 @@ void Foam::distanceSurface::createGeometry()
}
else
{
FatalErrorIn
(
"void Foam::distanceSurface::createGeometry()"
) << "getVolumeType failure, "
FatalErrorInFunction
<< "getVolumeType failure, "
<< "neither INSIDE or OUTSIDE"
<< exit(FatalError);
}
@ -224,10 +220,8 @@ void Foam::distanceSurface::createGeometry()
}
else
{
FatalErrorIn
(
"void Foam::distanceSurface::createGeometry()"
) << "getVolumeType failure, neither INSIDE or OUTSIDE"
FatalErrorInFunction
<< "getVolumeType failure, neither INSIDE or OUTSIDE"
<< exit(FatalError);
}
}

12
src/sampling/sampledSurface/isoSurface/isoSurface.C
View File

@ -121,10 +121,8 @@ Foam::PackedBoolList Foam::isoSurface::collocatedFaces
}
else
{
FatalErrorIn
(
"isoSurface::collocatedFaces(const coupledPolyPatch&) const"
) << "Unhandled coupledPolyPatch type " << pp.type()
FatalErrorInFunction
<< "Unhandled coupledPolyPatch type " << pp.type()
<< abort(FatalError);
}
return collocated;
@ -887,7 +885,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
if ((triPoints.size() % 3) != 0)
{
FatalErrorIn("isoSurface::stitchTriPoints(..)")
FatalErrorInFunction
<< "Problem: number of points " << triPoints.size()
<< " not a multiple of 3." << abort(FatalError);
}
@ -918,7 +916,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
if (hasMerged)
{
FatalErrorIn("isoSurface::stitchTriPoints(..)")
FatalErrorInFunction
<< "Merged points contain duplicates"
<< " when merging with distance " << mergeDistance_ << endl
<< "merged:" << newPoints.size() << " re-merged:"
@ -1035,7 +1033,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
if (f == nbrF)
{
FatalErrorIn("validTri(const triSurface&, const label)")
FatalErrorInFunction
<< "Check : "
<< " triangle " << faceI << " vertices " << f
<< " fc:" << f.centre(surf.points())

12
src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
View File

@ -920,7 +920,7 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
if ((triPoints.size() % 3) != 0)
{
FatalErrorIn("isoSurfaceCell::stitchTriPoints(..)")
FatalErrorInFunction
<< "Problem: number of points " << triPoints.size()
<< " not a multiple of 3." << abort(FatalError);
}
@ -954,7 +954,7 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
if (hasMerged)
{
FatalErrorIn("isoSurfaceCell::stitchTriPoints(..)")
FatalErrorInFunction
<< "Merged points contain duplicates"
<< " when merging with distance " << mergeDistance_ << endl
<< "merged:" << newPoints.size() << " re-merged:"
@ -1067,7 +1067,7 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
{
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;
@ -1078,7 +1078,7 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
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
<< endl;
@ -1110,7 +1110,7 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
&& ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
)
{
WarningIn("validTri(const triSurface&, const label)")
WarningInFunction
<< "triangle " << faceI << " vertices " << f
<< " coords:" << f.points(surf.points())
<< " has the same vertices as triangle " << nbrFaceI
@ -1202,7 +1202,7 @@ void Foam::isoSurfaceCell::calcAddressing
}
else
{
//WarningIn("orientSurface(triSurface&)")
//WarningInFunction
// << "Edge " << edgeI << " with centre " << mergedCentres[edgeI]
// << " used by more than two triangles: " << edgeFace0[edgeI]
// << ", "

2
src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
View File

@ -511,7 +511,7 @@ void Foam::isoSurfaceCell::generateTriPoints
if (countNotFoundTets > 0)
{
WarningIn("Foam::isoSurfaceCell::generateTriPoints(..)")
WarningInFunction
<< "Could not find " << countNotFoundTets
<< " tet base points, which may lead to inverted triangles."
<< endl;

2
src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
View File

@ -542,7 +542,7 @@ void Foam::isoSurface::generateTriPoints
|| (snappedPoint.size() != mesh_.nPoints())
)
{
FatalErrorIn("isoSurface::generateTriPoints(..)")
FatalErrorInFunction
<< "Incorrect size." << endl
<< "mesh: nCells:" << mesh_.nCells()
<< " points:" << mesh_.nPoints() << endl

10
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
View File

@ -110,7 +110,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
}
else
{
FatalErrorIn("sampledIsoSurface::getIsoFields()")
FatalErrorInFunction
<< "Cannot find isosurface field " << isoField_
<< " in database or directory " << vfHeader.path()
<< exit(FatalError);
@ -476,10 +476,8 @@ Foam::sampledIsoSurface::sampledIsoSurface
{
if (!sampledSurface::interpolate())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"sampledIsoSurface::sampledIsoSurface"
"(const word&, const polyMesh&, const dictionary&)",
dict
) << "Non-interpolated iso surface not supported since triangles"
<< " span across cells." << exit(FatalIOError);
@ -491,10 +489,8 @@ Foam::sampledIsoSurface::sampledIsoSurface
if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"sampledIsoSurface::sampledIsoSurface"
"(const word&, const polyMesh&, const dictionary&)",
dict
) << "Cannot find patch " << exposedPatchName_
<< " in which to put exposed faces." << endl

9
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.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
@ -281,11 +281,8 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
{
FatalErrorIn
(
"sampledCuttingPlane::sampledCuttingPlane"
"(const word&, const polyMesh&, const dictionary&)"
) << "Cannot find patch " << exposedPatchName_
FatalErrorInFunction
<< "Cannot find patch " << exposedPatchName_
<< " in which to put exposed faces." << endl
<< "Valid patches are " << mesh.boundaryMesh().names()
<< exit(FatalError);

2
src/sampling/sampledSurface/sampledPatch/sampledPatch.C
View File

@ -131,7 +131,7 @@ bool Foam::sampledPatch::update()
if (isA<emptyPolyPatch>(pp))
{
FatalErrorIn("sampledPatch::update()")
FatalErrorInFunction
<< "Cannot sample an empty patch. Patch " << pp.name()
<< exit(FatalError);
}

25
src/sampling/sampledSurface/sampledSurface/sampledSurface.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
@ -53,7 +53,7 @@ void Foam::sampledSurface::makeSf() const
// It is an error to recalculate if the pointer is already set
if (SfPtr_)
{
FatalErrorIn("Foam::sampledSurface::makeSf()")
FatalErrorInFunction
<< "face area vectors already exist"
<< abort(FatalError);
}
@ -74,7 +74,7 @@ void Foam::sampledSurface::makeMagSf() const
// It is an error to recalculate if the pointer is already set
if (magSfPtr_)
{
FatalErrorIn("Foam::sampledSurface::makeMagSf()")
FatalErrorInFunction
<< "mag face areas already exist"
<< abort(FatalError);
}
@ -95,7 +95,7 @@ void Foam::sampledSurface::makeCf() const
// It is an error to recalculate if the pointer is already set
if (CfPtr_)
{
FatalErrorIn("Foam::sampledSurface::makeCf()")
FatalErrorInFunction
<< "face centres already exist"
<< abort(FatalError);
}
@ -132,11 +132,8 @@ Foam::autoPtr<Foam::sampledSurface> Foam::sampledSurface::New
if (cstrIter == wordConstructorTablePtr_->end())
{
FatalErrorIn
(
"sampledSurface::New"
"(const word&, const polyMesh&, const dictionary&)"
) << "Unknown sample type "
FatalErrorInFunction
<< "Unknown sample type "
<< sampleType << nl << nl
<< "Valid sample types : " << endl
<< wordConstructorTablePtr_->sortedToc()
@ -245,7 +242,7 @@ Foam::tmp<Foam::scalarField> Foam::sampledSurface::sample
const surfaceScalarField& sField
) const
{
notImplemented("tmp<Foam::scalarField> sampledSurface::sample");
NotImplemented;
return tmp<scalarField>(NULL);
}
@ -255,7 +252,7 @@ Foam::tmp<Foam::vectorField> Foam::sampledSurface::sample
const surfaceVectorField& sField
) const
{
notImplemented("tmp<Foam::vectorField> sampledSurface::sample");
NotImplemented;
return tmp<vectorField>(NULL);
}
@ -265,7 +262,7 @@ Foam::tmp<Foam::sphericalTensorField> Foam::sampledSurface::sample
const surfaceSphericalTensorField& sField
) const
{
notImplemented("tmp<Foam::sphericalTensorField> sampledSurface::sample");
NotImplemented;
return tmp<sphericalTensorField>(NULL);
}
@ -275,7 +272,7 @@ Foam::tmp<Foam::symmTensorField> Foam::sampledSurface::sample
const surfaceSymmTensorField& sField
) const
{
notImplemented("tmp<Foam::symmTensorField> sampledSurface::sample");
NotImplemented;
return tmp<symmTensorField>(NULL);
}
@ -285,7 +282,7 @@ Foam::tmp<Foam::tensorField> Foam::sampledSurface::sample
const surfaceTensorField& sField
) const
{
notImplemented("tmp<Foam::tensorField> sampledSurface::sample");
NotImplemented;
return tmp<tensorField>(NULL);
}

2
src/sampling/sampledSurface/sampledSurface/sampledSurface.H
View File

@ -217,7 +217,7 @@ public:
//- Clone
autoPtr<sampledSurface> clone() const
{
notImplemented("autoPtr<sampledSurface> clone() const");
NotImplemented;
return autoPtr<sampledSurface>(NULL);
}

7
src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,10 +35,7 @@ bool Foam::sampledSurface::checkFieldSize(const Field<Type>& field) const
if (field.size() != faces().size())
{
FatalErrorIn
(
"sampledSurface::checkFieldSize(const Field<Type>&) const"
)
FatalErrorInFunction
<< "size mismatch: "
<< "field (" << field.size()
<< ") != surface (" << faces().size() << ")"

4
src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C
View File

@ -50,7 +50,7 @@ Foam::label Foam::sampledSurfaces::classifyFields()
}
else
{
WarningIn("sampledSurfaces::classifyFields()")
WarningInFunction
<< "Cannot find field file matching "
<< fieldSelection_[i] << endl;
}
@ -72,7 +72,7 @@ Foam::label Foam::sampledSurfaces::classifyFields()
}
else
{
WarningIn("sampledSurfaces::classifyFields()")
WarningInFunction
<< "Cannot find registered field matching "
<< fieldSelection_[i] << endl;
}

7
src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -163,10 +163,7 @@ Foam::sampledThresholdCellFaces::sampledThresholdCellFaces
{
if (!dict.found("lowerLimit") && !dict.found("upperLimit"))
{
FatalErrorIn
(
"sampledThresholdCellFaces::sampledThresholdCellFaces(..)"
)
FatalErrorInFunction
<< "require at least one of 'lowerLimit' or 'upperLimit'" << endl
<< abort(FatalError);
}

5
src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.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
@ -279,8 +279,7 @@ Foam::thresholdCellFaces::thresholdCellFaces
if (lowerThreshold > upperThreshold)
{
WarningIn("thresholdCellFaces::thresholdCellFaces(...)")
<< "lower > upper limit! "
WarningInFunction
<< lowerThreshold << " > " << upperThreshold << endl;
}

8
src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd
-------------------------------------------------------------------------------
License
@ -69,10 +69,8 @@ void Foam::dxSurfaceWriter::writeGeometry
if (f.size() != 3)
{
FatalErrorIn
(
"writeGeometry(Ostream&, const pointField&, const faceList&)"
) << "Face " << faceI << " vertices " << f
FatalErrorInFunction
<< "Face " << faceI << " vertices " << f
<< " is not a triangle."
<< exit(FatalError);
}

24
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd
-------------------------------------------------------------------------------
License
@ -190,14 +190,8 @@ void Foam::nastranSurfaceWriter::writeCoord
}
default:
{
FatalErrorIn
(
"void Foam::nastranSurfaceWriter::writeCoord"
"("
"Ostream&, "
"const point&"
") const"
) << "Unknown writeFormat enumeration" << abort(FatalError);
FatalErrorInFunction
<< "Unknown writeFormat enumeration" << abort(FatalError);
}
}
@ -280,16 +274,8 @@ void Foam::nastranSurfaceWriter::writeFace
}
default:
{
FatalErrorIn
(
"void Foam::nastranSurfaceWriter::writeFace"
"("
"const word&"
"const labelList&"
"label&"
"Ostream&, "
") const"
) << "Unknown writeFormat enumeration" << abort(FatalError);
FatalErrorInFunction
<< "Unknown writeFormat enumeration" << abort(FatalError);
}
}

42
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
View File

@ -105,17 +105,7 @@ void Foam::nastranSurfaceWriter::writeFaceValue
}
else
{
WarningIn
(
"template<class Type>"
"void Foam::nastranSurfaceWriter::writeNodeValue"
"("
"const dataFormat&, "
"const Type&, "
"const label, "
"OFstream&"
") const"
)
WarningInFunction
<< dataFormatNames_[format] << " requires scalar values "
<< "and cannot be used for higher rank values"
<< endl;
@ -141,19 +131,9 @@ void Foam::nastranSurfaceWriter::writeFaceValue
}
default:
{
WarningIn
(
"template<class Type>"
"void Foam::nastranSurfaceWriter::writeNodeValue"
"("
"const dataFormat&, "
"const Type&, "
"const label, "
"OFstream&"
") const"
)
FatalErrorInFunction
<< "Unhandled enumeration " << dataFormatNames_[format]
<< endl;
<< exit(FatalError);
}
}
@ -176,23 +156,9 @@ Foam::fileName Foam::nastranSurfaceWriter::writeTemplate
const bool verbose
) const
{
if (!fieldMap_.found(fieldName))
{
WarningIn
(
"void Foam::nastranSurfaceWriter::writeTemplate"
"("
"const fileName&, "
"const fileName&, "
"const pointField&, "
"const faceList&, "
"const word&, "
"const Field<Type>&, "
"const bool, "
"const bool"
") const"
)
FatalErrorInFunction
<< "No mapping found between field " << fieldName
<< " and corresponding Nastran field. Available types are:"
<< fieldMap_

8
src/sampling/sampledSurface/writers/surfaceWriter.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -68,10 +68,8 @@ Foam::surfaceWriter::New(const word& writeType)
if (cstrIter == wordConstructorTablePtr_->end())
{
FatalErrorIn
(
"surfaceWriter::New(const word&)"
) << "Unknown write type \"" << writeType << "\"\n\n"
FatalErrorInFunction
<< "Unknown write type \"" << writeType << "\"\n\n"
<< "Valid write types : "
<< wordConstructorTablePtr_->sortedToc() << nl
<< "Valid proxy types : "