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
Todd Kordenbrock
VTK-m
Commits
611618c4
Commit
611618c4
authored
Dec 11, 2015
by
dpugmire
Browse files
compiler warnings.
parent
64b52248
Changes
1
Show whitespace changes
Inline
Side-by-side
vtkm/cont/DataSetBuilderExplicit.h
View file @
611618c4
...
...
@@ -116,8 +116,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
typedef
vtkm
::
Vec
<
vtkm
::
Float32
,
3
>
CoordType
;
std
::
vector
<
CoordType
>
coords
(
xVals
.
size
());
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
for
(
vtkm
::
Id
i
=
0
;
i
<
nPts
;
i
++
)
for
(
size_t
i
=
0
;
i
<
coords
.
size
();
i
++
)
{
coords
[
i
][
0
]
=
xVals
[
i
];
coords
[
i
][
1
]
=
yVals
[
i
];
...
...
@@ -176,7 +175,6 @@ DataSetBuilderExplicit::Create(const std::vector<vtkm::Vec<T,3> > &coords,
{
vtkm
::
cont
::
DataSet
dataSet
;
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
vtkm
::
cont
::
ArrayHandle
<
Vec
<
T
,
3
>
>
coordsArray
;
DFA
::
Copy
(
vtkm
::
cont
::
make_ArrayHandle
(
coords
),
coordsArray
);
...
...
@@ -208,8 +206,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
typedef
vtkm
::
Vec
<
vtkm
::
Float32
,
3
>
CoordType
;
std
::
vector
<
CoordType
>
coords
(
xVals
.
size
());
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
for
(
vtkm
::
Id
i
=
0
;
i
<
nPts
;
i
++
)
for
(
size_t
i
=
0
;
i
<
xVals
.
size
();
i
++
)
{
coords
[
i
][
0
]
=
xVals
[
i
];
coords
[
i
][
1
]
=
yVals
[
i
];
...
...
@@ -218,6 +215,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
dataSet
.
AddCoordinateSystem
(
vtkm
::
cont
::
CoordinateSystem
(
coordsNm
,
1
,
coords
));
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
vtkm
::
cont
::
CellSetExplicit
<>
cellSet
(
nPts
,
cellNm
,
2
);
cellSet
.
FillViaCopy
(
shapes
,
numIndices
,
connectivity
);
dataSet
.
AddCellSet
(
cellSet
);
...
...
@@ -245,8 +243,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
typedef
vtkm
::
Vec
<
vtkm
::
Float32
,
3
>
CoordType
;
std
::
vector
<
CoordType
>
coords
(
xVals
.
size
());
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
for
(
vtkm
::
Id
i
=
0
;
i
<
nPts
;
i
++
)
for
(
size_t
i
=
0
;
i
<
coords
.
size
();
i
++
)
{
coords
[
i
][
0
]
=
xVals
[
i
];
coords
[
i
][
1
]
=
yVals
[
i
];
...
...
@@ -255,6 +252,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
dataSet
.
AddCoordinateSystem
(
vtkm
::
cont
::
CoordinateSystem
(
coordsNm
,
1
,
coords
));
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
vtkm
::
cont
::
CellSetExplicit
<>
cellSet
(
nPts
,
cellNm
,
2
);
cellSet
.
FillViaCopy
(
shapes
,
numIndices
,
connectivity
);
dataSet
.
AddCellSet
(
cellSet
);
...
...
@@ -273,13 +271,13 @@ DataSetBuilderExplicit::Create(const std::vector<vtkm::Vec<T,3> > &coords,
{
vtkm
::
cont
::
DataSet
dataSet
;
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
vtkm
::
cont
::
ArrayHandle
<
Vec
<
T
,
3
>
>
coordsArray
;
DFA
::
Copy
(
vtkm
::
cont
::
make_ArrayHandle
(
coords
),
coordsArray
);
dataSet
.
AddCoordinateSystem
(
vtkm
::
cont
::
CoordinateSystem
(
coordsNm
,
1
,
coordsArray
));
vtkm
::
Id
nPts
=
static_cast
<
vtkm
::
Id
>
(
coords
.
size
());
vtkm
::
cont
::
CellSetExplicit
<>
cellSet
(
nPts
,
cellNm
,
2
);
cellSet
.
FillViaCopy
(
shapes
,
numIndices
,
connectivity
);
dataSet
.
AddCellSet
(
cellSet
);
...
...
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