Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
8b63d634
Commit
8b63d634
authored
Mar 11, 2019
by
Mark Olesen
Committed by
Andrew Heather
Mar 11, 2019
Browse files
COMP: rename variable to avoid confusion with 'restrict' keyword
- considered an error by the PGI compiler
parent
46a853bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
View file @
8b63d634
...
...
@@ -583,15 +583,15 @@ bool Foam::GAMGAgglomeration::checkRestriction
labelList
&
newRestrict
,
label
&
nNewCoarse
,
const
lduAddressing
&
fineAddressing
,
const
labelUList
&
restrict
,
const
labelUList
&
restrict
ion
,
const
label
nCoarse
)
{
if
(
fineAddressing
.
size
()
!=
restrict
.
size
())
if
(
fineAddressing
.
size
()
!=
restrict
ion
.
size
())
{
FatalErrorInFunction
<<
"nCells:"
<<
fineAddressing
.
size
()
<<
" agglom:"
<<
restrict
.
size
()
<<
" agglom:"
<<
restrict
ion
.
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
(
restrict
ion
[
own
]
==
restrict
ion
[
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
(
restrict
ion
,
celli
)
{
labelList
&
masters
=
coarseToMasters
[
restrict
[
celli
]];
labelList
&
masters
=
coarseToMasters
[
restrict
ion
[
celli
]];
if
(
!
masters
.
found
(
master
[
celli
]))
{
...
...
@@ -678,9 +678,9 @@ bool Foam::GAMGAgglomeration::checkRestriction
}
newRestrict
.
setSize
(
fineAddressing
.
size
());
forAll
(
restrict
,
celli
)
forAll
(
restrict
ion
,
celli
)
{
label
coarseI
=
restrict
[
celli
];
const
label
coarseI
=
restrict
ion
[
celli
];
label
index
=
coarseToMasters
[
coarseI
].
find
(
master
[
celli
]);
newRestrict
[
celli
]
=
coarseToNewCoarse
[
coarseI
][
index
];
...
...
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
View file @
8b63d634
...
...
@@ -490,7 +490,7 @@ public:
labelList
&
newRestrict
,
label
&
nNewCoarse
,
const
lduAddressing
&
fineAddressing
,
const
labelUList
&
restrict
,
const
labelUList
&
restrict
ion
,
const
label
nCoarse
);
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment