zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GAMG: removed warnComm

Browse Source
This commit is contained in:
Henry Weller
2017-09-01 16:40:43 +01:00
parent afd8527208
commit abbb897a41
6 changed files with 3 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
View File

@ -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;
}

11
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
View File

@ -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;
}
}
}

7
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
View File

@ -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;
}

10
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
View File

@ -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;
}

10
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
View File

@ -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<processorGAMGInterfaceField&>(*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<processorGAMGInterfaceField&>(*this).updatedMatrix() = true;
UPstream::warnComm = oldWarn;
}

12
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
View File

@ -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::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;
}