Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
5c826070
Commit
5c826070
authored
Nov 13, 2018
by
Stéphane Del Pino
Browse files
Options
Downloads
Patches
Plain Diff
Fix another bunch of warnings (clang++-7 -Wextra)
parent
99b8f511
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/mesh/Connectivity.hpp
+13
-13
13 additions, 13 deletions
src/mesh/Connectivity.hpp
src/mesh/ConnectivityMatrix.hpp
+4
-4
4 additions, 4 deletions
src/mesh/ConnectivityMatrix.hpp
src/mesh/ItemToItemMatrix.hpp
+2
-2
2 additions, 2 deletions
src/mesh/ItemToItemMatrix.hpp
with
19 additions
and
19 deletions
src/mesh/Connectivity.hpp
+
13
−
13
View file @
5c826070
...
@@ -319,7 +319,7 @@ class Connectivity final
...
@@ -319,7 +319,7 @@ class Connectivity final
template
<
ItemType
source_item_type
,
template
<
ItemType
source_item_type
,
ItemType
target_item_type
>
ItemType
target_item_type
>
PASTIS_INLINE
PASTIS_INLINE
const
auto
getItemToItemMatrix
()
const
auto
getItemToItemMatrix
()
const
{
{
return
ItemToItemMatrix
<
source_item_type
,
return
ItemToItemMatrix
<
source_item_type
,
target_item_type
>
(
_getMatrix
(
source_item_type
,
target_item_type
>
(
_getMatrix
(
source_item_type
,
...
@@ -327,73 +327,73 @@ class Connectivity final
...
@@ -327,73 +327,73 @@ class Connectivity final
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
cellToFaceMatrix
()
const
auto
cellToFaceMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
cell
,
ItemType
::
face
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
cell
,
ItemType
::
face
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
cellToEdgeMatrix
()
const
auto
cellToEdgeMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
cell
,
ItemType
::
edge
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
cell
,
ItemType
::
edge
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
cellToNodeMatrix
()
const
auto
cellToNodeMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
cell
,
ItemType
::
node
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
cell
,
ItemType
::
node
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
faceToCellMatrix
()
const
auto
faceToCellMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
face
,
ItemType
::
cell
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
face
,
ItemType
::
cell
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
faceToEdgeMatrix
()
const
auto
faceToEdgeMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
face
,
ItemType
::
edge
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
face
,
ItemType
::
edge
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
faceToNodeMatrix
()
const
auto
faceToNodeMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
face
,
ItemType
::
node
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
face
,
ItemType
::
node
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
edgeToCellMatrix
()
const
auto
edgeToCellMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
edge
,
ItemType
::
cell
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
edge
,
ItemType
::
cell
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
edgeToFaceMatrix
()
const
auto
edgeToFaceMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
edge
,
ItemType
::
face
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
edge
,
ItemType
::
face
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
edgeToNodeMatrix
()
const
auto
edgeToNodeMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
edge
,
ItemType
::
node
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
edge
,
ItemType
::
node
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
nodeToCellMatrix
()
const
auto
nodeToCellMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
node
,
ItemType
::
cell
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
node
,
ItemType
::
cell
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
nodeToFaceMatrix
()
const
auto
nodeToFaceMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
node
,
ItemType
::
face
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
node
,
ItemType
::
face
>();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
nodeToEdgeMatrix
()
const
auto
nodeToEdgeMatrix
()
const
{
{
return
this
->
template
getItemToItemMatrix
<
ItemType
::
node
,
ItemType
::
edge
>();
return
this
->
template
getItemToItemMatrix
<
ItemType
::
node
,
ItemType
::
edge
>();
}
}
...
...
This diff is collapsed.
Click to expand it.
src/mesh/ConnectivityMatrix.hpp
+
4
−
4
View file @
5c826070
...
@@ -31,25 +31,25 @@ class ConnectivityMatrix
...
@@ -31,25 +31,25 @@ class ConnectivityMatrix
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
numEntries
()
const
auto
numEntries
()
const
{
{
return
m_host_matrix
.
entries
.
extent
(
0
);
return
m_host_matrix
.
entries
.
extent
(
0
);
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
numRows
()
const
auto
numRows
()
const
{
{
return
m_host_matrix
.
numRows
();
return
m_host_matrix
.
numRows
();
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
rowConst
(
const
size_t
&
j
)
const
auto
rowConst
(
const
size_t
&
j
)
const
{
{
return
m_host_matrix
.
rowConst
(
j
);
return
m_host_matrix
.
rowConst
(
j
);
}
}
PASTIS_INLINE
PASTIS_INLINE
const
auto
rowMap
(
const
size_t
&
j
)
const
const
auto
&
rowMap
(
const
size_t
&
j
)
const
{
{
return
m_host_matrix
.
row_map
[
j
];
return
m_host_matrix
.
row_map
[
j
];
}
}
...
...
This diff is collapsed.
Click to expand it.
src/mesh/ItemToItemMatrix.hpp
+
2
−
2
View file @
5c826070
...
@@ -63,7 +63,7 @@ class ItemToItemMatrix
...
@@ -63,7 +63,7 @@ class ItemToItemMatrix
public
:
public
:
PASTIS_INLINE
PASTIS_INLINE
const
auto
operator
[](
const
SourceItemId
&
source_id
)
const
auto
operator
[](
const
SourceItemId
&
source_id
)
const
{
{
using
RowType
=
decltype
(
m_connectivity_matrix
.
rowConst
(
source_id
));
using
RowType
=
decltype
(
m_connectivity_matrix
.
rowConst
(
source_id
));
return
SubItemList
<
RowType
>
(
m_connectivity_matrix
.
rowConst
(
source_id
));
return
SubItemList
<
RowType
>
(
m_connectivity_matrix
.
rowConst
(
source_id
));
...
@@ -71,7 +71,7 @@ class ItemToItemMatrix
...
@@ -71,7 +71,7 @@ class ItemToItemMatrix
template
<
typename
IndexType
>
template
<
typename
IndexType
>
PASTIS_INLINE
PASTIS_INLINE
const
auto
operator
[](
const
IndexType
&
source_id
)
const
const
auto
&
operator
[](
const
IndexType
&
source_id
)
const
{
{
static_assert
(
std
::
is_same
<
IndexType
,
SourceItemId
>
(),
static_assert
(
std
::
is_same
<
IndexType
,
SourceItemId
>
(),
"ItemToItemMatrix must be indexed using correct ItemId"
);
"ItemToItemMatrix must be indexed using correct ItemId"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment