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

6
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -307,7 +307,7 @@ int main(int argc, char *argv[])
// Sanity check on previously decomposed case
if (nProcs != nDomains)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Specified -fields, but the case was decomposed with "
<< nProcs << " domains"
<< nl
@ -352,7 +352,7 @@ int main(int argc, char *argv[])
if (procDirsProblem)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Case is already decomposed with " << nProcs
<< " domains, use the -force option or manually" << nl
<< "remove processor directories before decomposing. e.g.,"
@ -664,7 +664,7 @@ int main(int argc, char *argv[])
// Check
if (celli < 0 || celli >= mesh.nCells())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Illegal cell number " << celli
<< " for particle with index " << iter().index()
<< " at position " << iter().position() << nl

21
applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.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
@ -30,7 +30,6 @@ Description
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
(
const polyMesh& mesh,
@ -77,22 +76,8 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
// if (mappedTetFace == -1)
// {
// FatalErrorIn
// (
// "Foam::lagrangianFieldDecomposer"
// "::lagrangianFieldDecomposer"
// "("
// "const polyMesh& mesh, "
// "const polyMesh& procMesh, "
// "const labelList& faceProcAddressing, "
// "const labelList& cellProcAddressing, "
// "const word& cloudName, "
// "const Cloud<indexedParticle>& "
// "lagrangianPositions, "
// "const List<SLList<indexedParticle*>*>& "
// "cellParticles"
// ")"
// ) << "Face lookup failure." << nl
// FatalErrorInFunction
// << "Face lookup failure." << nl
// << abort(FatalError);
// }

8
applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.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
@ -67,10 +67,8 @@ Foam::pointFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
{
hasUnmapped_ = true;
FatalErrorIn
(
"pointFieldDecomposer::patchFieldDecomposer()"
) << "Incomplete patch point addressing"
FatalErrorInFunction
<< "Incomplete patch point addressing"
<< abort(FatalError);
}
}

2
applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
View File

@ -23,7 +23,7 @@
if (minFaceIndex < 1)
{
WarningIn(args.executable())
WarningInFunction
<< "parallel decomposition addressing." << endl
<< "It looks like you are trying to reconstruct the case "
<< "decomposed with an earlier version of FOAM, which could\n"

11
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
View File

@ -147,7 +147,7 @@ int main(int argc, char *argv[])
{
if (noLagrangian)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot specify noLagrangian and lagrangianFields "
<< "options together."
<< exit(FatalError);
@ -170,7 +170,7 @@ int main(int argc, char *argv[])
if (!nProcs)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No processor* directories found"
<< exit(FatalError);
}
@ -209,7 +209,7 @@ int main(int argc, char *argv[])
if (timeDirs.empty())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No times selected"
<< exit(FatalError);
}
@ -349,7 +349,7 @@ int main(int argc, char *argv[])
}
else if (meshStat != procStat)
{
WarningIn(args.executable())
WarningInFunction
<< "readUpdate for the reconstructed mesh:"
<< meshStat << nl
<< "readUpdate for the processor meshes :"
@ -794,6 +794,7 @@ int main(int argc, char *argv[])
);
}
cellSet& cSet = cellSets[setI];
cSet.instance() = runTime.timeName();
forAllConstIter(cellSet, procSet, iter)
{
@ -820,6 +821,7 @@ int main(int argc, char *argv[])
);
}
faceSet& fSet = faceSets[setI];
fSet.instance() = runTime.timeName();
forAllConstIter(faceSet, procSet, iter)
{
@ -845,6 +847,7 @@ int main(int argc, char *argv[])
);
}
pointSet& pSet = pointSets[setI];
pSet.instance() = runTime.timeName();
forAllConstIter(pointSet, propSet, iter)
{

8
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -268,7 +268,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
}
else
{
FatalErrorIn("fvMeshDistribute::mergeSharedPoints()")
FatalErrorInFunction
<< "Problem. oldPointI:" << oldPointI
<< " newPointI:" << newPointI << abort(FatalError);
}
@ -301,7 +301,7 @@ boundBox procBounds
if (pointsInstance != databases[procI].timeName())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Your time was specified as " << databases[procI].timeName()
<< " but there is no polyMesh/points in that time." << endl
<< "(there is a points file in " << pointsInstance
@ -497,7 +497,7 @@ int main(int argc, char *argv[])
if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << endl
<< "Your merging tolerance (" << mergeTol << ") is finer than this."
@ -726,7 +726,7 @@ int main(int argc, char *argv[])
if (!masterMesh.write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}

14
applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -283,10 +283,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
if (patchI >= patches.size())
{
FatalErrorIn
(
"createMesh(const Time&, const fileName&, const bool)"
) << "Non-processor patches not synchronised."
FatalErrorInFunction
<< "Non-processor patches not synchronised."
<< endl
<< "Processor " << Pstream::myProcNo()
<< " has only " << patches.size()
@ -301,10 +299,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
|| name != patches[patchI].name()
)
{
FatalErrorIn
(
"createMesh(const Time&, const fileName&, const bool)"
) << "Non-processor patches not synchronised."
FatalErrorInFunction
<< "Non-processor patches not synchronised."
<< endl
<< "Master patch " << patchI
<< " name:" << type

37
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -106,7 +106,7 @@ scalar getMergeDistance
if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
{
FatalErrorIn("getMergeDistance")
FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << endl
<< "Your merging tolerance (" << mergeTol << ") is finer than this."
@ -300,7 +300,7 @@ void determineDecomposition
if (!decomposer.parallelAware())
{
WarningIn("determineDecomposition(..)")
WarningInFunction
<< "You have selected decomposition method "
<< decomposer.typeName
<< " which does" << endl
@ -543,11 +543,8 @@ void writeProcAddressing
if (!cellOk || !faceOk || !pointOk || !patchOk)
{
WarningIn
(
"void writeProcAddressing"
"(const bool, const fvMesh&, const mapDistributePolyMesh&)"
) << "Failed to write " << cellMap.objectPath()
WarningInFunction
<< "Failed to write " << cellMap.objectPath()
<< ", " << faceMap.objectPath()
<< ", " << pointMap.objectPath()
<< ", " << patchMap.objectPath()
@ -612,7 +609,7 @@ void readFields
if (haveMesh[Pstream::myProcNo()] && objectNames != masterNames)
{
FatalErrorIn("readFields()")
FatalErrorInFunction
<< "differing fields of type " << GeoField::typeName
<< " on processors." << endl
<< "Master has:" << masterNames << endl
@ -785,7 +782,7 @@ void correctCoupledBoundaryConditions(fvMesh& mesh)
}
else
{
FatalErrorIn("correctCoupledBoundaryConditions()")
FatalErrorInFunction
<< "Unsuported communications type "
<< Pstream::commsTypeNames[Pstream::defaultCommsType]
<< exit(FatalError);
@ -813,7 +810,6 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
{
Time& runTime = const_cast<Time&>(mesh.time());
//// Print some statistics
//Info<< "Before distribution:" << endl;
//printMeshData(mesh);
@ -866,7 +862,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
if (nonProcI == -1)
{
FatalErrorIn("redistributeAndWrite(..)")
FatalErrorInFunction
<< "Cannot find non-processor patch on processor "
<< Pstream::myProcNo() << endl
<< " Current patches:" << patches.names()
@ -1509,11 +1505,8 @@ void readProcAddressing
|| mesh.boundaryMesh().size() != boundaryProcAddressing.size()
)
{
FatalErrorIn
(
"readProcAddressing(const fvMesh&, const autoPtr<fvMesh>&,"
"autoPtr<mapDistributePolyMesh>&"
) << "Read addressing inconsistent with mesh sizes" << nl
FatalErrorInFunction
<< "Read addressing inconsistent with mesh sizes" << nl
<< "cells:" << mesh.nCells()
<< " addressing:" << cellProcAddressing.objectPath()
<< " size:" << cellProcAddressing.size() << nl
@ -2174,7 +2167,7 @@ int main(int argc, char *argv[])
if (env("FOAM_SIGFPE"))
{
WarningIn(args.executable())
WarningInFunction
<< "Detected floating point exception trapping (FOAM_SIGFPE)."
<< " This might give" << nl
<< " problems when mapping fields. Switch it off in case"
@ -2192,7 +2185,7 @@ int main(int argc, char *argv[])
Info<< "Decomposing case (like decomposePar)" << nl << endl;
if (reconstruct)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot specify both -decompose and -reconstruct"
<< exit(FatalError);
}
@ -2207,7 +2200,7 @@ int main(int argc, char *argv[])
{
if (!overwrite)
{
WarningIn(args.executable())
WarningInFunction
<< "Working in decompose or reconstruction mode automatically"
<< " implies -overwrite" << nl << endl;
overwrite = true;
@ -2217,7 +2210,7 @@ int main(int argc, char *argv[])
if (!Pstream::parRun())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< ": This utility can only be run parallel"
<< exit(FatalError);
}
@ -2225,7 +2218,7 @@ int main(int argc, char *argv[])
if (!isDir(args.rootPath()))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< ": cannot open root directory " << args.rootPath()
<< exit(FatalError);
}
@ -2376,7 +2369,7 @@ int main(int argc, char *argv[])
if (timeDirs.empty())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No times selected"
<< exit(FatalError);
}