Merge topic 'filter_corrections'
779bd587 Bug: CellAverage output storage type can be different than the input. c0bd0a67 Add missing new lines and #endif comments to vtkm::filter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !387
This commit is contained in:
commit
465250f82c
@ -52,4 +52,4 @@ private:
|
||||
|
||||
#include <vtkm/filter/CellAverage.hxx>
|
||||
|
||||
#endif // vtk_m_filter_CellAverage_h
|
||||
#endif // vtk_m_filter_CellAverage_h
|
||||
|
@ -50,7 +50,7 @@ vtkm::filter::FieldResult CellAverage::DoExecute(const vtkm::cont::DataSet &inpu
|
||||
|
||||
//todo: we need to ask the policy what storage type we should be using
|
||||
//If the input is implicit, we should know what to fall back to
|
||||
vtkm::cont::ArrayHandle<T> outArray = field;
|
||||
vtkm::cont::ArrayHandle<T> outArray;
|
||||
|
||||
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellAverage,
|
||||
DeviceAdapter > dispatcher(this->Worklet);
|
||||
|
@ -51,4 +51,4 @@ protected:
|
||||
|
||||
#include <vtkm/filter/CellFilter.hxx>
|
||||
|
||||
#endif // vtk_m_filter_CellFilter_h
|
||||
#endif // vtk_m_filter_CellFilter_h
|
||||
|
@ -33,4 +33,4 @@ CellFilter<Derived>::CellFilter():
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -124,4 +124,4 @@ private:
|
||||
|
||||
#include <vtkm/filter/DataSetFilter.hxx>
|
||||
|
||||
#endif // vtk_m_filter_DataSetFilter_h
|
||||
#endif // vtk_m_filter_DataSetFilter_h
|
||||
|
@ -126,4 +126,4 @@ private:
|
||||
|
||||
#include <vtkm/filter/DataSetWithFieldFilter.hxx>
|
||||
|
||||
#endif // vtk_m_filter_DataSetFilter_h
|
||||
#endif // vtk_m_filter_DataSetWithFieldFilter_h
|
||||
|
@ -45,4 +45,4 @@ public:
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
#endif //vtk_m_filter_DefaultPolicy_h
|
||||
|
@ -56,4 +56,4 @@ public:
|
||||
|
||||
#include <vtkm/filter/ExternalFaces.hxx>
|
||||
|
||||
#endif // vtk_m_filter_Threshold_h
|
||||
#endif // vtk_m_filter_ExternalFaces_h
|
||||
|
@ -127,4 +127,4 @@ private:
|
||||
|
||||
#include <vtkm/filter/FieldFilter.hxx>
|
||||
|
||||
#endif // vtk_m_filter_FieldFilter_h
|
||||
#endif // vtk_m_filter_FieldFilter_h
|
||||
|
@ -98,4 +98,4 @@ private:
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
#endif //vtk_m_filter_FieldMetadata_h
|
||||
|
@ -85,4 +85,4 @@ private:
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
#endif //vtk_m_filter_FieldMetadata_h
|
||||
|
@ -37,4 +37,4 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif //vtk_m_filter_FilterTraits_h
|
||||
|
@ -108,4 +108,4 @@ public:
|
||||
|
||||
#include <vtkm/filter/MarchingCubes.hxx>
|
||||
|
||||
#endif // vtk_m_filter_MarchingCubes_h
|
||||
#endif // vtk_m_filter_MarchingCubes_h
|
||||
|
@ -71,4 +71,4 @@ public:
|
||||
|
||||
#include <vtkm/filter/PointElevation.hxx>
|
||||
|
||||
#endif // vtk_m_filter_PointElevation_h
|
||||
#endif // vtk_m_filter_PointElevation_h
|
||||
|
@ -119,4 +119,4 @@ ApplyPolicy(const vtkm::cont::DynamicCellSet& cellset,
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif //vtk_m_filter_PolicyBase_h
|
||||
|
@ -74,4 +74,4 @@ private:
|
||||
|
||||
#include <vtkm/filter/Threshold.hxx>
|
||||
|
||||
#endif // vtk_m_filter_Threshold_h
|
||||
#endif // vtk_m_filter_Threshold_h
|
||||
|
@ -65,4 +65,4 @@ private:
|
||||
|
||||
#include <vtkm/filter/VertexClustering.hxx>
|
||||
|
||||
#endif // vtk_m_filter_Threshold_h
|
||||
#endif // vtk_m_filter_VertexClustering_h
|
||||
|
@ -226,4 +226,4 @@ namespace
|
||||
}
|
||||
} // namespace vtkm::filter::internal
|
||||
|
||||
#endif //vtk_m_filter_internal_ResolveFieldTypeAndExecute_h
|
||||
#endif //vtk_m_filter_internal_ResolveFieldTypeAndMap_h
|
||||
|
Loading…
Reference in New Issue
Block a user