* upstream-diy:
  diy 2019-08-22 (2153469e)

Kitware Robot authored Aug 22, 2019 and Sujin Philip committed Aug 22, 2019

Code extracted from:

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

at commit 2153469e21736806f766e59e73aff5ad790b9dfa (for/vtk-m).

Robert Maynard authored Aug 22, 2019 and Kitware Robot committed Aug 22, 2019

fa9ffac7 Correct improper cellset indexing
b0c6e18e

 DataSet queries for cellset and coordinate index won't trow
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1777

Robert Maynard authored Aug 22, 2019 and Kitware Robot committed Aug 22, 2019

a529b90c

 vtkm::Vec const& operator[] is now constexpr
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1792

This allows for developers to do things such as the following
as constexpr's:
```cxx
constexpr vtkm::Id2 dims(16,16);
constexpr vtkm::Float64 dx = vtkm::Float64(4.0 * vtkm::Pi()) / vtkm::Float64(dims[0] - 1);
```

Kenneth Moreland authored Aug 21, 2019 and Kitware Robot committed Aug 21, 2019

bf96d921 Add extra braces around std::array initializers
9bbf4a5a

 Corrections and expanded testing of implicit functions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1776

Kenneth Moreland authored Aug 21, 2019 and Kitware Robot committed Aug 21, 2019

d7bfbbda Remove GhostCellRemove::ConvertOutputToUnstructured option
42e8a912

 Copy Threshold output to a CellSetExplicit
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !1791

Allison Vacanti authored Aug 21, 2019 and Kitware Robot committed Aug 21, 2019

67f1a772 Fix IsArrayHandleWritable for Extrude arrays.
38748a22

 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

Now that Threshold automatically converts its output to CellSetExplicit,
this option is no longer necessary (and the previous implementation did
not work correctly).

Robert Maynard authored Aug 21, 2019 and Kitware Robot committed Aug 21, 2019

978650b0 FindMPI works with CMake 3.8's separate_arguments
1f99fbc3

 FindMPI will now work when CUDA is disabled and CMake <= 3.11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1787

CMake 3.8 separate_arguments command doesn't support NATIVE_COMMAND
so we have to do that logic for it.

Sujin Philip authored Aug 21, 2019 and Kitware Robot committed Aug 21, 2019

a4d07730 diy 2019-08-20 (166f7d1b)
eea4225d

 Fix update.sh for diy
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1789

This was causing issues for downstream users of VTK-m as it exposed
a bug in CM ( cmake#17952 ) where it was evaluating against the set of
enabled languages instead of possible languages.

Kenneth Moreland authored Aug 21, 2019 and Kitware Robot committed Aug 21, 2019

aebafc9e Use SFINAE to write Set/Get methods in ArrayPortalSOA
20c75810 Add make_ArrayHandleSOA for std::vectors and C arrays
c5085724 Make SOA Portal test more type safe
918766e7 Fix VS 2015 compile issue with HasVecTraits
869d6658

 Add ArrayHandleSOA
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1758

Kitware Robot authored Aug 20, 2019 and Sujin Philip committed Aug 21, 2019

Code extracted from:

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

at commit 166f7d1bf6b4940b9edd3f91c78acf8ea6aa5bca (for/vtk-m).

Robert Maynard authored Aug 21, 2019 and Kitware Robot committed Aug 21, 2019

267f963d

 Opt into all CMake 3.15 policies
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1786

Perhaps a better title for this change would be "Make the Threshold
filter not totally useless."

A long standing issue with the Threshold filter is that its output
CellSet was stored in a CellSetPermutation. This made Threshold hyper-
efficient because it required hardly any data movement to implement.
However, the problem was that any other unit that had to use the CellSet
failed. To have VTK-m handle that output correctly in other filters and
writers, they all would have to check for the existance of
CellSetPermutation. And CellSetPermutation is templated on the CellSet
type it is permuting, so all units would have to compile special cases
for all these combinations. This is not likely to be feasible in any
static solution.

The simple solution, implemented here, is to deep copy the cells to a
CellSetExplicit, which is a known type that is already used everywhere
in VTK-m. The solution is a bit disappointing since it requires more
memory and time to build. But it is on par with solutions in other
libraries (like VTK). And it really does not matter how efficient the
old solution was if it was useless.

Kenneth Moreland authored Aug 20, 2019 and Kitware Robot committed Aug 20, 2019

c19b312e

 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

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.

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.

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.

This ArrayHandle should behave just like the one with basic storage but
external arrays stored by component can be shallow-copied to them.

The portal Set methods should be left unimplemented for immutable
array handles.

Li-Ta Lo authored Aug 20, 2019 and Kitware Robot committed Aug 20, 2019

9b0a79f1 let's see if I fixe the one last bug
e66af369 removed isosurface example, add clipped tangle to Contour unit test
0a020c77 fixed error in TetrahedralizedExplicit, rename MarchineCubes to Contour
e9e35159 change MarchingCubes to Contour that was missed before merge
c2e29f5c Merge branch 'master' into contour_hackathon
6a54d5f7 supress warning about converting vtkm::Id to vtkm::IdComponent
27a9962f rename MarchingCubes to Contour in benchmarks
414effa8

 remove unused contour unit test
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1780

Robert Maynard authored Aug 20, 2019 and Kitware Robot committed Aug 20, 2019

78c7a8d8 Add changelog for make_Field changes
5087b172

 Add changelog for CreateResult changes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1784

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.

Queries for cellset and coordinates by name will not throw exceptions
when looking just for the index value. Instead they will return -1