Commit Graph

848 Commits

Author SHA1 Message Date
Robert Maynard
22172a227b Update to handle the new WorkletMapTopologyPointToCell type. 2015-08-27 16:43:32 -04:00
Robert Maynard
55a11c4551 Merge branch 'master' into add-external-faces
Conflicts:
	vtkm/worklet/CMakeLists.txt
	vtkm/worklet/testing/CMakeLists.txt
2015-08-27 16:40:36 -04:00
Sujin Philip
68931a0d8a Merge topic 'fix-clip-constexpr-error'
310b80e0 Fix const expression error in VS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !147
2015-08-27 16:32:36 -04:00
Sujin Philip
310b80e09a Fix const expression error in VS 2015-08-27 16:09:37 -04:00
Sujin Philip
ca1add2bb6 Merge topic 'add-WorkletMapTopologyPointToCell'
cef966bc Add convenience class WorkletMapToplogyPointToCell

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !146
2015-08-27 16:08:42 -04:00
Sujin Philip
cef966bc5b Add convenience class WorkletMapToplogyPointToCell 2015-08-27 15:21:19 -04:00
Robert Maynard
81590709cb Merge topic 'print-summary-coordinates'
9cd8cb22 Make PrintSummary actually work for Field and CoordinateSystem.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !144
2015-08-27 13:18:47 -04:00
Sujin Philip
8530197ff1 Merge topic 'add-clip-implementation'
e3815220 Clip worklets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !130
2015-08-27 12:42:00 -04:00
Kenneth Moreland
9cd8cb22eb Make PrintSummary actually work for Field and CoordinateSystem.
The PrintSummary for CoordinateSystem went in an infinite loop. It was
supposed to call PrintSummary of its superclass (Field), but instead it
called itself.

The PrintSummary for Field only worked for fields of type vtkm::Float32.
To make it work for all array types, I added a PrintSummary method to
DynamicArrayHandle, and Field calls that without trying to cast to a
static type.
2015-08-27 10:20:30 -06:00
Robert Maynard
a9190e79e9 Merge branch 'suppress_glut_deprecation' into 'master'
Suppress deprecation warnings about glut as we investigate our options.

Starting in OSX 10.9, apple has deprecated the glut.h provided header
so we need to figure out how we want to do window management on OSX. I expect
the way forward is to require the developer to install openGLUT.

See merge request !142
2015-08-27 10:01:46 -04:00
Robert Maynard
78cef0c33d Suppress deprecation warnings about glut as we investigate our options.
Starting in OSX 10.9, apple has deprecated the glut.h provided header
so we need to figure out how we want to do window management on OSX. I expect
the way forward is to require the developer to install openGLUT.
2015-08-27 09:37:13 -04:00
Jeremy Meredith
22e6de6312 Merge branch 'newtopology' into 'master'
templating topology worklet to support mappings other than point-to-cell

This adds a FromTopology and ToTopology template type to the topology worklet, removing hard-coded types.

This is a precursor step necessary before we can add other mappings (like cell-to-point, etc.).

See merge request !140
2015-08-26 15:27:36 -04:00
Sujin Philip
e38152206a Clip worklets 2015-08-26 15:21:25 -04:00
Jeremy Meredith
e1f08d4eeb two small code fixes. 2015-08-26 14:51:20 -04:00
Robert Maynard
fe7a202813 Merge branch 'correct_line_endings' into 'master'
Update all of the opengl folder to use the correct line-endings.

Previously they had been comitted with Windows line endings.

See merge request !143
2015-08-26 14:09:24 -04:00
Robert Maynard
944cd6111f Update all of the opengl folder to use the correct line-endings.
Previously they had been comitted with Windows line endings.
2015-08-26 12:30:15 -04:00
Robert Maynard
619103b202 Update cuda ScanExclusive to handle dereferencing device only arrays. 2015-08-26 11:51:02 -04:00
Robert Maynard
38ed239ed0 Update ExternalFaces to the new CoordinateSystem design. 2015-08-26 08:49:17 -04:00
Robert Maynard
e583d0f7d8 Merge branch 'master' into add-external-faces 2015-08-26 08:23:26 -04:00
Kenneth Moreland
e30bff00da Merge branch 'coordinate-systems-separate' into 'master'
Coordinate systems separate from fields

