mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 02:25:42 +00:00
c5c1dee4fc
Clean up CellSet Underneath the CellSet implementation is a set of supporting classes that manage the actual structure in both the control and execution environments. However, the implementation of these classes was a bit confusing and inconsistent. The following changes are made: * Most significantly, there is no longer any Connectivity classes in the control environment. This functionality has been wrapped up into the CellSet classes, which is more consistent and easier to understand. (There was a definite distinction between CellSet and Connectivity, but it was subtle and difficult to understand.) This also means that edits to CellSets happen to CellSets directly. * The set of classes for structured and explicit cell sets match. There is different functionality within, but the class naming and meaning are consistent. * Make the class names more consistent with the rest of VTK-m class names. Specifically classes like ExplicitConnectivity become ConnectivityExplicit. Also, the words regular and structured were being used interchangeably. Now, always use structured except when dealing specifically with grids of regular spacing. * The connectivity classes were using the nomenclature "From" and "To" to specify topological elements of links. The same concept in worklet classes were using the nomenclature "Src" and "Dest." For consistency, all references are changed to "From" and "To". * Unlike explicit cell sets, structured cell sets have functionality shared between control and execution environments. Rather than duplicate it or create unique exposed classes, have a shared internal implementation in vtkm::internal. See merge request !117
63 lines
1.8 KiB
CMake
63 lines
1.8 KiB
CMake
##============================================================================
|
|
## Copyright (c) Kitware, Inc.
|
|
## All rights reserved.
|
|
## See LICENSE.txt for details.
|
|
## This software is distributed WITHOUT ANY WARRANTY; without even
|
|
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
## PURPOSE. See the above copyright notice for more information.
|
|
##
|
|
## Copyright 2014 Sandia Corporation.
|
|
## Copyright 2014 UT-Battelle, LLC.
|
|
## Copyright 2014 Los Alamos National Security.
|
|
##
|
|
## Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
|
|
## the U.S. Government retains certain rights in this software.
|
|
##
|
|
## Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
|
|
## Laboratory (LANL), the U.S. Government retains certain rights in
|
|
## this software.
|
|
##============================================================================
|
|
|
|
include_directories(${Boost_INCLUDE_DIRS})
|
|
|
|
set(headers
|
|
BinaryPredicates.h
|
|
BinaryOperators.h
|
|
CellType.h
|
|
Extent.h
|
|
ListTag.h
|
|
Math.h
|
|
Matrix.h
|
|
Pair.h
|
|
TopologyElementTag.h
|
|
TypeListTag.h
|
|
Types.h
|
|
TypeTraits.h
|
|
VectorAnalysis.h
|
|
VecTraits.h
|
|
UnaryPredicates.h
|
|
)
|
|
|
|
vtkm_pyexpander_generated_file(Math.h)
|
|
|
|
vtkm_declare_headers(${headers})
|
|
|
|
#-----------------------------------------------------------------------------
|
|
#first add all the components vtkm that are shared between control and exec
|
|
add_subdirectory(testing)
|
|
add_subdirectory(internal)
|
|
|
|
#-----------------------------------------------------------------------------
|
|
#add the control and exec folders
|
|
add_subdirectory(cont)
|
|
add_subdirectory(exec)
|
|
|
|
#-----------------------------------------------------------------------------
|
|
#add the worklet folder
|
|
add_subdirectory(worklet)
|
|
|
|
#-----------------------------------------------------------------------------
|
|
#add the benchmarking folder
|
|
add_subdirectory(benchmarking)
|
|
|