Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
f3463e5c
Commit
f3463e5c
authored
Nov 07, 2016
by
Max Lyon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix more warnings
parent
b88bf8c0
Pipeline
#3506
passed with stage
in 3 minutes and 38 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
19 deletions
+20
-19
src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh
src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh
+4
-4
src/OpenVolumeMesh/FileManager/FileManagerT.cc
src/OpenVolumeMesh/FileManager/FileManagerT.cc
+16
-15
No files found.
src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh
View file @
f3463e5c
...
...
@@ -318,14 +318,14 @@ public:
public:
/// Access the i'th element. No range check is performed!
reference
operator
[](
in
t
_idx
)
{
assert
(
size_t
(
_idx
)
<
data_
.
size
());
reference
operator
[](
size_
t
_idx
)
{
assert
(
_idx
<
data_
.
size
());
return
data_
[
_idx
];
}
/// Const access to the i'th element. No range check is performed!
const_reference
operator
[](
in
t
_idx
)
const
{
assert
(
size_t
(
_idx
)
<
data_
.
size
());
const_reference
operator
[](
size_
t
_idx
)
const
{
assert
(
_idx
<
data_
.
size
());
return
data_
[
_idx
];
}
...
...
src/OpenVolumeMesh/FileManager/FileManagerT.cc
View file @
f3463e5c
...
...
@@ -48,6 +48,7 @@
#include <algorithm>
#include <cctype>
#include <typeinfo>
#include <stdint.h>
#include <OpenVolumeMesh/Geometry/VectorT.hh>
#include <OpenVolumeMesh/Mesh/PolyhedralMesh.hh>
...
...
@@ -77,7 +78,7 @@ bool FileManager::readFile(const std::string& _filename, MeshT& _mesh,
std
::
stringstream
sstr
;
std
::
string
line
;
std
::
string
s_tmp
;
u
nsigned
in
t
c
=
0u
;
u
int64_
t
c
=
0u
;
typedef
typename
MeshT
::
PointT
Point
;
Point
v
=
Point
(
0.0
,
0.0
,
0.0
);
...
...
@@ -143,7 +144,7 @@ bool FileManager::readFile(const std::string& _filename, MeshT& _mesh,
sstr
>>
c
;
// Read in vertices
for
(
u
nsigned
in
t
i
=
0u
;
i
<
c
;
++
i
)
{
for
(
u
int64_
t
i
=
0u
;
i
<
c
;
++
i
)
{
getCleanLine
(
iff
,
line
);
sstr
.
clear
();
...
...
@@ -176,10 +177,10 @@ bool FileManager::readFile(const std::string& _filename, MeshT& _mesh,
sstr
>>
c
;
// Read in edges
for
(
u
nsigned
in
t
i
=
0u
;
i
<
c
;
++
i
)
{
for
(
u
int64_
t
i
=
0u
;
i
<
c
;
++
i
)
{
unsigned
int
v1
=
0
;
unsigned
int
v2
=
0
;
unsigned
int
v1
=
0
;
unsigned
int
v2
=
0
;
getCleanLine
(
iff
,
line
);
sstr
.
clear
();
sstr
.
str
(
line
);
...
...
@@ -210,7 +211,7 @@ bool FileManager::readFile(const std::string& _filename, MeshT& _mesh,
sstr
>>
c
;
// Read in faces
for
(
u
nsigned
in
t
i
=
0u
;
i
<
c
;
++
i
)
{
for
(
u
int64_
t
i
=
0u
;
i
<
c
;
++
i
)
{
getCleanLine
(
iff
,
line
);
sstr
.
clear
();
...
...
@@ -219,7 +220,7 @@ bool FileManager::readFile(const std::string& _filename, MeshT& _mesh,
std
::
vector
<
HalfEdgeHandle
>
hes
;
// Get face valence
u
nsigned
in
t
val
=
0u
;
u
int64_
t
val
=
0u
;
sstr
>>
val
;
// Read half-edge indices
...
...
@@ -255,7 +256,7 @@ bool FileManager::readFile(const std::string& _filename, MeshT& _mesh,
sstr
>>
c
;
// Read in cells
for
(
u
nsigned
in
t
i
=
0u
;
i
<
c
;
++
i
)
{
for
(
u
int64_
t
i
=
0u
;
i
<
c
;
++
i
)
{
getCleanLine
(
iff
,
line
);
sstr
.
clear
();
...
...
@@ -264,7 +265,7 @@ bool FileManager::readFile(const std::string& _filename, MeshT& _mesh,
std
::
vector
<
HalfFaceHandle
>
hfs
;
// Get cell valence
u
nsigned
in
t
val
=
0u
;
u
int64_
t
val
=
0u
;
sstr
>>
val
;
// Read half-face indices
...
...
@@ -409,7 +410,7 @@ bool FileManager::writeFile(const std::string& _filename, const MeshT& _mesh) co
// Write header
off
<<
"OVM ASCII"
<<
std
::
endl
;
u
nsigned
in
t
n_vertices
(
_mesh
.
n_vertices
());
u
int64_
t
n_vertices
(
_mesh
.
n_vertices
());
off
<<
"Vertices"
<<
std
::
endl
;
off
<<
n_vertices
<<
std
::
endl
;
...
...
@@ -422,7 +423,7 @@ bool FileManager::writeFile(const std::string& _filename, const MeshT& _mesh) co
off
<<
v
[
0
]
<<
" "
<<
v
[
1
]
<<
" "
<<
v
[
2
]
<<
std
::
endl
;
}
u
nsigned
in
t
n_edges
(
_mesh
.
n_edges
());
u
int64_
t
n_edges
(
_mesh
.
n_edges
());
off
<<
"Edges"
<<
std
::
endl
;
off
<<
n_edges
<<
std
::
endl
;
...
...
@@ -434,14 +435,14 @@ bool FileManager::writeFile(const std::string& _filename, const MeshT& _mesh) co
off
<<
from_vertex
<<
" "
<<
to_vertex
<<
std
::
endl
;
}
u
nsigned
in
t
n_faces
(
_mesh
.
n_faces
());
u
int64_
t
n_faces
(
_mesh
.
n_faces
());
off
<<
"Faces"
<<
std
::
endl
;
off
<<
n_faces
<<
std
::
endl
;
// write faces
for
(
FaceIter
f_it
=
_mesh
.
f_iter
();
f_it
;
++
f_it
)
{
off
<<
_mesh
.
face
(
*
f_it
).
halfedges
().
size
(
)
<<
" "
;
off
<<
static_cast
<
uint64_t
>
(
_mesh
.
face
(
*
f_it
).
halfedges
().
size
()
)
<<
" "
;
std
::
vector
<
HalfEdgeHandle
>
halfedges
=
_mesh
.
face
(
*
f_it
).
halfedges
();
...
...
@@ -457,13 +458,13 @@ bool FileManager::writeFile(const std::string& _filename, const MeshT& _mesh) co
off
<<
std
::
endl
;
}
u
nsigned
in
t
n_cells
(
_mesh
.
n_cells
());
u
int64_
t
n_cells
(
_mesh
.
n_cells
());
off
<<
"Polyhedra"
<<
std
::
endl
;
off
<<
n_cells
<<
std
::
endl
;
for
(
CellIter
c_it
=
_mesh
.
c_iter
();
c_it
;
++
c_it
)
{
off
<<
_mesh
.
cell
(
*
c_it
).
halffaces
().
size
(
)
<<
" "
;
off
<<
static_cast
<
uint64_t
>
(
_mesh
.
cell
(
*
c_it
).
halffaces
().
size
()
)
<<
" "
;
std
::
vector
<
HalfFaceHandle
>
halffaces
=
_mesh
.
cell
(
*
c_it
).
halffaces
();
...
...
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