Commit 381d9307 authored by Steven Walton's avatar Steven Walton

I think these are correct. I don't see errors when building Dim now, at least not in this file

parent dab25846
......@@ -26,6 +26,7 @@ set(headers
TypeOfCellQuadrilateral.h
TypeOfCellTetrahedral.h
TypeOfCellTriangle.h
CellDimensionMetric.h
)
......
......@@ -42,7 +42,7 @@
#include "vtkm/VecTraits.h"
#include "vtkm/VectorAnalysis.h"
#include "vtkm/exec/FunctorBase.h"
#include "vtkm/exec/CellMeasure.h"
//#include "vtkm/exec/CellMeasure.h"
#define UNUSED(expr) (void)(expr);
......@@ -59,15 +59,15 @@ using FloatType = vtkm::FloatDefault;
// Dimension is only defined for Hexahedral cell typesk
template <typename OutType, typename PointCoordVecType, typename CellShapeType>
VTKM_EXEC OutType CellDiagonalRatioMetric(const vtkm::IdComponent& numPts,
const PointCoordVecType& pts,
CellShapeType shape,
const vtkm::exec::FunctorBase&)
VTKM_EXEC OutType CellDimensionMetric(const vtkm::IdComponent& numPts,
const PointCoordVecType& pts,
CellShapeType shape,
const vtkm::exec::FunctorBase&)
{
UNUSED(numPts);
UNUSED(pts);
UNUSED(shape);
return OutType(0.0);
return OutType(-1.);
}
template <typename OutType, typename PointCoordVecType>
......@@ -76,10 +76,12 @@ VTKM_EXEC OutType CellDimensionMetric(const vtkm::IdComponent& numPts,
vtkm::CellShapeTagHexahedron,
const vtkm::exec::FunctorBase& worklet)
{
/*
FloatType volume = vtkm::exec::CellMeasure(numPts,
pts,
vtkm::CellShapeTagHexahedron,
worklet);
*/
OutType gradop[8][3];
OutType x1 = pts[0][0];
OutType x2 = pts[1][0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment