Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

fleshing out cell set and data set more.

Browse Source
This commit is contained in:
Jeremy Meredith 2015-05-11 16:54:16 -04:00
parent ed5ddc849e
commit 8a382f138a
3 changed files with 108 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
vtkm/cont/CellSet.h
View File

@ -1,9 +1,29 @@
//============================================================================
// 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.
//============================================================================
#ifndef vtk_m_cont_CellSet_h
#define vtk_m_cont_CellSet_h
#include <vtkm/CellType.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/Field.h>
#include <vtkm/cont/LogicalStructure.h>
#include <vtkm/cont/DynamicArrayHandle.h>
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
@ -13,7 +33,40 @@ namespace cont {
class CellSet
{
public:
CellSet() {}
CellSet(const std::string &n, int d)
: name(n), dimensionality(d), structure(NULL)
{
}
virtual ~CellSet()
{
}
virtual std::string GetName()
{
return name;
}
virtual int GetDimensionality()
{
return dimensionality;
}
virtual int GetNumCells() = 0;
virtual int GetNumFaces()
{
return 0;
}
virtual int GetNumEdges()
{
return 0;
}
private:
std::string name;
int dimensionality;
vtkm::cont::LogicalStructure *structure;
};
}

27
vtkm/cont/DataSet.h
View File

@ -1,3 +1,22 @@
//============================================================================
// 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.
//============================================================================
#ifndef vtk_m_cont_DataSet_h
#define vtk_m_cont_DataSet_h
@ -31,10 +50,6 @@ public:
Copy(tmp, array);
Fields.resize(Fields.size()+1);
Fields[Fields.size()-1].SetData(array);
/*
Fields.resize(Fields.size()+1);
Fields[Fields.size()-1].CopyIntoData(tmp);
*/
}
vtkm::cont::Field &GetField(int index)
{
@ -58,8 +73,8 @@ private:
std::vector<vtkm::cont::CellSet*> CellSets;
};
}
} // namespace vtkm::cont
} // namespace cont
} // namespace vtkm
#endif //vtk_m_cont_DataSet_h

33
vtkm/cont/LogicalStructure.h Normal file
View File

@ -0,0 +1,33 @@
//============================================================================
// 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.
//============================================================================
#ifndef vtk_m_cont_LogicalStructure_h
#define vtk_m_cont_LogicalStructure_h
namespace vtkm {
namespace cont {
class LogicalStructure
{
};
} // namespace cont
} // namespace vtkm
#endif