Commit Graph

4905 Commits

Author SHA1 Message Date
Allison Vacanti
cdd7c8993b Merge topic 'extrude_serialize'
67f1a772d Fix IsArrayHandleWritable for Extrude arrays.
38748a220 Add serialization code for Extrude data structures.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1788
2019-08-21 15:21:07 -04:00
Sujin Philip
3f9503469a Merge topic 'update-diy'
a4d07730c diy 2019-08-20 (166f7d1b)
eea4225d8 Fix update.sh for diy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1789
2019-08-21 09:36:01 -04:00
Kenneth Moreland
8373adc654 Merge topic 'array-handle-soa'
aebafc9e5 Use SFINAE to write Set/Get methods in ArrayPortalSOA
20c758108 Add make_ArrayHandleSOA for std::vectors and C arrays
c50857246 Make SOA Portal test more type safe
918766e7a Fix VS 2015 compile issue with HasVecTraits
869d66580 Add ArrayHandleSOA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1758
2019-08-21 09:24:35 -04:00
Diy Upstream
a4d07730cc diy 2019-08-20 (166f7d1b)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit 166f7d1bf6b4940b9edd3f91c78acf8ea6aa5bca (for/vtk-m).
2019-08-21 09:16:05 -04:00
Sujin Philip
eea4225d8e Fix update.sh for diy 2019-08-21 09:15:56 -04:00
Kenneth Moreland
1473c12e66 Merge topic 'more-gradient-testing'
c19b312e5 Fix gradient issue at apex of pyramid cells

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !1785
2019-08-20 17:03:28 -04:00
Kenneth Moreland
aebafc9e5a Use SFINAE to write Set/Get methods in ArrayPortalSOA
Because ArrayPortalSOA calls a delegate portal to get the actual values,
it can only implement its own Set or Get if the delegate portal supports
it. Previously this was done by calling an overloaded internal method
based on the result of PortalSupportsSets/Gets. However, regardless of
whether the delegate portal supported Set or Get, ArrayPortalSOA
provided one. Thus, if something else tried to use PortalSupportsSets/
Gets on ArrayPortalSOA, it would always report true even if it was not
really supported.

Instead, use SFINAE to remove the Set or Get if that method is not
supported in the delegate portal.

Since ArrayHandleSOA is only really used for portals from basic storage
arrays, it will be rare that Set or Get is not supported. However, a
device adapter is free to remove one of these methods on a device
portal. For example, if you call PrepareForInput on an ArrayHandle, it
is possible that the device adapter will create a portal that has no Set
method because the array is not writable.

Thanks to Allison Vacanti for recomending this solution.
2019-08-20 12:10:16 -06:00
Kenneth Moreland
20c758108c Add make_ArrayHandleSOA for std::vectors and C arrays 2019-08-20 12:09:57 -06:00
Kenneth Moreland
c508572460 Make SOA Portal test more type safe
I kept getting warnings from different compilers about type conversions
because I was making values by adding an index to them. Change how we
create and test values so that these type issues are less likely to come
up.
2019-08-20 12:09:56 -06:00
Kenneth Moreland
918766e7ab Fix VS 2015 compile issue with HasVecTraits
Apparently, the Visual Studio 2015 has a bug where the result of a
decltype might not be considered a type. Attempt to get around this
problem by putting the decltype inside of a struct and then have the
using statement use the typename keyword. Hopefully if you literally say
that something is a typename, the compiler will treat it like a type
name.
2019-08-20 12:09:55 -06:00
Kenneth Moreland
869d665806 Add ArrayHandleSOA
This ArrayHandle should behave just like the one with basic storage but
external arrays stored by component can be shallow-copied to them.
2019-08-20 12:09:54 -06:00
Allison Vacanti
67f1a772df Fix IsArrayHandleWritable for Extrude arrays.
The portal Set methods should be left unimplemented for immutable
array handles.
2019-08-20 14:08:56 -04:00
Allison Vacanti
38748a2208 Add serialization code for Extrude data structures. 2019-08-20 14:08:01 -04:00
Kenneth Moreland
c19b312e58 Fix gradient issue at apex of pyramid cells
The gradient is malformed at the apex of a pyramid. To get around this,
steal a trick from the VTK source where in this case interpolate some
values a little bit into the interior of the cell.

