Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
fb066b30
Commit
fb066b30
authored
May 29, 2014
by
Chris Cantwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/boost_1_55_pulsewave' of /opt/gitlab/repositories/nektar
parents
20a22bb7
eae80617
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
+1
-1
library/MultiRegions/DisContField1D.cpp
library/MultiRegions/DisContField1D.cpp
+2
-4
solvers/PulseWaveSolver/EquationSystems/PulseWaveSystem.cpp
solvers/PulseWaveSolver/EquationSystems/PulseWaveSystem.cpp
+1
-1
No files found.
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
View file @
fb066b30
...
...
@@ -112,7 +112,7 @@ namespace Nektar
if
(
MeshVertId
.
count
(
id
)
>
0
)
{
m_elmtToTrace
[
i
][
j
]
=
boost
::
dynamic_pointer_cast
<
LocalRegions
::
PointExp
>
(
(
*
trace
).
GetExp
(
MeshVertId
.
find
(
id
)
->
second
));
m_elmtToTrace
[
i
][
j
]
=
(
*
trace
).
GetExp
(
MeshVertId
.
find
(
id
)
->
second
)
->
as
<
LocalRegions
::
PointExp
>
(
);
}
else
...
...
library/MultiRegions/DisContField1D.cpp
View file @
fb066b30
...
...
@@ -254,8 +254,7 @@ namespace Nektar
{
set
<
int
>::
iterator
it
;
LocalRegions
::
Expansion0DSharedPtr
traceEl
=
boost
::
dynamic_pointer_cast
<
LocalRegions
::
Expansion0D
>
(
(
m_traceMap
->
GetElmtToTrace
())[
n
][
e
]);
m_traceMap
->
GetElmtToTrace
()[
n
][
e
]
->
as
<
LocalRegions
::
Expansion0D
>
();
bool
fwd
=
true
;
...
...
@@ -815,8 +814,7 @@ namespace Nektar
{
LocalRegions
::
Expansion0DSharedPtr
vertExp
=
boost
::
dynamic_pointer_cast
<
LocalRegions
::
Expansion0D
>
(
elmtToTrace
[
i
][
v
]);
elmtToTrace
[
i
][
v
]
->
as
<
LocalRegions
::
Expansion0D
>
();
if
(
vertExp
->
GetLeftAdjacentElementExp
()
->
GetGeom
()
->
GetGlobalID
()
!=
(
*
m_exp
)[
i
]
->
GetGeom
()
->
GetGlobalID
())
{
...
...
solvers/PulseWaveSolver/EquationSystems/PulseWaveSystem.cpp
View file @
fb066b30
...
...
@@ -288,7 +288,7 @@ namespace Nektar
{
for
(
int
p
=
0
;
p
<
2
;
++
p
)
{
if
(
boost
::
dynamic_pointer_cast
<
LocalRegions
::
Expansion
>
(
m_vessels
[
vesselID
]
->
GetTraceMap
()
->
GetElmtToTrace
()[
n
][
p
])
->
GetGeom
()
->
GetVid
(
0
)
==
vid
)
if
(
m_vessels
[
vesselID
]
->
GetTraceMap
()
->
GetElmtToTrace
()[
n
][
p
]
->
as
<
LocalRegions
::
Expansion
>
(
)
->
GetGeom
()
->
GetVid
(
0
)
==
vid
)
{
int
eid
=
m_vessels
[
vesselID
]
->
GetTraceMap
()
->
GetElmtToTrace
()[
n
][
p
]
->
GetElmtId
();
...
...
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