Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fixed warnings about sign conversion.

Browse Source
This commit is contained in:
Kenneth Moreland 2016-01-14 14:01:28 -07:00
parent a5972e6a15
commit e0184e6648
1 changed files with 69 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx
View File

@ -107,12 +107,16 @@ RectilinearTests()
std::vector<T> xvals, yvals, zvals;
for (std::size_t i = 2; i < nx; i++)
{
for (std::size_t j = 2; j < ny; j++)
{
for (int mx = 0; mx < nm; mx++)
{
for (int my = 0; my < nm; my++)
{
//Do the 2D cases.
vtkm::Id np = i*j, nc = (i-1)*(j-1);
vtkm::Id np = static_cast<vtkm::Id>(i*j);
vtkm::Id nc = static_cast<vtkm::Id>((i-1)*(j-1));
FillArray(xvals, i, mx);
FillArray(yvals, j, my);
@ -124,7 +128,10 @@ RectilinearTests()
ValidateDataSet(ds, 2, np, nc, bounds);
//Test T *
ds = dsb.Create(i,j, &xvals[0],&yvals[0]);
ds = dsb.Create(static_cast<vtkm::Id>(i),
static_cast<vtkm::Id>(j),
&xvals[0],
&yvals[0]);
ValidateDataSet(ds, 2, np, nc, bounds);
//Test ArrayHandle
@ -134,10 +141,11 @@ RectilinearTests()
//Do the 3D cases.
for (std::size_t k = 2; k < nz; k++)
{
for (int mz = 0; mz < nm; mz++)
{
np = i*j*k;
nc = (i-1)*(j-1)*(k-1);
np = static_cast<vtkm::Id>(i*j*k);
nc = static_cast<vtkm::Id>((i-1)*(j-1)*(k-1));
FillArray(zvals, k, mz);
bounds[4] = zvals[0];
bounds[5] = zvals[k-1];
@ -147,7 +155,12 @@ RectilinearTests()
ValidateDataSet(ds, 3, np, nc, bounds);
//Test T *
ds = dsb.Create(i,j,k, &xvals[0],&yvals[0], &zvals[0]);
ds = dsb.Create(static_cast<vtkm::Id>(i),
static_cast<vtkm::Id>(j),
static_cast<vtkm::Id>(k),
&xvals[0],
&yvals[0],
&zvals[0]);
ValidateDataSet(ds, 3, np, nc, bounds);
//Test ArrayHandle
@ -157,6 +170,10 @@ RectilinearTests()
ValidateDataSet(ds, 3, np, nc, bounds);
}
}
}
}
}
}
}
void