Commit Graph

3472 Commits

Author SHA1 Message Date
Robert Maynard
b85cdd9080 Convert VTK-m over to use 'using' instead of 'typedef' 2017-08-07 14:05:43 -04:00
Allison Vacanti
1a09338e0c Merge topic '43-ArrayHandleExtractComponent'
84588c80 Add ArrayHandleExtractComponent.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !853
2017-08-07 10:23:03 -04:00
Allison Vacanti
e1b78a21ea Merge topic '43-ArrayHandleSwizzle'
030ef573 Add ArrayHandleSwizzle for reordering/removing components from a vec array.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !857
2017-08-07 08:58:58 -04:00
Matt Larsen
dba99744ce Merge topic 'rendering_pipeline'
2b5e8e9f Removing debug statements
0459913a Multi canvas rendering
35877cd9 Adding missing file
b1e3688b multi-canvas working for ray tracer + volume renderer
33af0fec composing ray tracer and volume renderer is successful. Still need a strategy for the background color.
8e5f309e adding support in rendering triangulator for cell set permutation
92fde35b fixing depth

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !862
2017-08-06 17:02:51 -04:00
Matt Larsen
2b5e8e9f52 Removing debug statements 2017-08-06 12:18:30 -07:00
Matt Larsen
0459913aeb Multi canvas rendering 2017-08-06 11:59:19 -07:00
Matt Larsen
35877cd923 Adding missing file 2017-08-05 19:14:31 -07:00
Matt Larsen
b1e3688bfd multi-canvas working for ray tracer + volume renderer 2017-08-05 19:11:28 -07:00
Allison Vacanti
030ef57380 Add ArrayHandleSwizzle for reordering/removing components from a vec array.
This is tangentially related to #43.
2017-08-04 13:42:38 -04:00
Matt Larsen
33af0fec65 composing ray tracer and volume renderer is successful. Still need a strategy for the background color. 2017-08-04 09:24:05 -07:00
Allison Vacanti
b0dba9a1b3 Merge topic 'detect_cuda_managed_control_arrays'
0a828189 Reuse user-provided cuda device pointers when possible.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !861
2017-08-04 09:10:16 -04:00
Allison Vacanti
0a828189ad Reuse user-provided cuda device pointers when possible. 2017-08-03 17:21:13 -04:00
Kenneth Moreland
5b03e87fdf Merge topic 'glfw-test-fixes'
faa7815a Fix buffer overrun error
14b81a65 Fix compiler errors for UnitTestMapperGLFW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !859
2017-08-02 17:59:01 -04:00
James Kress
f1077fe601 Merge topic 'Adding-1DView-Line-Color'
6b53a01c Removing print.
1eb58512 Adding ability to modify axis color as well as legend label color.
bd561b1e Trying to fix color for mesa.
c9bd71f9 Trying to fix color in mesa.
14c69183 Adding color to RenderTest.
7674d2cc Adding color to mesa test.
686f9823 Updating rendering unit tests for 1D plots.
3b79e4d7 Updating way 1D test plots are made, adding title.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !854
2017-08-02 16:07:16 -04:00
Matt Larsen
77a9e53066 Merge topic 'export_color'
dd4efb51 Uses `Color` in the unit tests for basic sanity check
812f11d3 Moves class-wide visibility macro to just the static class members.
68648863 Exports Color class, adding visibility to static members

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !850
2017-08-02 15:59:08 -04:00
Kenneth Moreland
faa7815ac5 Fix buffer overrun error 2017-08-02 10:45:23 -06:00
Kenneth Moreland
14b81a65a6 Fix compiler errors for UnitTestMapperGLFW
This file was creating a C array using the size of an array handle.
Generally, you cannot create a C array of a static size with a
variable created at runtime. Apparently some compilers were able
to trace back to fact that the array handle was a given size and
used that, but not all compilers can do this. To get around the
problem, just use a std::vector, which allows the data to be
dynamically allocated.
2017-08-02 10:35:45 -06:00
James
6b53a01c03 Removing print. 2017-08-02 12:35:30 -04:00
James
1eb585121c Adding ability to modify axis color as well as legend label color. 2017-08-02 12:32:19 -04:00
Allison Vacanti
84588c803f Add ArrayHandleExtractComponent.
This is part of #43, which will ultimately simplify the
ArrayHandleCompositeVector to a new implementation that can be easily
written to. Part of this effort will remove the ability to pull a single
component from a vector-typed input ArrayHandle for use in the
CompositeVector, and this new class makes sure we can still support that
usecase.
2017-08-02 12:22:08 -04:00
Allison Vacanti
c077f16fb9 Merge topic 'msvc-2013-compat'
75590f1f MSVC2013 lacks support for function type aliases.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !858
2017-08-02 12:19:26 -04:00
Allison Vacanti
75590f1fc9 MSVC2013 lacks support for function type aliases.
Alas, VS 2013 will keep us from using "using" to declare function
signatures. Reverting to typedef until we bump our MSVC requirement.

