songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: rename variable to avoid confusion with 'restrict' keyword

Browse Source 
- considered an error by the PGI compiler
This commit is contained in:
Mark Olesen 2019-03-11 17:52:02 +01:00 committed by Andrew Heather
parent 46a853bc80
commit 8b63d63444
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
View File

@ -490,7 +490,7 @@ public:
labelList& newRestrict,
label& nNewCoarse,
const lduAddressing& fineAddressing,
const labelUList& restrict,
const labelUList& restriction,
const label nCoarse
);
};