Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into relative-size-foundations

Browse Source
This commit is contained in:
Hank Childs 2019-09-27 12:34:26 -07:00
commit dade683eab
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/filter/MeshQuality.h
View File

@ -22,7 +22,7 @@
#define vtk_m_filter_MeshQuality_h
#include <vtkm/CellShape.h>
#include <vtkm/filter/FilterCell.h>
#include <vtkm/filter/FilterField.h>
#include <vtkm/worklet/FieldStatistics.h>
#include <vtkm/worklet/MeshQuality.h>
@ -94,13 +94,12 @@ enum class CellMetric
* Each field contains the metric summary statistics for the cell type.
* Summary statists with all 0 values imply that the specified metric does not support the cell type.
*/
class MeshQuality : public vtkm::filter::FilterCell<MeshQuality>
class MeshQuality : public vtkm::filter::FilterField<MeshQuality>
{
public:
using SupportedTypes = vtkm::TypeListTagFieldVec3;
VTKM_CONT MeshQuality(CellMetric);
void SetOutputName(const std::string& s) { this->OutputName = s; };
template <typename T, typename StorageType, typename DerivedPolicy>
VTKM_CONT vtkm::cont::DataSet DoExecute(
@ -111,7 +110,6 @@ public:
private:
CellMetric MyMetric;
std::string OutputName;
};
} // namespace filter

6
vtkm/filter/MeshQuality.hxx
View File

@ -34,7 +34,7 @@ namespace filter
inline VTKM_CONT MeshQuality::MeshQuality(CellMetric metric)
: vtkm::filter::FilterCell<MeshQuality>()
: vtkm::filter::FilterField<MeshQuality>()
{
this->SetUseCoordinateSystemAsField(true);
this->MyMetric = metric;
@ -42,7 +42,7 @@ inline VTKM_CONT MeshQuality::MeshQuality(CellMetric metric)
{
VTKM_ASSERT(true);
}
this->OutputName = MetricNames[(int)this->MyMetric];
this->SetOutputFieldName(MetricNames[(int)this->MyMetric]);
}
template <typename T, typename StorageType, typename DerivedPolicy>
@ -96,7 +96,7 @@ inline VTKM_CONT vtkm::cont::DataSet MeshQuality::DoExecute(
//Append the metric values of all cells into the output
//dataset as a new field
result.AddField(vtkm::cont::make_FieldCell(this->OutputName, outArray));
result.AddField(vtkm::cont::make_FieldCell(this->GetOutputFieldName(), outArray));
return result;
}