diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index 4036107e96e76171d04e74e6122cdf94553fb943..321e8f3d3df2edb4d1124047baa47f1b6190538d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -374,10 +374,6 @@ void Foam::GAMGAgglomeration::procAgglomerateLduAddressing
const lduMesh& myMesh = meshLevels_[levelIndex-1];
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = meshComm;
-
-
procAgglomMap_.set(levelIndex, new labelList(procAgglomMap));
agglomProcIDs_.set(levelIndex, new labelList(procIDs));
procCommunicator_[levelIndex] = allMeshComm;
@@ -435,8 +431,6 @@ void Foam::GAMGAgglomeration::procAgglomerateLduAddressing
{
clearLevel(levelIndex);
}
-
- UPstream::warnComm = oldWarn;
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
index a30b67c76a9a34c4c0f09b107f74cb6b0494b328..81a28869d5ef35b425c082a9431039631be25467 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -253,13 +253,6 @@ Foam::GAMGSolver::GAMGSolver
if (matrixLevels_.set(coarsestLevel))
{
- const lduMesh& coarsestMesh =
- matrixLevels_[coarsestLevel].mesh();
-
- label coarseComm = coarsestMesh.comm();
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = coarseComm;
-
coarsestLUMatrixPtr_.set
(
new LUscalarMatrix
@@ -269,8 +262,6 @@ Foam::GAMGSolver::GAMGSolver
interfaceLevels_[coarsestLevel]
)
);
-
- UPstream::warnComm = oldWarn;
}
}
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index 58a8da4dd3941264ac2656cb1e47d337acf525ce..36f34f2af151557fd3fa13e4cdaca15be7d160ae 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -433,14 +433,8 @@ void Foam::GAMGSolver::procAgglomerateMatrix
interfaceLevelsIntCoeffs_[levelI];
const lduMesh& coarsestMesh = coarsestMatrix.mesh();
-
label coarseComm = coarsestMesh.comm();
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = coarseComm;
-
-
-
// Gather all matrix coefficients onto agglomProcIDs[0]
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -731,7 +725,6 @@ void Foam::GAMGSolver::procAgglomerateMatrix
// }
//}
}
- UPstream::warnComm = oldWarn;
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index e5332f52fe60063086ee573530495872ac8884c0..f6666c8736efdcab9bf3220fbfcc9132ff54e452 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@@ -556,8 +556,6 @@ void Foam::GAMGSolver::solveCoarsestLevel
const label coarsestLevel = matrixLevels_.size() - 1;
label coarseComm = matrixLevels_[coarsestLevel].mesh().comm();
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = coarseComm;
if (directSolveCoarsest_)
{
@@ -595,9 +593,6 @@ void Foam::GAMGSolver::solveCoarsestLevel
// //solverPerformance coarseSolverPerf;
//
// label solveComm = agglomeration_.procCommunicator(coarsestLevel);
- // label oldWarn = UPstream::warnComm;
- // UPstream::warnComm = solveComm;
- //
//
// coarsestCorrField = 0;
// solverPerformance coarseSolverPerf;
@@ -645,7 +640,6 @@ void Foam::GAMGSolver::solveCoarsestLevel
// }
// }
//
- // UPstream::warnComm = oldWarn;
// Pout<< "done master solve." << endl;
//
// //// Scatter to all processors
@@ -709,8 +703,6 @@ void Foam::GAMGSolver::solveCoarsestLevel
coarseSolverPerf.print(Info.masterStream(coarseComm));
}
}
-
- UPstream::warnComm = oldWarn;
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index 3f77067f0673e16395158b82c6d27e6bec283676..a4c716d7a2feb47fea40a559038158f66f8f1e72 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -100,9 +100,6 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
const Pstream::commsTypes commsType
) const
{
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = comm();
-
procInterface_.interfaceInternalField(psiInternal, scalarSendBuf_);
if
@@ -141,8 +138,6 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
}
const_cast<processorGAMGInterfaceField&>(*this).updatedMatrix() = false;
-
- UPstream::warnComm = oldWarn;
}
@@ -161,9 +156,6 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
return;
}
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = comm();
-
if
(
commsType == Pstream::commsTypes::nonBlocking
@@ -203,8 +195,6 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
}
const_cast<processorGAMGInterfaceField&>(*this).updatedMatrix() = true;
-
- UPstream::warnComm = oldWarn;
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index 0c47042ef8904ddb0faf2fe0654a369503e4c4ee..46581a74470478ddee322f5a749dfaf6d5e5d0a7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -190,12 +190,7 @@ void Foam::processorGAMGInterface::initInternalFieldTransfer
const labelUList& iF
) const
{
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = comm();
-
send(commsType, interfaceInternalField(iF)());
-
- UPstream::warnComm = oldWarn;
}
@@ -205,13 +200,8 @@ Foam::tmp<Foam::labelField> Foam::processorGAMGInterface::internalFieldTransfer
const labelUList& iF
) const
{
- label oldWarn = UPstream::warnComm;
- UPstream::warnComm = comm();
-
tmp<Field<label>> tfld(receive<label>(commsType, this->size()));
- UPstream::warnComm = oldWarn;
-
return tfld;
}