Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
f1b89140
Commit
f1b89140
authored
May 24, 2019
by
Jan Möbius
Browse files
Merge branch 'cleanup' into 'master'
Cleanup See merge request
!58
parents
6ff4e080
bb7ce30a
Pipeline
#10514
failed with stage
in 4 minutes
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CI/ci-cppcheck.sh
View file @
f1b89140
...
...
@@ -38,7 +38,7 @@ echo "CPPCHECK Summary"
echo
"=============================================================================="
echo
-e
"
${
NC
}
"
if
[
$COUNT
-gt
70
]
;
then
if
[
$COUNT
-gt
5
]
;
then
echo
-e
${
WARNING
}
echo
"Total CPPCHECK error Count is
$COUNT
, which is too High! CPPCHECK Run failed"
;
echo
-e
"
${
NC
}
"
...
...
src/OpenVolumeMesh/Core/GeometryKernel.hh
View file @
f1b89140
...
...
@@ -32,14 +32,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* $LastChangedBy$ *
* *
\*===========================================================================*/
#ifndef GEOMETRYKERNEL_HH_
#define GEOMETRYKERNEL_HH_
...
...
@@ -71,7 +63,7 @@ public:
}
/// Override of empty add_vertex function
virtual
VertexHandle
add_vertex
()
{
return
add_vertex
(
VecT
());
}
VertexHandle
add_vertex
()
override
{
return
add_vertex
(
VecT
());
}
/// Add a geometric point to the mesh
VertexHandle
add_vertex
(
const
VecT
&
_p
)
{
...
...
@@ -96,7 +88,7 @@ public:
return
vertices_
[
_vh
.
idx
()];
}
virtual
VertexIter
delete_vertex
(
const
VertexHandle
&
_h
)
{
VertexIter
delete_vertex
(
const
VertexHandle
&
_h
)
override
{
assert
(
_h
.
idx
()
<
(
int
)
TopologyKernelT
::
n_vertices
());
VertexIter
nV
=
TopologyKernelT
::
delete_vertex
(
_h
);
...
...
@@ -111,7 +103,7 @@ public:
return
nV
;
}
virtual
void
collect_garbage
()
void
collect_garbage
()
override
{
if
(
!
TopologyKernelT
::
needs_garbage_collection
())
return
;
...
...
@@ -130,7 +122,7 @@ public:
}
virtual
void
swap_vertex_indices
(
VertexHandle
_h1
,
VertexHandle
_h2
)
void
swap_vertex_indices
(
VertexHandle
_h1
,
VertexHandle
_h2
)
override
{
assert
(
_h1
.
idx
()
>=
0
&&
_h1
.
idx
()
<
(
int
)
vertices_
.
size
());
assert
(
_h2
.
idx
()
>=
0
&&
_h2
.
idx
()
<
(
int
)
vertices_
.
size
());
...
...
@@ -145,7 +137,7 @@ public:
protected:
virtual
void
delete_multiple_vertices
(
const
std
::
vector
<
bool
>&
_tag
)
{
void
delete_multiple_vertices
(
const
std
::
vector
<
bool
>&
_tag
)
override
{
assert
(
_tag
.
size
()
==
TopologyKernelT
::
n_vertices
());
...
...
@@ -171,7 +163,7 @@ protected:
public:
virtual
void
clear
(
bool
_clearProps
=
true
)
{
void
clear
(
bool
_clearProps
=
true
)
override
{
vertices_
.
clear
();
TopologyKernelT
::
clear
(
_clearProps
);
...
...
src/OpenVolumeMesh/Core/OpenVolumeMeshBaseProperty.hh
View file @
f1b89140
...
...
@@ -83,6 +83,9 @@ public:
/// Resize storage to hold n elements.
virtual
void
resize
(
size_t
_n
)
=
0
;
/// Return underlying container size
virtual
size_t
size
()
const
=
0
;
/// Clear all elements and free memory.
virtual
void
clear
()
=
0
;
...
...
src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh
View file @
f1b89140
...
...
@@ -85,40 +85,39 @@ public:
public:
// inherited from OpenVolumeMeshBaseProperty
virtual
void
reserve
(
size_t
_n
)
{
void
reserve
(
size_t
_n
)
override
{
data_
.
reserve
(
_n
);
}
virtual
void
resize
(
size_t
_n
)
{
void
resize
(
size_t
_n
)
override
{
data_
.
resize
(
_n
,
def_
);
}
virtual
size_t
size
()
const
{
size_t
size
()
const
override
{
return
data_
.
size
();
}
virtual
void
clear
()
{
void
clear
()
override
{
data_
.
clear
();
vector_type
().
swap
(
data_
);
}
virtual
void
push_back
()
{
void
push_back
()
override
{
data_
.
push_back
(
def_
);
}
virtual
void
swap
(
size_t
_i0
,
size_t
_i1
)
{
void
swap
(
size_t
_i0
,
size_t
_i1
)
override
{
std
::
swap
(
data_
[
_i0
],
data_
[
_i1
]);
}
virtual
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
)
{
data_
[
_dst_idx
]
=
data_
[
_src_idx
];
}
void
delete_element
(
size_t
_idx
)
{
void
delete_element
(
size_t
_idx
)
override
{
data_
.
erase
(
data_
.
begin
()
+
_idx
);
}
public:
virtual
size_t
n_elements
()
const
{
size_t
n_elements
()
const
override
{
return
data_
.
size
();
}
virtual
size_t
element_size
()
const
{
size_t
element_size
()
const
override
{
return
sizeof
(
T
);
}
...
...
@@ -131,18 +130,18 @@ public:
};
#endif
virtual
size_t
size_of
()
const
{
size_t
size_of
()
const
override
{
if
(
element_size
()
!=
OpenVolumeMeshBaseProperty
::
UnknownSize
)
return
this
->
OpenVolumeMeshBaseProperty
::
size_of
(
n_elements
());
return
std
::
accumulate
(
data_
.
begin
(),
data_
.
end
(),
size_t
(
0
),
plus
());
}
virtual
size_t
size_of
(
size_t
_n_elem
)
const
{
size_t
size_of
(
size_t
_n_elem
)
const
override
{
return
this
->
OpenVolumeMeshBaseProperty
::
size_of
(
_n_elem
);
}
// Function to serialize a property
virtual
void
serialize
(
std
::
ostream
&
_ostr
)
const
{
void
serialize
(
std
::
ostream
&
_ostr
)
const
override
{
for
(
typename
vector_type
::
const_iterator
it
=
data_
.
begin
();
it
!=
data_
.
end
();
++
it
)
{
OpenVolumeMesh
::
serialize
(
_ostr
,
*
it
)
<<
std
::
endl
;
...
...
@@ -150,7 +149,7 @@ public:
}
// Function to deserialize a property
virtual
void
deserialize
(
std
::
istream
&
_istr
)
{
void
deserialize
(
std
::
istream
&
_istr
)
override
{
for
(
unsigned
int
i
=
0
;
i
<
n_elements
();
++
i
)
{
OpenVolumeMesh
::
deserialize
(
_istr
,
data_
[
i
]);
}
...
...
@@ -187,7 +186,7 @@ public:
}
/// Make a copy of self.
OpenVolumeMeshPropertyT
<
T
>*
clone
()
const
{
OpenVolumeMeshPropertyT
<
T
>*
clone
()
const
override
{
OpenVolumeMeshPropertyT
<
T
>*
p
=
new
OpenVolumeMeshPropertyT
<
T
>
(
*
this
);
return
p
;
}
...
...
@@ -203,7 +202,7 @@ public:
protected:
/// Delete multiple entries in list
virtual
void
delete_multiple_entries
(
const
std
::
vector
<
bool
>&
_tags
)
{
void
delete_multiple_entries
(
const
std
::
vector
<
bool
>&
_tags
)
override
{
assert
(
_tags
.
size
()
==
data_
.
size
());
vector_type
new_data
;
...
...
src/OpenVolumeMesh/Core/PropertyDefines.hh
View file @
f1b89140
...
...
@@ -90,10 +90,10 @@ public:
{}
using
PropertyHandleT
=
OpenVolumeMesh
::
PropHandleT
<
Entity
>
;
PropertyTT
(
const
std
::
string
&
_name
,
const
std
::
string
&
_internal_type_name
,
ResourceManager
&
_resMan
,
PropertyHandleT
_handle
,
const
T
_def
=
T
());
virtual
~
PropertyTT
()
=
default
;
virtual
BaseProperty
*
clone
(
ResourceManager
&
_resMan
,
OpenVolumeMeshHandle
_handle
)
const
;
virtual
const
std
::
string
entityType
()
const
{
return
entityTypeName
<
Entity
>
();
}
virtual
const
std
::
string
typeNameWrapper
()
const
{
return
typeName
<
T
>
();
}
~
PropertyTT
()
override
=
default
;
BaseProperty
*
clone
(
ResourceManager
&
_resMan
,
OpenVolumeMeshHandle
_handle
)
const
override
;
const
std
::
string
entityType
()
const
override
{
return
entityTypeName
<
Entity
>
();
}
const
std
::
string
typeNameWrapper
()
const
override
{
return
typeName
<
T
>
();
}
private:
PropertyTT
(
OpenVolumeMeshPropertyT
<
T
>
*
_prop
,
ResourceManager
&
_resMan
,
PropertyHandleT
_handle
);
};
...
...
src/OpenVolumeMesh/Core/PropertyPtr.hh
View file @
f1b89140
...
...
@@ -75,23 +75,23 @@ public:
PropertyPtr
(
PropT
*
_ptr
,
ResourceManager
&
_resMan
,
PropHandleT
<
Entity
>
_handle
);
/// Destructor
virtual
~
PropertyPtr
();
~
PropertyPtr
()
override
;
using
ptr
::
shared_ptr
<
PropT
>::
operator
*
;
using
ptr
::
shared_ptr
<
PropT
>::
operator
->
;
using
ptr
::
shared_ptr
<
PropT
>::
operator
bool
;
virtual
const
std
::
string
&
name
()
const
;
const
std
::
string
&
name
()
const
override
;
virtual
void
delete_element
(
size_t
_idx
);
void
delete_element
(
size_t
_idx
)
override
;
virtual
void
swap_elements
(
size_t
_idx0
,
size_t
_idx1
);
void
swap_elements
(
size_t
_idx0
,
size_t
_idx1
)
override
;
virtual
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
);
void
copy
(
size_t
_src_idx
,
size_t
_dst_idx
)
override
;
const_iterator
begin
()
const
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
begin
();
}
iterator
begin
()
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
begin
();
}
size_t
size
()
const
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
size
();
}
size_t
size
()
const
override
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
size
();
}
const_iterator
end
()
const
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
end
();
}
iterator
end
()
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
end
();
}
...
...
@@ -104,26 +104,26 @@ public:
reference
operator
[](
const
EntityHandleT
&
_h
)
{
return
(
*
ptr
::
shared_ptr
<
PropT
>::
get
())[
_h
.
idx
()];
}
const_reference
operator
[](
const
EntityHandleT
&
_h
)
const
{
return
(
*
ptr
::
shared_ptr
<
PropT
>::
get
())[
_h
.
uidx
()];
}
virtual
void
serialize
(
std
::
ostream
&
_ostr
)
const
{
ptr
::
shared_ptr
<
PropT
>::
get
()
->
serialize
(
_ostr
);
}
virtual
void
deserialize
(
std
::
istream
&
_istr
)
{
ptr
::
shared_ptr
<
PropT
>::
get
()
->
deserialize
(
_istr
);
}
void
serialize
(
std
::
ostream
&
_ostr
)
const
override
{
ptr
::
shared_ptr
<
PropT
>::
get
()
->
serialize
(
_ostr
);
}
void
deserialize
(
std
::
istream
&
_istr
)
override
{
ptr
::
shared_ptr
<
PropT
>::
get
()
->
deserialize
(
_istr
);
}
virtual
OpenVolumeMeshHandle
handle
()
const
;
OpenVolumeMeshHandle
handle
()
const
override
;
virtual
bool
persistent
()
const
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
persistent
();
}
bool
persistent
()
const
override
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
persistent
();
}
virtual
bool
anonymous
()
const
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
name
().
empty
();
}
bool
anonymous
()
const
override
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
name
().
empty
();
}
protected:
virtual
const
std
::
string
&
internal_type_name
()
const
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
internal_type_name
();
}
const
std
::
string
&
internal_type_name
()
const
override
{
return
ptr
::
shared_ptr
<
PropT
>::
get
()
->
internal_type_name
();
}
void
assign_values_from
(
const
BaseProperty
*
other
)
override
;
void
move_values_from
(
BaseProperty
*
other
)
override
;
virtual
void
delete_multiple_entries
(
const
std
::
vector
<
bool
>&
_tags
);
void
delete_multiple_entries
(
const
std
::
vector
<
bool
>&
_tags
)
override
;
virtual
void
resize
(
size_t
_size
);
void
resize
(
size_t
_size
)
override
;
virtual
void
set_handle
(
const
OpenVolumeMeshHandle
&
_handle
);
void
set_handle
(
const
OpenVolumeMeshHandle
&
_handle
)
override
;
};
}
// Namespace OpenVolumeMesh
...
...
src/OpenVolumeMesh/Core/TopologyKernel.hh
View file @
f1b89140
...
...
@@ -32,14 +32,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* $LastChangedBy$ *
* *
\*===========================================================================*/
#ifndef TOPOLOGYKERNEL_HH_
#define TOPOLOGYKERNEL_HH_
...
...
@@ -58,7 +50,7 @@ class TopologyKernel : public ResourceManager {
public:
TopologyKernel
()
=
default
;
virtual
~
TopologyKernel
()
=
default
;
~
TopologyKernel
()
override
=
default
;
TopologyKernel
&
operator
=
(
const
TopologyKernel
&
)
=
default
;
...
...
@@ -325,17 +317,17 @@ public:
*/
/// Get number of vertices in mesh
virtual
size_t
n_vertices
()
const
{
return
n_vertices_
;
}
size_t
n_vertices
()
const
override
{
return
n_vertices_
;
}
/// Get number of edges in mesh
virtual
size_t
n_edges
()
const
{
return
edges_
.
size
();
}
size_t
n_edges
()
const
override
{
return
edges_
.
size
();
}
/// Get number of halfedges in mesh
virtual
size_t
n_halfedges
()
const
{
return
edges_
.
size
()
*
2u
;
}
size_t
n_halfedges
()
const
override
{
return
edges_
.
size
()
*
2u
;
}
/// Get number of faces in mesh
virtual
size_t
n_faces
()
const
{
return
faces_
.
size
();
}
size_t
n_faces
()
const
override
{
return
faces_
.
size
();
}
/// Get number of halffaces in mesh
virtual
size_t
n_halffaces
()
const
{
return
faces_
.
size
()
*
2u
;
}
size_t
n_halffaces
()
const
override
{
return
faces_
.
size
()
*
2u
;
}
/// Get number of cells in mesh
virtual
size_t
n_cells
()
const
{
return
cells_
.
size
();
}
size_t
n_cells
()
const
override
{
return
cells_
.
size
();
}
/// Get number of undeleted vertices in mesh
size_t
n_logical_vertices
()
const
{
return
n_vertices_
-
n_deleted_vertices_
;
}
...
...
@@ -880,17 +872,17 @@ public:
size_t
n_vertices_in_cell
(
const
CellHandle
&
_ch
)
const
{
assert
(
_ch
.
is_valid
()
&&
(
size_t
)
_ch
.
idx
()
<
cells_
.
size
());
std
::
set
<
VertexHandle
>
v
ertice
s
;
std
::
set
<
VertexHandle
>
v
h
s
;
std
::
vector
<
HalfFaceHandle
>
hfs
=
cell
(
_ch
).
halffaces
();
for
(
std
::
vector
<
HalfFaceHandle
>::
const_iterator
hf_it
=
hfs
.
begin
();
hf_it
!=
hfs
.
end
();
++
hf_it
)
{
std
::
vector
<
HalfEdgeHandle
>
hes
=
halfface
(
*
hf_it
).
halfedges
();
for
(
std
::
vector
<
HalfEdgeHandle
>::
const_iterator
he_it
=
hes
.
begin
();
he_it
!=
hes
.
end
();
++
he_it
)
{
v
ertice
s
.
insert
(
halfedge
(
*
he_it
).
to_vertex
());
v
h
s
.
insert
(
halfedge
(
*
he_it
).
to_vertex
());
}
}
return
v
ertice
s
.
size
();
return
v
h
s
.
size
();
}
//=========================================================================
...
...
src/OpenVolumeMesh/Mesh/HexahedralMeshTopologyKernel.hh
View file @
f1b89140
...
...
@@ -106,13 +106,13 @@ public:
~
HexahedralMeshTopologyKernel
();
// Overridden function
virtual
FaceHandle
add_face
(
const
std
::
vector
<
HalfEdgeHandle
>&
_halfedges
,
bool
_topologyCheck
=
false
);
FaceHandle
add_face
(
const
std
::
vector
<
HalfEdgeHandle
>&
_halfedges
,
bool
_topologyCheck
=
false
)
override
;
// Overridden function
virtual
FaceHandle
add_face
(
const
std
::
vector
<
VertexHandle
>&
_vertices
);
FaceHandle
add_face
(
const
std
::
vector
<
VertexHandle
>&
_vertices
)
override
;
/// Overridden function
virtual
CellHandle
add_cell
(
const
std
::
vector
<
HalfFaceHandle
>&
_halffaces
,
bool
_topologyCheck
=
false
);
CellHandle
add_cell
(
const
std
::
vector
<
HalfFaceHandle
>&
_halffaces
,
bool
_topologyCheck
=
false
)
override
;
private:
...
...
src/OpenVolumeMesh/Mesh/TetrahedralMeshTopologyKernel.hh
View file @
f1b89140
...
...
@@ -69,16 +69,14 @@ public:
// Destructor
~
TetrahedralMeshTopologyKernel
();
// Overridden function
virtual
FaceHandle
add_face
(
const
std
::
vector
<
HalfEdgeHandle
>&
_halfedges
,
bool
_topologyCheck
=
false
);
FaceHandle
add_face
(
const
std
::
vector
<
HalfEdgeHandle
>&
_halfedges
,
bool
_topologyCheck
=
false
)
override
;
// Overridden function
virtual
FaceHandle
add_face
(
const
std
::
vector
<
VertexHandle
>&
_vertices
);
FaceHandle
add_face
(
const
std
::
vector
<
VertexHandle
>&
_vertices
)
override
;
// Overridden function
virtual
CellHandle
add_cell
(
const
std
::
vector
<
HalfFaceHandle
>&
_halffaces
,
bool
_topologyCheck
=
false
);
CellHandle
add_cell
(
const
std
::
vector
<
HalfFaceHandle
>&
_halffaces
,
bool
_topologyCheck
=
false
)
override
;
CellHandle
add_cell
(
const
std
::
vector
<
VertexHandle
>&
_vertices
,
bool
_topologyCheck
=
false
);
CellHandle
add_cell
(
VertexHandle
_vh0
,
VertexHandle
_vh1
,
VertexHandle
_vh2
,
VertexHandle
_vh3
,
bool
_topologyCheck
=
false
);
HalfFaceHandle
add_halfface
(
const
std
::
vector
<
HalfEdgeHandle
>&
_halfedges
,
bool
_topologyCheck
=
false
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment