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 0e01c44129
2311 changed files with 44974 additions and 26547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/test/router/Gather/GatherBase.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
@ -70,11 +70,8 @@ IndexType GatherBase::offset
{
if (values.size() != indices.size())
{
FatalErrorIn
(
"GatherBase::offset(const List<DataType>&, "
"const List<IndexType>&, AddOp)"
) << "Input data and indices lists not equal size." << endl
FatalErrorInFunction
<< "Input data and indices lists not equal size." << endl
<< "data size:" << values.size()
<< " indices:" << indices.size()
<< abort(FatalError);

2
applications/test/router/Test-processorRouter.C
View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[])
if (!Pstream::parRun())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Please run in parallel" << exit(FatalError);
}

21
applications/test/router/router.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
@ -125,12 +125,8 @@ void Foam::router::fixWeights
if (minNodeI == -1)
{
WarningIn
(
"Foam::router::fixWeights"
"(const label startNodeI, const label endNodeI,"
"const label nodeI, const label prevNodeI)"
) << "Cannot route from node " << nodeI
WarningInFunction
<< "Cannot route from node " << nodeI
<< " since all neigbours of node "
<< "already allocated:" << endl;
@ -138,12 +134,7 @@ void Foam::router::fixWeights
{
label nbrNodeI = myNeighbours[neighbourI];
WarningIn
(
"Foam::router::fixWeights"
"(const label startNodeI, const label endNodeI,"
"const label nodeI, const label prevNodeI)"
) << " neighbour:" << nbrNodeI
WarningInFunction
<< " weight:" << weights_[nbrNodeI] << endl;
}
return;
@ -292,7 +283,7 @@ bool Foam::router::route(const labelList& path, const label pathValue)
{
if (pathValue >= 0)
{
FatalErrorIn("router::route(const labelList&, const label)")
FatalErrorInFunction
<< "Illegal pathValue " << pathValue << exit(FatalError);
}
@ -382,7 +373,7 @@ Foam::labelList Foam::router::getRoute(const label pathValue) const
if (pathNodeI == -1)
{
FatalErrorIn("router::getRoute(const label)")
FatalErrorInFunction
<< "No route with value " << pathValue << endl;
}