diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C index 2d5755f31e5b8d5c682736c92ddbac05d55d84cc..0bbd6bafb22e342af8c2fa25c77f66a407ce911f 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -583,15 +583,15 @@ bool Foam::GAMGAgglomeration::checkRestriction labelList& newRestrict, label& nNewCoarse, const lduAddressing& fineAddressing, - const labelUList& restrict, + const labelUList& restriction, const label nCoarse ) { - if (fineAddressing.size() != restrict.size()) + if (fineAddressing.size() != restriction.size()) { FatalErrorInFunction << "nCells:" << fineAddressing.size() - << " agglom:" << restrict.size() + << " agglom:" << restriction.size() << abort(FatalError); } @@ -611,7 +611,7 @@ bool Foam::GAMGAgglomeration::checkRestriction label own = lower[facei]; label nei = upper[facei]; - if (restrict[own] == restrict[nei]) + if (restriction[own] == restriction[nei]) { // coarse-mesh-internal face @@ -640,9 +640,9 @@ bool Foam::GAMGAgglomeration::checkRestriction // Count number of regions/masters per coarse cell labelListList coarseToMasters(nCoarse); nNewCoarse = 0; - forAll(restrict, celli) + forAll(restriction, celli) { - labelList& masters = coarseToMasters[restrict[celli]]; + labelList& masters = coarseToMasters[restriction[celli]]; if (!masters.found(master[celli])) { @@ -678,9 +678,9 @@ bool Foam::GAMGAgglomeration::checkRestriction } newRestrict.setSize(fineAddressing.size()); - forAll(restrict, celli) + forAll(restriction, celli) { - label coarseI = restrict[celli]; + const label coarseI = restriction[celli]; label index = coarseToMasters[coarseI].find(master[celli]); newRestrict[celli] = coarseToNewCoarse[coarseI][index]; diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H index 86694b93479f2daa21b1f03d8069a7026b5264cb..f050128e54af9541790b49c007e038081166c44a 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H @@ -490,7 +490,7 @@ public: labelList& newRestrict, label& nNewCoarse, const lduAddressing& fineAddressing, - const labelUList& restrict, + const labelUList& restriction, const label nCoarse ); };