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

BUG: GAMGSolver: fixed solving on coarsest level

Browse Source
This commit is contained in:
mattijs
2013-02-27 16:13:57 +00:00
parent 540a8a9156
commit cfc708bc09
3 changed files with 174 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,9 +516,6 @@ void Foam::GAMGSolver::solveCoarsestLevel
{
Pout<< "** Processor agglomeration" << endl;
const lduMatrix& allMatrix = allMatrixPtr_();
//const lduMesh& allMesh = allMeshPtr_();
const List<int>& procIDs = UPstream::procID(coarseComm);
scalarField allSource;
@ -535,41 +532,51 @@ void Foam::GAMGSolver::solveCoarsestLevel
if (Pstream::myProcNo(coarseComm) == procIDs[0])
{
const lduMatrix& allMatrix = allMatrixPtr_();
allCorrField.setSize(allSource.size(), 0);
if (allMatrix.asymmetric())
{
coarseSolverPerf = BICCG
(
"coarsestLevelCorr",
allMatrix,
allInterfaceBouCoeffs_,
allInterfaceIntCoeffs_,
allInterfaces_,
tolerance_,
relTol_
).solve
(
allCorrField,
allSource
);
}
else
{
coarseSolverPerf = ICCG
(
"coarsestLevelCorr",
allMatrix,
allInterfaceBouCoeffs_,
allInterfaceIntCoeffs_,
allInterfaces_,
tolerance_,
relTol_
).solve
(
allCorrField,
allSource
);
label solveComm = allMatrix.mesh().comm();
label oldWarn = UPstream::warnComm;
UPstream::warnComm = solveComm;
Pout<< "** Master:Solving on comm:" << solveComm << endl;
if (allMatrix.asymmetric())
{
coarseSolverPerf = BICCG
(
"coarsestLevelCorr",
allMatrix,
allInterfaceBouCoeffs_,
allInterfaceIntCoeffs_,
allInterfaces_,
tolerance_,
relTol_
).solve
(
allCorrField,
allSource
);
}
else
{
coarseSolverPerf = ICCG
(
"coarsestLevelCorr",
allMatrix,
allInterfaceBouCoeffs_,
allInterfaceIntCoeffs_,
allInterfaces_,
tolerance_,
relTol_
).solve
(
allCorrField,
allSource
);
}
UPstream::warnComm = oldWarn;
}
@ -582,6 +589,8 @@ void Foam::GAMGSolver::solveCoarsestLevel
);
for (label i=1; i < procIDs.size(); i++)
{
Pout<< "** master sending to " << procIDs[i] << endl;
OPstream toSlave
(
Pstream::scheduled,
@ -601,10 +610,11 @@ void Foam::GAMGSolver::solveCoarsestLevel
}
else
{
Pout<< "** slave receiving from " << procIDs[0] << endl;
IPstream fromMaster
(
Pstream::scheduled,
0,
procIDs[0],
0, // bufSize
Pstream::msgType(),
coarseComm
@ -612,6 +622,7 @@ void Foam::GAMGSolver::solveCoarsestLevel
fromMaster >> coarsestCorrField;
}
if (debug >= 2)
{
coarseSolverPerf.print(Info(coarseComm));