Fields for coordinate systems have some common patterns that are not common for other fields. To allow us to specialize and optimize for point coordinate fields, store them in a separate field list.

See merge request !137
2015-08-25 18:04:04 -04:00
Robert Maynard
bc6ed6f6ad Merge branch 'opengl_interop_warnings' into 'master'
Correct unsigned to signed warning in TestingOpenGLInterop.

See merge request !141
2015-08-25 17:43:47 -04:00
Robert Maynard
611cc4d06b Correct unsigned to signed warnings in opengl interop code. 2015-08-25 17:36:31 -04:00
Kenneth Moreland
91db8ad06f Remove PointCoordinates classes
The idea of the PointCoordinate classes was to make it easier to define
new special types of point coordinate arrays. But ultimately you have to
create an array handle type, and the CoordinateSystem class pretty much
handles everything else for you. Thus, these classes where being used
nowhere.
2015-08-25 14:38:50 -06:00
Kenneth Moreland
a99f828ca3 CoordinateSystem handles uniform point coordinates.
The point of making CoordinateSystem a special type of Field object
was so that it could handle special array types like implicit regular
point coordinates. Overload the GetData and GetBounds methods to
properly handle this type of array.
2015-08-25 14:38:50 -06:00
Kenneth Moreland
51f0100b26 Refactor DynamicArrayHandle to have a common base.
Originally, DynamicArrayHandle only automatically handled the default
type and storage lists. There was an internal subclass that expanded
that to user defined lists, but it was a bit inaccessible. This change
makes DynamicArrayHandle match the structure of DynamicCellSet. There is
now a templated base class named DynamicArrayHandleBase that can accept
any pair of lists. DynamicArrayHandle itself is really just a typedef of
DynamicArrayHandleBase with the default lists.
2015-08-25 14:38:50 -06:00
Kenneth Moreland
9f624f0a36 Have CoordinateSystem inherit from Field
Previously, coordinate systems in a DataSet simply pointed to field data
specifying the coordinate information (although the ability to get that
back out of the DataSet was missing). This makes sense since point
coordinates are in fact just fields with a particular semantic meaning
to them.

However, there is an issue with this approach. It turns out that there
are special representations that are very common for point coordinates
and very uncommon for other types of fields. For example, a uniform
(a.k.a. regular or image) grid has point coordinates that are easily
derived from the point index, but such fields are quite uncommon
elsewhere.

Representing this kind of structure in the Field list of a DataSet is
problematic. Either all fields have to check to see if they are this
type, which will cause an explosion of unnecessary generated code, or
you will have to actually write out the coordinates in memory, which is
really wasteful but what was done previously.

However, by storing fields representing coordinate systems in a separate
batch, we can use these special types without the stated explosion.
2015-08-25 14:38:41 -06:00
Kenneth Moreland
2d518b1f24 Update ArrayPortalUniformPointCoordinates
Move ArrayPortalUniformPointCoordinates to the vtkm::internal namespace
since it is going to be actively used in both control and execution
environments.

Replace usage of extent with simple dimensions. We have decided that
there is not a lot of value in supporting extent in VTK-m.
2015-08-25 14:27:01 -06:00
Jeremy Meredith
d1a979782c removing explicit from/to topology template types for dispatcher.
these can be obtained from the topology worklet type.
2015-08-25 15:56:24 -04:00
Jeremy Meredith
6df4c2e4f1 templating topology worklet to support mappings other than point-to-cell. 2015-08-25 15:37:53 -04:00
Jeremy Meredith
d014b13432 Merge branch 'datamodel-enhancements' into 'master'
adding ability to specify an association type when requesting fields.

This modifies the `DataSet::GetField` method to take an optional association.
I also adding testing of the `GetField` method (including this variation)
to data set unit tests.

