Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
633d308d
Commit
633d308d
authored
Jan 29, 2020
by
Kilian Weishaupt
Browse files
[assembly] Resolve deprecation warnings
parent
ac5a3864
Changes
2
Hide whitespace changes
Inline
Side-by-side
dumux/assembly/fvassembler.hh
View file @
633d308d
...
...
@@ -31,7 +31,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/discretization/method.hh>
#include <dumux/parallel/ve
rtex
handle
s
.hh>
#include <dumux/parallel/ve
ctorcommdata
handle.hh>
#include "jacobianpattern.hh"
#include "diffmethod.hh"
...
...
@@ -191,8 +191,8 @@ public:
if
(
isBox
&&
gridView
().
comm
().
size
()
>
1
)
{
using
VertexMapper
=
typename
GridGeometry
::
VertexMapper
;
Ve
rtexHandleSum
<
typename
SolutionVector
::
block_type
,
SolutionVector
,
VertexMapper
>
sumResidualHandle
(
residual
,
gridGeometry_
->
vertexMapper
());
Ve
ctorCommDataHandleSum
<
VertexMapper
,
SolutionVector
,
GridGeometry
::
GridView
::
dimension
>
sumResidualHandle
(
gridGeometry_
->
vertexMapper
()
,
residual
);
gridView
().
communicate
(
sumResidualHandle
,
Dune
::
InteriorBorder_InteriorBorder_Interface
,
Dune
::
ForwardCommunication
);
...
...
dumux/assembly/partialreassembler.hh
View file @
633d308d
...
...
@@ -32,7 +32,7 @@
#include <dumux/common/typetraits/isvalid.hh>
#include <dumux/discretization/method.hh>
#include <dumux/parallel/ve
rtex
handle
s
.hh>
#include <dumux/parallel/ve
ctorcommdata
handle.hh>
#include "entitycolor.hh"
...
...
@@ -181,8 +181,8 @@ public:
// at this point we communicate the yellow vertices to the
// neighboring processes because a neigbor process may not see
// the red vertex for yellow border vertices
Ve
rtexHandleMin
<
EntityColo
r
,
std
::
vector
<
EntityColor
>
,
VertexMapper
>
minHandle
(
vertex
Color_
,
vertex
Mapper
);
Ve
ctorCommDataHandleMin
<
VertexMappe
r
,
std
::
vector
<
EntityColor
>
,
dim
>
minHandle
(
vertex
Mapper
,
vertex
Color_
);
gridView
.
communicate
(
minHandle
,
Dune
::
InteriorBorder_InteriorBorder_Interface
,
Dune
::
ForwardCommunication
);
...
...
@@ -235,8 +235,8 @@ public:
}
// demote the border orange vertices
Ve
rtexHandleMax
<
EntityColo
r
,
std
::
vector
<
EntityColor
>
,
VertexMapper
>
maxHandle
(
vertex
Color_
,
vertex
Mapper
);
Ve
ctorCommDataHandleMax
<
VertexMappe
r
,
std
::
vector
<
EntityColor
>
,
dim
>
maxHandle
(
vertex
Mapper
,
vertex
Color_
);
gridView
.
communicate
(
maxHandle
,
Dune
::
InteriorBorder_InteriorBorder_Interface
,
Dune
::
ForwardCommunication
);
...
...
Write
Preview
Supports
Markdown
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