Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,836 Commits 8 Branches 22 Tags 30 MiB
fd311f5716
Commit Graph

3836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allison Vacanti
fcee1cd5e9 Deduce device adapter tag in interop::TransferToOpenGL. 2017-08-14 09:36:39 -04:00
Matt Larsen
7ca8d1bd3a Merge topic 'mapper_fixes' 
df185a67 removing background colors from tracers. Background color is now the responsiblitiy of the canvas.
28b1e6b1 initializing ray color buffer to 0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !881
 2017-08-12 22:29:12 -04:00
Matt Larsen
df185a67aa removing background colors from tracers. Background color is now the responsiblitiy of the canvas. 2017-08-12 17:22:47 -07:00
Matt Larsen
28b1e6b13b initializing ray color buffer to 0 2017-08-12 15:42:26 -07:00
dongliangchu
833df44202 merging unittest for multiblock filters 2017-08-12 10:42:40 -04:00
dongliangchu
5194b3cd39 merging unittest for multiblock filters 2017-08-12 08:40:39 -04:00
Sujin Philip
9deea72f72 Merge topic 'update-buildconnectivity' 
4e1b026c Streamline CellSetExplicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !878
 2017-08-11 17:29:35 -04:00
Dave Pugmire
bbad4aff88 Merge topic 'pics_unittests' 
533380e7 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into pics_unittests
1c35a745 Resolve merge conflicts for pics_unittest
0d37915f Merge branch 'pics_unittests' of gitlab.kitware.com:dpugmire/vtk-m into pics_unittests
2c662457 Fix particle advection compile warnings
84f9ec47 Fix particle advection build warning
82067fc8 fix for particle advection build issue
8915d902 removing trailing whitespaces
f5273c62 Clang reformat.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !877
 2017-08-11 17:28:56 -04:00
Yenpure
533380e705 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into pics_unittests 2017-08-11 16:01:06 -04:00
Allison Vacanti
c3cdd9c2c9 Merge topic '135-consolidate_result_objects' 
565896cc Combine ResultField + ResultDataSet into Result.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !872
 2017-08-11 15:13:25 -04:00
Yenpure
1c35a74521 Resolve merge conflicts for pics_unittest 2017-08-11 13:57:47 -04:00
Sujin Philip
4e1b026c8a Streamline CellSetExplicit 
1) Don't require a DeviceAdapter for the BuildConnectivity function (#131)
2) Explicitly instantiate default CellSetExplicit and CellSetSingleType
 2017-08-11 10:14:40 -04:00
Allison Vacanti
565896cc49 Combine ResultField + ResultDataSet into Result. 2017-08-11 08:25:42 -04:00
Robert Maynard
1f451d538b Merge topic 'vtkm_assert_dont_generate_unused_warnings_in_relwithdebinfo' 
33afb076 VTKM_ASSERT when disabled will still 'use' the input variables.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !876
 2017-08-11 08:23:17 -04:00
Robert Maynard
3a8a64dfa3 Merge topic 'vtkm_cont_internal_now_uses_using' 
ac90e2dc vtkm::cont::internal now prefers 'using' over 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !875
 2017-08-11 08:23:06 -04:00
Robert Maynard
d6716ceb93 Merge topic 'examples_using_over_typedef' 
c0b08b5a Convert examples over to using 'using' over 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !874
 2017-08-11 08:22:54 -04:00
Allison Vacanti
b910e6e316 Merge topic '167-remove_ArrayHandleCuda' 
326757b5 Remove ArrayHandleCuda.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !873
 2017-08-11 08:19:58 -04:00
Dave Pugmire
0d37915fb2 Merge branch 'pics_unittests' of gitlab.kitware.com:dpugmire/vtk-m into pics_unittests 2017-08-11 07:42:35 -04:00
ayenpure
2c662457f0 Fix particle advection compile warnings 2017-08-10 22:19:50 -04:00
ayenpure
84f9ec47ee Fix particle advection build warning 
-adding code to resolve build warnings for gcc 5+
-change the return object of steps in unit test
 2017-08-10 21:32:42 -04:00
