Commit Graph

6784 Commits

Author SHA1 Message Date
Allison Vacanti
3886b7dfb8 Refactor CellSetExplicit to remove NumIndices.
See #408 for details.
2019-09-30 12:27:13 -04:00
Allison Vacanti
b2daec0e35 Stick with brigand sequences for CUDA device passes.
The tao ones won't compile otherwise. This should be okay, since these
are all just compile time helpers on host-only functions -- they won't
generate different sized data structures etc if we mix them in the
same build.
2019-09-27 17:02:19 -04:00
Kenneth Moreland
3fddadb9a2 Merge topic 'mesh-quality-fixes'
476800fe4 Have MeshQuality use the superclass' SetOutputFieldName
216335ab4 Have MeshQuality inherit from FilterField instead of FilterCell

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Hank <hank@uoregon.edu>
Merge-request: !1872
2019-09-27 14:16:25 -04:00
Kenneth Moreland
476800fe48 Have MeshQuality use the superclass' SetOutputFieldName
Previously MeshQuality defined its own SetOutputName method which broke
convention as was confusing. Deleted the output name defined in
MeshQuality and instead use the one defined in the superclass.
2019-09-26 19:28:13 -06:00
Kenneth Moreland
216335ab41 Have MeshQuality inherit from FilterField instead of FilterCell
FilterCell is a depricated type and will be removed at some point. It
serves no purpose over FilterField.
2019-09-26 19:23:28 -06:00
Kenneth Moreland
69220e85bd Merge topic 'vtk-reader-eof-issues'
82a58c2f0 Fix error with whitespace at end of file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1867
2019-09-26 11:41:08 -04:00
Kenneth Moreland
82a58c2f0a Fix error with whitespace at end of file
The VTK file reader caused an error to be thrown when reading a file
that had a METADATA section at the end of the file. The problem was that
the METADATA section had some whitespace after its last line (which is
probably typical). This caused an eof check to pass and then a
subsequent search for a token to fail.

The solution was to eat the whitespace after the METADATA section to get
the reader at the next token or in eof condition if it is at the end of
the file.
2019-09-25 16:20:20 -06:00
Brad King
9a906e4cbf Merge topic 'use-vtkc'
e08d862f9 Use Light-Weight Cell Library
e56b34fc9 Merge branch 'upstream-vtkc' into use-vtkc
e909edd61 vtkc 2019-09-24 (cdc72582)
2a6aadc69 Add update file for VTK-c

Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1852
2019-09-25 09:21:00 -04:00
Hank
3640ee86b8 Merge topic 'add-16-cell-metrics'
e106dc6bf changes from peer review
f4229c2e9 change variable half to be hhalf to prevent collision with NVIDIA global var
c75fdeef6 massage float/double cast issue
fcc169fdf finish copying over changes from failed firs git
8af25aca4 move cellmetrics to worklet
338b87d9f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add-16-cell-metrics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Abhishek Yenpure <abhishek@uoregon.edu>
Merge-request: !1865
2019-09-24 21:50:10 -04:00
Sujin Philip
e08d862f94 Use Light-Weight Cell Library 2019-09-24 21:22:10 -04:00
Sujin Philip
e56b34fc98 Merge branch 'upstream-vtkc' into use-vtkc
* upstream-vtkc:
  vtkc 2019-09-24 (cdc72582)
2019-09-24 21:21:40 -04:00
VTK-c Upstream
e909edd61d vtkc 2019-09-24 (cdc72582)
Code extracted from:

    https://gitlab.kitware.com/sujin.philip/vtk-c.git

at commit cdc72582dae24cc66b3525961e32edbc2a395341 (master).
2019-09-24 21:21:40 -04:00
Hank Childs
e106dc6bff changes from peer review 2019-09-24 18:12:52 -07:00
Hank Childs
f4229c2e9d change variable half to be hhalf to prevent collision with NVIDIA global var 2019-09-23 23:35:03 -07:00
Hank Childs
c75fdeef6a massage float/double cast issue 2019-09-23 23:26:12 -07:00
Hank Childs
fcc169fdf0 finish copying over changes from failed firs git 2019-09-23 22:30:49 -07:00
Hank Childs
8af25aca48 move cellmetrics to worklet 2019-09-23 22:27:12 -07:00
Hank Childs
338b87d9f8 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add-16-cell-metrics 2019-09-23 22:21:32 -07:00
Robert Maynard
9157a9fbcd Merge topic 'upate_config_target_docs'
a265d1f8a Document vtkm_filter and vtkm_source have compiled components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1864
2019-09-23 18:58:20 -04:00
Robert Maynard
a265d1f8a9 Document vtkm_filter and vtkm_source have compiled components 2019-09-23 18:49:58 -04:00
Matt Larsen
711efbe3b8 Merge topic 'use_vtkm_aligned_union_intel'
8edfd8eba using vtkm aligned union for all intel compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1863
2019-09-23 10:36:28 -04:00
Sujin Philip
2a6aadc691 Add update file for VTK-c 2019-09-21 16:30:39 -04:00
Matt Larsen
8edfd8eba8 using vtkm aligned union for all intel compilers 2019-09-21 12:13:48 -07:00
Kenneth Moreland
2103d61432 Merge topic 'fix-map-field-cast-and-call'
40ad32569 Fix policy use in FilterDataSet::MapFieldOntoOutput

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1859
2019-09-19 21:33:22 -04:00
Robert Maynard
a4dfe50cd5 Merge topic 'correct_gcc_4_and_5_failures'
99cbbf2ff Correct a regression in ArrayHandleDecorator with VisualStudio 2017
e93ce607f Increase VecTraits GCC workaround to be for all GCC 4 and 5 versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1860
2019-09-19 18:52:25 -04:00
Robert Maynard
99cbbf2ff2 Correct a regression in ArrayHandleDecorator with VisualStudio 2017 2019-09-19 18:35:20 -04:00
Kenneth Moreland
40ad325699 Fix policy use in FilterDataSet::MapFieldOntoOutput
In FilterDataSet::MapFieldOntoOutput, it was getting each field to map
using the traits reserved for the active field. However, when mapping a
field outside of the DoExecute, we want to consider a broader set of
types.
2019-09-19 10:59:19 -05:00
Robert Maynard
e93ce607fa Increase VecTraits GCC workaround to be for all GCC 4 and 5 versions 2019-09-19 11:54:44 -04:00
Robert Maynard
72739144f1 Merge topic 'correct_gcc48_compiler_crashes'
a46a83cc2 GCC 4.8 now correctly compiles ArrayHandleDecorator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1857
2019-09-19 11:41:15 -04:00
Robert Maynard
a46a83cc2a GCC 4.8 now correctly compiles ArrayHandleDecorator 2019-09-19 09:10:00 -04:00
Roxana Bujack
3b2fb5c8ab Merge topic 'realRadiusFix'
9c41daa2b change input to spacing and radius to make it more intuitive
b991d3c6b merge style differences
7d0ee16fd add the real double radius for scaling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1825
2019-09-18 16:36:43 -04:00
Robert Maynard
4faf1bf0b8 Merge topic 'build_filter_lib'
8520d70e0 Compile most frequently used VTK-m filters into a library
d1d61b9eb vtkm::filter::Filter passes filter policies by value
4ff021b08 Improve VTK-m compilation times by compiling more keys<T> types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1836
2019-09-18 15:01:39 -04:00
Robert Maynard
42e89a3355 Merge topic 'require_cmake_312_for_openmp'
e6a2089d8 Require CMake 3.12+ for using OpenMP backend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1856
2019-09-18 14:05:48 -04:00
Robert Maynard
7533f90d9b Merge topic 'improve_vtkm_sources'
3ef234ef1 Move Oscillator to the sources directory
5c69f1bae Update Wavelet to use WorkletVisitPointsWithCells
62357dea0 Tangle source has better runtime performance
eb3d86654 Add a test explicitly for vtkm::source::Tangle
63f243809 Add vtkm::source::Wavelet as a new source
257dc1f84 Sources have a more consistent API and internal style.
2d455bbef Document what the Tangle source will generate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1850
2019-09-18 14:05:11 -04:00
Allison Vacanti
9775e223a6 Merge topic 'portal_set_cleanup'
7e01edb01 Ensure that Portal::Set isn't defined for read-only portals.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1848
2019-09-18 12:45:24 -04:00
Hank
0eb767dc5f Merge topic 'jacobian-cellmetric'
f9d02b374 remove file that should not have been checked in
d59917473 rename half variable to avoid shadowing CUDA global
954e25874 fix problem with filename
91f7e763b fix copyright, warnings, cmake for Jacobian-cellmetric branch
e040ea05e formatting suggestions from KMorel
f4edb6a8e remove trailing whitespace
ccedb5aac Jacobian working, unit test working
560aa1f67 add support for outputname
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1855
2019-09-18 12:08:39 -04:00
Robert Maynard
8520d70e0d Compile most frequently used VTK-m filters into a library
VTK-m now provides the following filters with the default policy
as part of the vtkm_filter library:
  - CellAverage
  - CleanGrid
  - ClipWithField
  - ClipWithImplicitFunction
  - Contour
  - ExternalFaces
  - ExtractStructured
  - PointAverage
  - Threshold
  - VectorMagnitude

By building these as a library we hope to provide faster compile
times for consumers of VTK-m when using common configurations.
2019-09-18 12:06:13 -04:00
Hank Childs
f9d02b3742 remove file that should not have been checked in 2019-09-18 08:32:21 -07:00
Robert Maynard
e6a2089d8e Require CMake 3.12+ for using OpenMP backend 2019-09-18 07:59:32 -04:00
Hank Childs
d59917473d rename half variable to avoid shadowing CUDA global 2019-09-17 23:12:23 -07:00
Hank Childs
954e258745 fix problem with filename 2019-09-17 21:31:50 -07:00
Hank Childs
91f7e763bc fix copyright, warnings, cmake for Jacobian-cellmetric branch 2019-09-17 21:15:41 -07:00
Hank Childs
e040ea05e1 formatting suggestions from KMorel 2019-09-17 20:53:42 -07:00
Hank Childs
f4edb6a8ed remove trailing whitespace 2019-09-17 14:46:51 -07:00
Hank Childs
ccedb5aac1 Jacobian working, unit test working 2019-09-17 13:41:53 -07:00
Robert Maynard
d1d61b9ebc vtkm::filter::Filter passes filter policies by value
It now follows the same pattern that all filter implementations use
2019-09-17 13:50:58 -04:00
Dan Lipsa
bde772659a Merge topic 'fix-contour-tree-example'
542cca20d Rename MultiBlock to PartitionedDataSet in comment.
c05efcac8 Fix MultiBlock rename for ContourTree example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1853
2019-09-17 13:37:20 -04:00
Dan Lipsa
542cca20db Rename MultiBlock to PartitionedDataSet in comment. 2019-09-17 13:19:04 -04:00
Dan Lipsa
c05efcac83 Fix MultiBlock rename for ContourTree example. 2019-09-17 11:42:19 -04:00
Hank Childs
560aa1f673 add support for outputname 2019-09-16 20:48:55 -07:00