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
1f9533ed
Commit
1f9533ed
authored
Nov 02, 2018
by
Mark Olesen
Browse files
COMP: avoid ternary mismatch in PatchFunction1
- SubField<vector> vs Field<vector>
parent
b2732419
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/meshTools/PatchFunction1/PatchFunction1.C
View file @
1f9533ed
...
...
@@ -135,10 +135,8 @@ Foam::PatchFunction1<Type>::localPosition(const pointField& globalPos) const
{
return
globalPos
;
}
else
{
return
coordSys_
.
coordSys
()().
localPosition
(
globalPos
);
}
return
coordSys_
.
coordSys
()().
localPosition
(
globalPos
);
}
...
...
@@ -153,13 +151,13 @@ Foam::tmp<Foam::Field<Type>> Foam::PatchFunction1<Type>::transform
return
tfld
;
}
const
pointField
&
fc
=
tmp
<
Field
<
Type
>>
tresult
=
(
faceValues_
?
this
->
patch_
.
faceCentres
()
:
this
->
patch_
.
localPoints
()
?
this
->
coordSys_
.
transform
(
this
->
patch_
.
faceCentres
()
,
tfld
())
:
this
->
coordSys_
.
transform
(
this
->
patch_
.
localPoints
()
,
tfld
())
);
auto
tresult
=
this
->
coordSys_
.
transform
(
fc
,
tfld
());
tfld
.
clear
();
return
tresult
;
}
...
...
@@ -176,13 +174,14 @@ Foam::tmp<Foam::Field<Type>> Foam::PatchFunction1<Type>::transform
return
fld
;
}
const
pointField
&
fc
=
(
faceValues_
?
this
->
patch_
.
faceCentres
()
:
this
->
patch_
.
localPoints
()
);
return
this
->
coordSys_
.
transform
(
fc
,
fld
);
if
(
faceValues_
)
{
return
this
->
coordSys_
.
transform
(
this
->
patch_
.
faceCentres
(),
fld
);
}
else
{
return
this
->
coordSys_
.
transform
(
this
->
patch_
.
localPoints
(),
fld
);
}
}
...
...
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