This appears to be a compiler bug:
https://stackoverflow.com/questions/26349216
2017-08-02 12:02:25 -04:00
Matt Larsen
8e5f309e5e adding support in rendering triangulator for cell set permutation 2017-08-02 08:46:33 -07:00
Matt Larsen
92fde35bb4 fixing depth 2017-08-01 10:06:37 -07:00
Robert Maynard
4200bf608d Merge topic 'correct_helloworld_example'
92ac1db4 Hello World example once again computes intial point values correctly.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !856
2017-07-31 13:42:02 -04:00
Kenneth Moreland
6b4adc4424 Merge topic 'connectivity-interface'
897ec9ff Test and fix issues with WholeCellSetIn with structured grids
03b6f62d Add a test for the WholeCellSetIn argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !855
2017-07-31 11:28:21 -04:00
Allison Vacanti
717d06b6f2 Merge topic 'cuda-runtime-detect-managed-memory'
bd042ec5 Add CudaAllocator to encapsulate runtime managed memory logic.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !816
2017-07-31 09:54:27 -04:00
David C. Lonie
bd042ec567 Add CudaAllocator to encapsulate runtime managed memory logic.
Unified memory is now used when we detect that the hardware supports it.
2017-07-31 09:08:27 -04:00
Robert Maynard
92ac1db4eb Hello World example once again computes intial point values correctly.
Incorrect casting conversions caused the hello_world example to divide
in integer space rather than float space.
2017-07-28 17:27:06 -04:00
Kenneth Moreland
897ec9ff5e Test and fix issues with WholeCellSetIn with structured grids 2017-07-28 15:02:05 -06:00
James
bd561b1e50 Trying to fix color for mesa. 2017-07-28 16:38:38 -04:00
James
c9bd71f90f Trying to fix color in mesa. 2017-07-28 16:34:57 -04:00
James
14c69183af Adding color to RenderTest. 2017-07-28 16:16:03 -04:00
James
7674d2cc26 Adding color to mesa test. 2017-07-28 16:08:14 -04:00
James
686f982333 Updating rendering unit tests for 1D plots. 2017-07-28 16:01:06 -04:00
Kenneth Moreland
03b6f62d05 Add a test for the WholeCellSetIn argument
All types of cell sets should have a consistent interface. This is
tested (and fixed) for explicit and permutation cell sets. However, an
unfixed bug that has been identified is that permutation cell sets only
work for point to cell topologies. All others are not supported
correctly.
2017-07-28 13:46:37 -06:00
James
3b79e4d7c4 Updating way 1D test plots are made, adding title. 2017-07-28 15:45:36 -04:00
James
6106e24026 Fix CMake line. 2017-07-28 13:48:48 -04:00
James
c7ef96601b Commenting in rendering CMakeLists. 2017-07-28 13:40:39 -04:00
James
6b59b01e14 Adding color lines, view annotations, line color labels. 2017-07-28 13:31:19 -04:00
Manish Mathai
dd4efb511f Uses Color in the unit tests for basic sanity check
This commits acts as a basic sanity check for `Color` class and to
ensure the symbol visility fix.
2017-07-27 14:10:34 -07:00
Kenneth Moreland
938db09ad5 Merge topic 'mapper-warning'
dd2fec58 Fix conversion warning in GLFW unit test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !851
2017-07-26 15:25:06 -04:00
Abhishek Yenpure
0629f1be6c Merge topic 'particle_advection_interpolation_error'
f799547e Resolving error in interpolation
0beb8ba1 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into short_steps
0bdace51 Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !852
2017-07-25 20:17:43 -04:00
Yenpure
f799547e97 Resolving error in interpolation
-Both the rectilinear grid and uniform grid evaluator
 had interpolation errors
 a typical interpolation  equation looks like,
 out = (1-t) * in1 + t * in2
 The final interpolation step lacked multiplying in2
 by t
2017-07-25 15:55:39 -04:00
Kenneth Moreland
dd2fec58e0 Fix conversion warning in GLFW unit test 2017-07-25 12:43:31 -06:00
Yenpure
0beb8ba13e Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into short_steps 2017-07-25 13:56:29 -04:00
Abhishek Yenpure
bb4507c759 Merge topic 'particle_statuses'
f43580b5 Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses
ca167f36 Changes suggested by Rob.
f5173153 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particle_statuses
c85c6c93 Fix compile errors after Dave's merge.
5ba1fad7 Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses
2aea25c8 Fix compile errors after merging Dave's changes
9e9b4f88 Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses
25139ea3 Merge remote-tracking branch 'vtkm/master' into particle_statuses
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !845
2017-07-25 12:44:52 -04:00
Manish Mathai
812f11d362 Moves class-wide visibility macro to just the static class members.
`Color` class uses `VTKM_EXEC`* visibility macros on some member functions
and  VC++ raises an error if that is mixed with the class wide visibility
macro. This commit adds the macro to each individual static member instead.
2017-07-24 14:51:46 -07:00
Manish Mathai
68648863bc Exports Color class, adding visibility to static members
Color class contains predefined colors as static members and needs to be
exported for them to be accessible outside the library.
2017-07-24 11:59:19 -07:00
Yenpure
0bdace5124 Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses 2017-07-21 14:54:41 -04:00