Also expand the gradient worklet tests to include all cell types.
2019-08-19 16:40:58 -06:00
Li-Ta Lo
9b0a79f19a let's see if I fixe the one last bug 2019-08-19 14:41:49 -06:00
Li-Ta Lo
e66af369ba removed isosurface example, add clipped tangle to Contour unit test 2019-08-19 13:36:28 -06:00
Li-Ta Lo
0a020c77a8 fixed error in TetrahedralizedExplicit, rename MarchineCubes to Contour 2019-08-19 11:45:58 -06:00
Li-Ta Lo
e9e35159ab change MarchingCubes to Contour that was missed before merge 2019-08-19 08:56:11 -06:00
Li-Ta Lo
c2e29f5c41 Merge branch 'master' into contour_hackathon 2019-08-18 14:49:08 -06:00
Li-Ta Lo
6a54d5f75f supress warning about converting vtkm::Id to vtkm::IdComponent 2019-08-18 14:26:58 -06:00
Li-Ta Lo
414effa8e8 remove unused contour unit test 2019-08-17 19:26:32 -06:00
Li-Ta Lo
d1fe1c3f38 rename MarchingCubes to Contour 2019-08-17 19:10:57 -06:00
Li-Ta Lo
fea2ccac2b removed old lookup table, rename new tables into CoontourTables 2019-08-17 18:46:59 -06:00
Li-Ta Lo
52d1ec8467 add Wedge and Pyramid support, visually verified with clipped Tangle field 2019-08-17 18:12:11 -06:00
Li-Ta Lo
1efdffb1b3 minor bug fix in edge table, visually verify that both Hex and Tetra works 2019-08-17 14:08:28 -06:00
Li-Ta Lo
fda22df5b7 commit before merge with master 2019-08-17 13:29:43 -06:00
Li-Ta Lo
989d3f32b9 fully generic, table driven triangle generation 2019-08-17 12:28:54 -06:00
Li-Ta Lo
7ded276fa6 table driven triangle generation 2019-08-17 11:37:14 -06:00
Abhishek Yenpure
484c587221 Merge topic 'fix_lcs_filter'
695614ae4 Adding necessary imports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1779
2019-08-17 12:47:51 -04:00
Allison Vacanti
59bafd7a2d Update moments filter to reflect further changes to CreateResult. 2019-08-16 08:16:53 -04:00
Allison Vacanti
b2d4731630 Merge topic 'fix_moments_filter'
e5008a017 Update moments filter to reflect namespace changes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1775
2019-08-16 07:43:57 -04:00
Li-Ta Lo
4e8e250705 new uniform table driven cell classifier 2019-08-15 22:37:52 -06:00
Li-Ta Lo
d82d380979 marching tetrahedra generates triangles 2019-08-15 18:03:53 -06:00
Abhishek Dilip Yenpure (-EXP)
695614ae48 Adding necessary imports 2019-08-15 17:39:55 -06:00
Robert Maynard
8d8b3a77d9 Merge topic 'exposing-intersected-mc-edges'
719614560 Exposed the edges intersected by Marching Cubes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1739
2019-08-15 12:57:13 -04:00
Robert Maynard
031407443d Provide simplified way to construct point and cell fields 2019-08-15 11:03:41 -04:00
Robert Maynard
4616286643 Merge topic 'provide_nicer_createresult_filter_api'
a6c1b10cd CreateResult API improved to make it easier to use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1770
2019-08-15 10:47:58 -04:00
Allison Vacanti
e5008a017a Update moments filter to reflect namespace changes. 2019-08-15 09:27:57 -04:00
Robert Maynard
a6c1b10cd3 CreateResult API improved to make it easier to use
To help provide a better time writing VTK-m filter this streamlines
the CreateResult API to provide a focused set of methods, based on
how CreateResult has been used by existing filters.
2019-08-14 15:28:43 -04:00
Allison Vacanti
608c5e6ba5 Remove unused invoker. 2019-08-14 07:30:24 -04:00
Allison Vacanti
cec4633dc5 Add ComputeMoments filter to build system. 2019-08-14 07:30:24 -04:00
Sujin Philip
06f450615d Fix moments filter 2019-08-14 07:30:23 -04:00
Li-Ta Lo
298f68a5c3 update copyright notice 2019-08-14 07:30:23 -04:00
Li-Ta Lo
2718cede97 Add ComputeMoments worklet and filter 2019-08-14 07:30:22 -04:00
Allison Vacanti
ac718e2b33 Remove traits class for ComputeMoments filter.
TypeListTagAll only defines vectors up to size 4, while the default
filter traits do not restrict input types at all.

Since the moments computation may use 6- or 9-tuple vecs, this
restriction is breaking those usecases.
2019-08-14 07:30:21 -04:00
Allison Vacanti
a5e7f20b13 Extend ComputeMoments to 3D. 2019-08-14 07:30:21 -04:00
Allison Vacanti
9194e2bea8 Respect boundary conditions in moment convolution. 2019-08-14 07:30:20 -04:00
Sujin Philip
cd6501bd4e Fix bugs causing same results for all indices 2019-08-14 07:30:20 -04:00
Sujin Philip
34792145f2 Fix compile error 2019-08-14 07:30:20 -04:00
Li-Ta Lo
162d369f5f restored capacity for 2D 2019-08-14 07:30:19 -04:00