See merge request !123
2015-08-25 13:32:57 -04:00
Jeremy Meredith
0da4a0c1b5 fixing one more problem from merge 2015-08-25 12:18:47 -04:00
Jeremy Meredith
caebd4c021 Merge branch 'datamodel-enhancements' of gitlab.kitware.com:jsmeredith/vtk-m into datamodel-enhancements
Conflicts:
	vtkm/cont/testing/UnitTestDataSetRegular.cxx
2015-08-25 11:13:54 -04:00
Jeremy Meredith
aa99c60737 fix problem created during merge conflict resolution. 2015-08-25 11:11:40 -04:00
Jeremy Meredith
ed745fbec2 indentation fix 2015-08-25 11:03:44 -04:00
Jeremy Meredith
4678ae8bde fixing final warning. 2015-08-25 10:58:18 -04:00
Jeremy Meredith
d88f2bf1b3 fixing warnings from unused result in unit tests. 2015-08-25 10:58:18 -04:00
Jeremy Meredith
34112645b9 adding case for new "ANY" association. 2015-08-25 10:58:18 -04:00
Jeremy Meredith
9c77b56b4a adding ability to specify an association type when requesting fields.
also adding testing of GetField to UnitTestDataSet tests.
2015-08-25 10:58:09 -04:00
Robert Maynard
46be998e2c Update ExternalFaces to use the new pseudo exec vec classes. 2015-08-25 09:27:11 -04:00
Robert Maynard
a23125575a Merge branch 'master' into add-external-faces 2015-08-24 16:22:35 -04:00
Sujin Philip
0e964f6484 Merge topic 'fix-ExecutionWholeArray'
e2129364 Fix ExecutionWholeArray

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !138
2015-08-24 15:33:08 -04:00
Sujin Philip
e2129364a4 Fix ExecutionWholeArray
The constructor for execution whole array was wrong and would result in compilation error if used. This fixes that and adds a test path for testing ExecutionWholeArray with ExecutionWholeArrayConst.
2015-08-24 14:42:22 -04:00
Robert Maynard
5e682d4988 Merge topic 'openGL_Interop'
754bf623 Fix compile time errors
a9589c34 Add Magnitude worklet. Used in OpenGL testing.
2abf599c Add OpenGL Interop Functionality
d9433480 CMake configuration definitions to enable OpenGL Interop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !112
2015-08-24 08:27:45 -04:00
heschroots
754bf623f3 Fix compile time errors
Add DeviceAdapterAlgorithm as an include to the TransferToOpenGL
file.

Clean up comments in opengl/cuda/internal/TransferToOpenGL.h

Add FindGLEW.cmake to the License exepmtion list
2015-08-21 11:17:10 -07:00
hschroot
a9589c34ea Add Magnitude worklet. Used in OpenGL testing. 2015-08-21 11:17:10 -07:00
hschroot
2abf599c42 Add OpenGL Interop Functionality
Copy the OpenGL Interop code from DAX and convert it to VTKm.
Tests include transferring data to an OpenGL context for all VTKm common
data types.

A WindowBase class using GLUT is also included.
2015-08-21 11:17:10 -07:00
hschroot
d943348060 CMake configuration definitions to enable OpenGL Interop
Copy all OpenGL interop related configurations from the DAX CMake files
2015-08-21 11:17:10 -07:00
Robert Maynard
9622905c79 Merge branch 'correct_const_in_cellset_explicit' into 'master'
Make all the Get methods return by const ref.

See merge request !136
2015-08-19 11:30:06 -04:00
Kenneth Moreland
cf6af174eb Merge branch 'variable-topology-fields' into 'master'
Variable topology fields

Changes to fetching in topology maps that lets you properly deal with cases where you do not know how many values are being fetched at compile time. For example, explicit cell sets can have any number of cell shapes that have different numbers of nodes.

This change should resolve issue #26.

See merge request !128
2015-08-19 11:27:43 -04:00
Robert Maynard
219ecc37a5 Make all the Get methods return by const ref. 2015-08-19 10:58:40 -04:00