Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b392dc509e
vtk-m2/vtkm/cont/CellSetStructured.h

96 lines
3.0 KiB
C
Raw Normal View History

Correct headers to have the new copyright.
2015-06-03 19:06:43 +00:00
//============================================================================
// 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 2015 Sandia Corporation.
// Copyright 2015 UT-Battelle, LLC.
// Copyright 2015 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.
//============================================================================
adding initial cell set structures
2015-04-15 16:43:12 +00:00
#ifndef vtk_m_cont_CellSetStructured_h
#define vtk_m_cont_CellSetStructured_h
#include <vtkm/cont/CellSet.h>
Make regular conn/struct cont and export. Update other files to reflect the changes.
2015-05-15 19:29:55 +00:00
#include <vtkm/RegularConnectivity.h>
Change TopologyType identifiers from enumeration to tags. Previously, the items used to identify parts of topology like points, cells, faces, etc. were in an enumeration. However, they are only really used in template specialization, and it is easier to use tags in this case. So, change the enumeration to a set of tag structures. Also made the following changes: * Renamed TopologyType to TopologyElement, which is more indicative of what we are referring to. * Moved the structures from the vtkm::cont namespace to the vtkm namespace. There is no reason not to be able to use them from either the control or execution environments. * Added a VTKM_IS_TOPOLOGY_ELEMENT_TAG macro to do type checks on template arguments that are supposed to be topology element tags.
2015-07-31 19:59:37 +00:00
#include <vtkm/TopologyElementTag.h>
Move RegularStructure to ConnectivityStructuredInternals Also moved from vtkm namespace to vtkm::internal namespace. This change is to then move the structured connectivity classes to the cont and exec namespaces.
2015-07-31 21:48:06 +00:00
#include <vtkm/internal/ConnectivityStructuredInternals.h>
adding initial cell set structures
2015-04-15 16:43:12 +00:00
namespace vtkm {
namespace cont {
Add regularStructure and modify regularconnnectivity
2015-05-14 16:22:39 +00:00
Redesign RegularStructure and RegularConnectivity to use vtkm::Vec. By having them use vtkm::Vec the code becomes safer ( no bad indexes on dim=2). Plus CellSetStructured becomes super simple.
2015-05-28 20:49:40 +00:00
template<vtkm::IdComponent DIMENSION>
Make CellSetStructured inherit from CellSet.
2015-05-12 18:57:18 +00:00
class CellSetStructured : public CellSet
adding initial cell set structures
2015-04-15 16:43:12 +00:00
{
updating reg struct usage in cell set
2015-05-15 17:15:11 +00:00
public:
DataSet now holds DynamicCellSet instead of smart_ptr<CellSet> The Invoke of the topology dispatcher is also changed to expect a concrete cell set (which the DynamicCellSet is automatically cast to) rather than a connectivity structure. The dispatcher calls the GetNodeToCellConnectivity method for you. (That is currently the only one supported.)
2015-07-28 23:33:52 +00:00
static const vtkm::IdComponent Dimension=DIMENSION;
Make CellSetStructured inherit from CellSet.
2015-05-12 18:57:18 +00:00
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
VTKM_CONT_EXPORT
Use std::string() instead of "" to initialize strings. As per Robert Maynard's request.
2015-07-30 18:55:24 +00:00
CellSetStructured(const std::string &name = std::string())
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
: CellSet(name,Dimension)
Make CellSetStructured inherit from CellSet.
2015-05-12 18:57:18 +00:00
{
}
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
virtual vtkm::Id GetNumCells() const
Make CellSetStructured inherit from CellSet.
2015-05-12 18:57:18 +00:00
{
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
return this->Structure.GetNumberOfCells();
Make CellSetStructured inherit from CellSet.
2015-05-12 18:57:18 +00:00
}
Change TopologyType identifiers from enumeration to tags. Previously, the items used to identify parts of topology like points, cells, faces, etc. were in an enumeration. However, they are only really used in template specialization, and it is easier to use tags in this case. So, change the enumeration to a set of tag structures. Also made the following changes: * Renamed TopologyType to TopologyElement, which is more indicative of what we are referring to. * Moved the structures from the vtkm::cont namespace to the vtkm namespace. There is no reason not to be able to use them from either the control or execution environments. * Added a VTKM_IS_TOPOLOGY_ELEMENT_TAG macro to do type checks on template arguments that are supposed to be topology element tags.
2015-07-31 19:59:37 +00:00
template<typename FromTopology, typename ToTopology>
DataSet now holds DynamicCellSet instead of smart_ptr<CellSet> The Invoke of the topology dispatcher is also changed to expect a concrete cell set (which the DynamicCellSet is automatically cast to) rather than a connectivity structure. The dispatcher calls the GetNodeToCellConnectivity method for you. (That is currently the only one supported.)
2015-07-28 23:33:52 +00:00
struct ConnectivityType {
Change TopologyType identifiers from enumeration to tags. Previously, the items used to identify parts of topology like points, cells, faces, etc. were in an enumeration. However, they are only really used in template specialization, and it is easier to use tags in this case. So, change the enumeration to a set of tag structures. Also made the following changes: * Renamed TopologyType to TopologyElement, which is more indicative of what we are referring to. * Moved the structures from the vtkm::cont namespace to the vtkm namespace. There is no reason not to be able to use them from either the control or execution environments. * Added a VTKM_IS_TOPOLOGY_ELEMENT_TAG macro to do type checks on template arguments that are supposed to be topology element tags.
2015-07-31 19:59:37 +00:00
VTKM_IS_TOPOLOGY_ELEMENT_TAG(FromTopology);
VTKM_IS_TOPOLOGY_ELEMENT_TAG(ToTopology);
DataSet now holds DynamicCellSet instead of smart_ptr<CellSet> The Invoke of the topology dispatcher is also changed to expect a concrete cell set (which the DynamicCellSet is automatically cast to) rather than a connectivity structure. The dispatcher calls the GetNodeToCellConnectivity method for you. (That is currently the only one supported.)
2015-07-28 23:33:52 +00:00
typedef vtkm::RegularConnectivity<FromTopology,ToTopology,Dimension> Type;
};
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
VTKM_CONT_EXPORT
Change TopologyType identifiers from enumeration to tags. Previously, the items used to identify parts of topology like points, cells, faces, etc. were in an enumeration. However, they are only really used in template specialization, and it is easier to use tags in this case. So, change the enumeration to a set of tag structures. Also made the following changes: * Renamed TopologyType to TopologyElement, which is more indicative of what we are referring to. * Moved the structures from the vtkm::cont namespace to the vtkm namespace. There is no reason not to be able to use them from either the control or execution environments. * Added a VTKM_IS_TOPOLOGY_ELEMENT_TAG macro to do type checks on template arguments that are supposed to be topology element tags.
2015-07-31 19:59:37 +00:00
vtkm::RegularConnectivity<
vtkm::TopologyElementTagPoint,vtkm::TopologyElementTagCell,Dimension>
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
GetNodeToCellConnectivity() const
updating reg struct usage in cell set
2015-05-15 17:15:11 +00:00
{
Change TopologyType identifiers from enumeration to tags. Previously, the items used to identify parts of topology like points, cells, faces, etc. were in an enumeration. However, they are only really used in template specialization, and it is easier to use tags in this case. So, change the enumeration to a set of tag structures. Also made the following changes: * Renamed TopologyType to TopologyElement, which is more indicative of what we are referring to. * Moved the structures from the vtkm::cont namespace to the vtkm namespace. There is no reason not to be able to use them from either the control or execution environments. * Added a VTKM_IS_TOPOLOGY_ELEMENT_TAG macro to do type checks on template arguments that are supposed to be topology element tags.
2015-07-31 19:59:37 +00:00
typedef vtkm::RegularConnectivity<vtkm::TopologyElementTagPoint,
vtkm::TopologyElementTagCell,
Redesign RegularStructure and RegularConnectivity to use vtkm::Vec. By having them use vtkm::Vec the code becomes safer ( no bad indexes on dim=2). Plus CellSetStructured becomes super simple.
2015-05-28 20:49:40 +00:00
Dimension> NodeToCellConnectivity;
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
return NodeToCellConnectivity(this->Structure);
Add some more tests for regular data sets.
2015-05-18 15:04:15 +00:00
}
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
VTKM_CONT_EXPORT
Change TopologyType identifiers from enumeration to tags. Previously, the items used to identify parts of topology like points, cells, faces, etc. were in an enumeration. However, they are only really used in template specialization, and it is easier to use tags in this case. So, change the enumeration to a set of tag structures. Also made the following changes: * Renamed TopologyType to TopologyElement, which is more indicative of what we are referring to. * Moved the structures from the vtkm::cont namespace to the vtkm namespace. There is no reason not to be able to use them from either the control or execution environments. * Added a VTKM_IS_TOPOLOGY_ELEMENT_TAG macro to do type checks on template arguments that are supposed to be topology element tags.
2015-07-31 19:59:37 +00:00
vtkm::RegularConnectivity<
vtkm::TopologyElementTagCell,vtkm::TopologyElementTagPoint,Dimension>
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
GetCellToNodeConnectivity() const
Add some more tests for regular data sets.
2015-05-18 15:04:15 +00:00
{
Change TopologyType identifiers from enumeration to tags. Previously, the items used to identify parts of topology like points, cells, faces, etc. were in an enumeration. However, they are only really used in template specialization, and it is easier to use tags in this case. So, change the enumeration to a set of tag structures. Also made the following changes: * Renamed TopologyType to TopologyElement, which is more indicative of what we are referring to. * Moved the structures from the vtkm::cont namespace to the vtkm namespace. There is no reason not to be able to use them from either the control or execution environments. * Added a VTKM_IS_TOPOLOGY_ELEMENT_TAG macro to do type checks on template arguments that are supposed to be topology element tags.
2015-07-31 19:59:37 +00:00
typedef vtkm::RegularConnectivity<vtkm::TopologyElementTagCell,
vtkm::TopologyElementTagPoint,
Redesign RegularStructure and RegularConnectivity to use vtkm::Vec. By having them use vtkm::Vec the code becomes safer ( no bad indexes on dim=2). Plus CellSetStructured becomes super simple.
2015-05-28 20:49:40 +00:00
Dimension> CellToNodeConnectivity;
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
return CellToNodeConnectivity(this->Structure);
updating reg struct usage in cell set
2015-05-15 17:15:11 +00:00
}
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
virtual void PrintSummary(std::ostream &out) const
Add PrintSummary() for DataSet.
2015-05-20 19:26:10 +00:00
{
Conform DataSet classes to coding practices better The most common changes were making class members uppercase and spelled out, adding "this->" whenever a class member is used, and declare functions and members with export macros. Also fixed some uses of int (instead of vtkm::Id or something similar) and a bit of indentation. I also sprinkled some const goodness over the code. It should be noted that I had about a week delay between first making these changes and checking them in. In the mean time Sujin also made some similar changes, so there might be some repetative changes.
2015-07-12 16:05:47 +00:00
out << " StructuredCellSet: " << this->GetName()
<< " dim= " << this->GetDimensionality() << std::endl;
this->Structure.PrintSummary(out);
Add PrintSummary() for DataSet.
2015-05-20 19:26:10 +00:00
}
updating reg struct usage in cell set
2015-05-15 17:15:11 +00:00
public:
Move RegularStructure to ConnectivityStructuredInternals Also moved from vtkm namespace to vtkm::internal namespace. This change is to then move the structured connectivity classes to the cont and exec namespaces.
2015-07-31 21:48:06 +00:00
vtkm::internal::ConnectivityStructuredInternals<Dimension> Structure;
adding initial cell set structures
2015-04-15 16:43:12 +00:00
};
Redesign RegularStructure and RegularConnectivity to use vtkm::Vec. By having them use vtkm::Vec the code becomes safer ( no bad indexes on dim=2). Plus CellSetStructured becomes super simple.
2015-05-28 20:49:40 +00:00
adding initial cell set structures
2015-04-15 16:43:12 +00:00
}
} // namespace vtkm::cont
#endif //vtk_m_cont_CellSetStructured_h
Reference in New Issue Copy Permalink