Commit Graph

2920 Commits

Author SHA1 Message Date
James Kress
00b73b63b2 Updating formatting and fixing compiler warnings 2017-02-07 11:52:53 -05:00
James Kress
eee9edde58 Updating formatting and fixing compiler warnings 2017-02-07 11:48:43 -05:00
James Kress
6cac18438d Updating formatting and fixing compiler warnings 2017-02-07 11:32:15 -05:00
James Kress
48d22460ee Updating formatting and fixing compiler warnings 2017-02-07 11:16:07 -05:00
Thomas J. Otahal
70e145fd83 Attempt to fix Visual Studio 2013/2015 warning message 2017-02-07 07:41:38 -07:00
James Kress
19b61a5367 Merge branch 'master' into DataSetAddUniform-test-enhance 2017-02-07 08:12:20 -05:00
Thomas J. Otahal
f1300c6143 Changed vtkm::Abs() to return input type 2017-02-06 15:50:13 -07:00
James Kress
cefc333a99 Adding fields to data set builder unit tests to test fields. 2017-02-06 16:24:36 -05:00
Thomas J. Otahal
71b2348dd9 Adjusted Math.h.in for const vtkm::Float32 function inputs 2017-02-06 12:18:13 -07:00
Robert Maynard
d24f53a64a Merge topic 'correct_assert_condition_is_constant_warnings'
9148bea3 Corrects ignorable warnings with msvc and cuda enabled.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !680
2017-02-02 11:42:15 -05:00
Robert Maynard
9148bea396 Corrects ignorable warnings with msvc and cuda enabled.
These constant value warnings are ignorable as we are trying
to throw an assert.
2017-02-02 10:09:34 -05:00
Robert Maynard
799277e515 Merge topic 'move_computerange_to_own_header'
3d2e15b4 Move ComputeRange for ArrayHandle to its own header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !677
2017-02-01 10:37:36 -05:00
Robert Maynard
e0fd5696a3 Merge topic '2-field_assoc_convenience'
5020a848 Add convenience getters for accessing field data by association.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !678
2017-02-01 09:08:54 -05:00
Robert Maynard
6e4e07b378 Merge topic 'all_array_portals_have_set'
629271bc Make sure all ArrayPortals have a Set method.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !676
2017-02-01 09:08:51 -05:00
Kenneth Moreland
3d2e15b4c0 Move ComputeRange for ArrayHandle to its own header
It will be convenient to make this accessible outside of Field.
2017-02-01 09:06:42 -05:00
Kenneth Moreland
629271bceb Make sure all ArrayPortals have a Set method.
The current design for ArrayPortalVirtual makes it a requirement for all
array portals (that it wraps) to have Set defined. Thus, make sure Set is
defined for all ArrayPortal. Where Set is invalid, an assert is thrown if
something calls it at runtime.
2017-01-31 15:46:39 -05:00
David Lonie
49a88cda08 Merge topic '114-thrust-cudaMalloc'
575d74d1 Manage cuda device memory with cudaMalloc instead of thrust::vector.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !675
2017-01-31 14:56:02 -05:00
David C. Lonie
5020a8482f Add convenience getters for accessing field data by association. 2017-01-31 14:50:52 -05:00
David C. Lonie
575d74d143 Manage cuda device memory with cudaMalloc instead of thrust::vector. 2017-01-30 15:36:37 -05:00
Robert Maynard
407f9822c2 Merge branch 'use_usage_requirements' into 'master'
Use usage requirements

See merge request !673
2017-01-27 17:36:16 -05:00
Robert Maynard
dc143e7d9e Fix issues found on dashboard machines. 2017-01-27 15:22:34 -05:00
Robert Maynard
e415f55b6f Update the examples to work with the new usage requirements 2017-01-27 10:03:53 -05:00
Robert Maynard
8035b526a8 Update the CMake components to have the concept of backends.
Now components are labeled as devices, and therefore allow other components
to link to only backends. We also have done the same thing for rendering.
2017-01-27 10:03:53 -05:00
Robert Maynard
422045ca93 The vtkm target now uses usage requirements to pass along include dirs. 2017-01-27 10:03:52 -05:00
Robert Maynard
e683f979b9 All target_link_libraries now use the new syntax.
This is the first step in making proper portable CMake target code
for VTK-m.
2017-01-27 10:03:52 -05:00
Robert Maynard
5d23c4bf21 VTK-m find module better follow recommended best practices.
CMake best practices are found at:
  https://cmake.org/cmake/help/v3.3/manual/cmake-developer.7.html#modules