ayenpure
82067fc8f3 fix for particle advection build issue 2017-08-10 20:34:05 -04:00
ayenpure
8915d90273 removing trailing whitespaces 2017-08-10 18:15:21 -04:00
dongliangchu
dcc544f827 refactoring unittest for multiblock filters 2017-08-10 16:45:06 -04:00
Dave Pugmire
f5273c62ef Clang reformat. 2017-08-10 16:42:52 -04:00
Dave Pugmire
1ae6bfcb1e Merge branch 'pics_unittests' of gitlab.kitware.com:dpugmire/vtk-m into pics_unittests 2017-08-10 16:41:16 -04:00
Dave Pugmire
02bab1a6b7 Fix merge issue. 2017-08-10 16:34:39 -04:00
Dave Pugmire
e5a814d952 Merge branch 'pics_unittests' of gitlab.kitware.com:dpugmire/vtk-m into pics_unittests 2017-08-10 16:28:48 -04:00
dongliangchu
16bb073780 refactoring unittest for multiblock filters 2017-08-10 16:18:36 -04:00
Dave Pugmire
b23564a526 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into pics_unittests 2017-08-10 16:18:18 -04:00
dongliangchu
389bda7ec2 refactoring unittest for multiblock filters 2017-08-10 16:08:10 -04:00
dongliangchu
3bff60d3c6 refactoring unittest for multiblock filters 2017-08-10 16:05:37 -04:00
dongliangchu
49333343e9 refactoring unittest for multiblock filters 2017-08-10 15:59:50 -04:00
dongliangchu
72db00ed19 refactoring unittest for multiblock filters 2017-08-10 15:50:27 -04:00
Robert Maynard
33afb076c8 VTKM_ASSERT when disabled will still 'use' the input variables. 
This is important as VTKM_ASSERT was the only usage of some variables, so in
release mode we would have declared but not used warnings.
 2017-08-10 15:37:35 -04:00
Robert Maynard
ac90e2dc73 vtkm::cont::internal now prefers 'using' over 'typedef' 2017-08-10 15:26:05 -04:00
Allison Vacanti
326757b571 Remove ArrayHandleCuda. 
!861 (b0dba9a1) adds this functionality to basic ArrayHandles.
 2017-08-10 15:21:52 -04:00
Abhishek Yenpure
e4116edab8 particle advection tests for rectilinear grid 
-added tests for rectilinear grid
-fixing rectilinear grid evaluator for GPUs
 2017-08-10 15:14:42 -04:00
James Kress
23a56dd771 Merge topic 'Create-YAxis-Log-Scaling' 
f3e455eb Adding 2D, 3D annotations, fixing GL color mapper.
7c0b15a5 Adding ability to have y-axis log scaling in 1D.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !863
 2017-08-10 13:48:41 -04:00
Robert Maynard
c0b08b5a9f Convert examples over to using 'using' over 'typedef' 2017-08-10 13:46:17 -04:00
Abhishek Yenpure
a3b4ad8b1a particle advection test fixes 
-fixes for testing particle advection on the GPU.
-minor fixes for GPU
 2017-08-10 13:39:47 -04:00
Robert Maynard
33c0d59791 Merge topic 'add_cmake_default_build_types' 
ad3e0f32 VTK-m now provides a default and a list of types for CMAKE_BUILD_TYPE.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !871
 2017-08-10 12:18:25 -04:00
Robert Maynard
c4cf0526bc Merge topic 'add_volta_cuda_architecture' 
76d10e18 Add volta to the list of support CUDA devices to compile for.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !870
 2017-08-10 11:39:44 -04:00
Robert Maynard
76d10e1835 Add volta to the list of support CUDA devices to compile for. 2017-08-10 11:02:07 -04:00
Robert Maynard
ad3e0f320e VTK-m now provides a default and a list of types for CMAKE_BUILD_TYPE. 
CMake has several default build types, but if nothing is specified when
configuring your project it defaults to an empty string and no optimization
flags are used.

It will now default to using a debug build if the source directory is a git
clone, or a release build if not. Additionally when using ccmake or cmake-gui
this will provide a nice list of possible options for CMAKE_BUILD_TYPE.
 2017-08-10 10:47:14 -04:00
James
f3e455ebf6 Adding 2D, 3D annotations, fixing GL color mapper. 2017-08-10 09:26:16 -04:00
Thomas Otahal
89b2700298 Merge topic 'external-faces-production' 
75517554 Move check for cell variables to it gets executed.
147247e8 Code formatting changes and compiler warning fixes.
a3fd135b Fix errors and warnings on Mac and Windows
347af497 Poly Data for External Faces
aeed7a07 Cell variables for External Faces
ad13e9b4 Merge branch 'master' into external-faces-production
ab25c160 External Faces Uniform and Rectilear grids

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !860
 2017-08-09 16:00:01 -04:00
Kenneth Moreland
b4bf0534e1 Merge topic 'glfw-sign-conversion-warning' 
2e875d4d Fix signed/unsigned conversion warnings in GLFW test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !868
 2017-08-09 11:17:58 -04:00
Robert Maynard
87e1df76ea Merge topic 'print_summary_handle_uint8' 
531205c8 Printing of ArrayHanlde<vtkm::Vec< UInt/Int8 >> now works as intended.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !866
 2017-08-09 08:34:47 -04:00
ayenpure
bc259e1523 Particle advection grid evaluators testing fix 2017-08-08 23:03:08 -04:00
Kenneth Moreland
2e875d4dfa Fix signed/unsigned conversion warnings in GLFW test 2017-08-08 16:14:55 -06:00