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 4036107e96..321e8f3d3d 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 a30b67c76a..81a28869d5 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 58a8da4dd3..36f34f2af1 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 c4157d57f2..8f14752f1f 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 | ------------------------------------------------------------------------------- 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 852caef35f..8c6f4318ac 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C @@ -99,9 +99,6 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate const Pstream::commsTypes commsType ) const { - label oldWarn = UPstream::warnComm; - UPstream::warnComm = comm(); - procInterface_.interfaceInternalField(psiInternal, scalarSendBuf_); if @@ -140,8 +137,6 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate } const_cast(*this).updatedMatrix() = false; - - UPstream::warnComm = oldWarn; } @@ -159,9 +154,6 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix return; } - label oldWarn = UPstream::warnComm; - UPstream::warnComm = comm(); - const labelUList& faceCells = procInterface_.faceCells(); if @@ -209,8 +201,6 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix } const_cast(*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 f68e1a853b..c3f64cdc26 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 @@ -195,12 +195,7 @@ void Foam::processorGAMGInterface::initInternalFieldTransfer const labelUList& iF ) const { - label oldWarn = UPstream::warnComm; - UPstream::warnComm = comm(); - send(commsType, interfaceInternalField(iF)()); - - UPstream::warnComm = oldWarn; } @@ -210,13 +205,8 @@ Foam::tmp Foam::processorGAMGInterface::internalFieldTransfer const labelUList& iF ) const { - label oldWarn = UPstream::warnComm; - UPstream::warnComm = comm(); - tmp> tfld(receive