2017-01-27 10:03:52 -05:00
Robert Maynard
58b1da8e6e Merge topic 'remove_cuda_warnings_multibackend'
f7e651fa When building the multi_backend code suppress warnings from thrust.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !672
2017-01-26 16:11:01 -05:00
Kenneth Moreland
0703139a3d Make Keys class do in-place sort
Previously, the Keys class constructor took an array of keys, made a
copy of it, and sorted the copy. This was to protect the caller in case
it needed the original keys array again. However, this copy takes a
significant chunk of time and it is probably rare in practice to ever
need the original keys array again. So instead just do an in-place sort.
2017-01-26 13:35:53 -07:00
Kenneth Moreland
059c7f6db0 Fix issue with ExternalFaces on CellSetSingleType
The ExternalFaces filter should work fine on a CellSetSingleType.
However, the filter was not operating on them because it a templated
method that is a placeholder for "this cell set type not supported" was
matching it. This simple change allows a CellSetSingleType to match the
template for a CellSetExplicit (which is the superclass).
2017-01-26 13:35:51 -07:00
Kenneth Moreland
876514bab2 Add better test for external faces
Tests zoo cells with different face size. Also makes sure the surface is
exactly as expected.
2017-01-26 13:35:49 -07:00
Kenneth Moreland
53679dfc9c Update ExternalFaces to support mixed face types
Previously, ExternalFaces really only supported tetrahedral meshes that
have only triangular faces. These changes support all mixes of cells and
their faces.
2017-01-26 13:35:46 -07:00
Kenneth Moreland
63d4c7679e Merge topic 'version'
634a6136 Add license exception to version.txt
a6719638 Add Version.h header file
a575ec1d Add warning if git version disagrees with version.txt
3ffd16a8 Add ability to get VTK-m version from git

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !671
2017-01-26 15:34:20 -05:00
Thomas J. Otahal
7d6601d794 Modified Math.h.in and VectorAnalysis.h to support integral types.
Unary operations on scalars and vectors will return vtkm::Float64 for
integral input types and vtkm::Float64 input types. Unary operations will
return vtkm::Float32 for vtkm::Float32 input vectors and scalars.
2017-01-26 13:30:28 -07:00
Robert Maynard
f7e651fa10 When building the multi_backend code suppress warnings from thrust. 2017-01-26 14:41:30 -05:00
Kenneth Moreland
634a6136b0 Add license exception to version.txt 2017-01-26 11:02:51 -07:00
Kenneth Moreland
a671963834 Add Version.h header file
This allows source files to use the VTK-m version.

Note that Configure.h does not include the version. This is intentional.
First, I don't want the entirety of VTK-m to recompile every time the
version is updated (which is every time a commit happens in git).
Second, it is important that external project source files be able to
get the VTK-m version without actually loading any VTK-m code.
2017-01-26 10:33:42 -07:00
Kenneth Moreland
a575ec1d5b Add warning if git version disagrees with version.txt
I don't trust myself to not forget.
2017-01-26 10:08:45 -07:00
Kenneth Moreland
3ffd16a8a6 Add ability to get VTK-m version from git
In addition to keeping the version number accurate, this will help us
differentiate between-the-numbers commits.
2017-01-26 10:02:04 -07:00
Kenneth Moreland
d32f3457d8 Merge topic 'fix-clip-table-error-for-lines'
c6fdceaf Fix an error in the clip tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !669
2017-01-25 11:07:39 -05:00
Andrew Bauer
c1f7a072f3 Merge topic 'fix_typo'
7b165842 Fixing documentation typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !670
2017-01-25 10:46:32 -05:00
Andrew Bauer
7b165842cd Fixing documentation typo 2017-01-25 10:41:09 -05:00
Thomas J. Otahal
cd95cbe90b Modified Math.h.in instead of Math.h
Changed return types for all scalar and vector unary math operations
to return vtkm::FloatDefault instead of input type. vtkm::Float64 will
be returned when the input is vtkm::Float64.
2017-01-24 14:47:51 -07:00
Kenneth Moreland
c6fdceaf46 Fix an error in the clip tables
There was an error in the clip tables for clipping lines. It was
referring to edge 1 for one of the case, but of course a line has only 1
edge at index 0. Fix the error in the clipping table and also add a
check for if we get an index to an invalid line.
2017-01-24 13:23:47 -07:00
Thomas J. Otahal
5777c4caa5 Merge branch 'master' into vector_magnitude_field_filter
Conflicts:
	vtkm/worklet/testing/CMakeLists.txt
2017-01-24 09:55:31 -07:00
Robert Maynard
6410f06e8d Merge topic 'reduce_histogram_filter_test_output'
2c916780 Reduce the amount of output the UnitTestHistogramFilter generates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !668
2017-01-24 10:40:25 -05:00
Robert Maynard
2c916780a0 Reduce the amount of output the UnitTestHistogramFilter generates
It was producing about 40MB of output when saved by cdash/buildbot so
lets reduce that and make web pages load again.
2017-01-24 09:21:43 -05:00
Kenneth Moreland
fe1c7c3228 Merge topic 'fix-clean-grid'
5004e64c Fix CleanGrid when compact point fields is off

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !665
2017-01-23 11:00:02 -05:00
Kenneth Moreland
96ec813087 Merge topic 'windows-build-issue'
5fed7dda Fix compile issue on windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !664
2017-01-23 10:59:06 -05:00
Robert Maynard
d0eb528aaf Merge branch 'reduce_amount_of_weak_vtables' into 'master'
Reduce amount of weak vtables

See merge request !612
2017-01-23 08:47:54 -05:00
Kenneth Moreland
28b866920f Merge branch 'reduce-by-key-worklet' into 'master'
Reduce by Key Worklet Type

See merge request !645
2017-01-19 16:25:06 -05:00