mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
VTK-m once again uses consistent include style
This commit is contained in:
parent
069923d49d
commit
b9e0e541b8
@ -420,6 +420,6 @@ VTKM_EXEC_CONT vtkm::Sphere<CoordType, 3> make_SphereFrom4Points(
|
||||
|
||||
} // namespace vtkm
|
||||
|
||||
#include "vtkm/Geometry.hxx"
|
||||
#include <vtkm/Geometry.hxx>
|
||||
|
||||
#endif // vtk_m_Geometry_h
|
||||
|
@ -18,7 +18,7 @@
|
||||
// this software.
|
||||
//============================================================================
|
||||
|
||||
#include "Field.h"
|
||||
#include <vtkm/cont/Field.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -18,7 +18,7 @@
|
||||
// this software.
|
||||
//============================================================================
|
||||
#define vtk_m_cont_StorageVirtual_cxx
|
||||
#include "StorageVirtual.h"
|
||||
#include <vtkm/cont/StorageVirtual.h>
|
||||
|
||||
#include <vtkm/cont/internal/DeviceAdapterError.h>
|
||||
|
||||
|
@ -17,4 +17,4 @@
|
||||
// Laboratory (LANL), the U.S. Government retains certain rights in
|
||||
// this software.
|
||||
//============================================================================
|
||||
#include "DeviceAdapterRuntimeDetectorCuda.cxx"
|
||||
#include <vtkm/cont/cuda/internal/DeviceAdapterRuntimeDetectorCuda.cxx>
|
||||
|
@ -20,7 +20,7 @@
|
||||
#ifndef vtk_m_cont_internal_DynamicTransform_h
|
||||
#define vtk_m_cont_internal_DynamicTransform_h
|
||||
|
||||
#include "vtkm/internal/IndexTag.h"
|
||||
#include <vtkm/internal/IndexTag.h>
|
||||
|
||||
#include <utility>
|
||||
|
||||
|
@ -18,15 +18,15 @@
|
||||
// this software.
|
||||
//============================================================================
|
||||
|
||||
#include "vtkm/cont/internal/DynamicTransform.h"
|
||||
#include <vtkm/cont/internal/DynamicTransform.h>
|
||||
|
||||
#include "vtkm/cont/ArrayHandle.h"
|
||||
#include "vtkm/cont/DynamicCellSet.h"
|
||||
#include "vtkm/cont/VariantArrayHandle.h"
|
||||
#include <vtkm/cont/ArrayHandle.h>
|
||||
#include <vtkm/cont/DynamicCellSet.h>
|
||||
#include <vtkm/cont/VariantArrayHandle.h>
|
||||
|
||||
#include "vtkm/internal/FunctionInterface.h"
|
||||
#include <vtkm/internal/FunctionInterface.h>
|
||||
|
||||
#include "vtkm/cont/testing/Testing.h"
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -23,11 +23,11 @@
|
||||
* Functions that provide integral measures over cells.
|
||||
*/
|
||||
|
||||
#include "vtkm/CellShape.h"
|
||||
#include "vtkm/CellTraits.h"
|
||||
#include "vtkm/VecTraits.h"
|
||||
#include "vtkm/VectorAnalysis.h"
|
||||
#include "vtkm/exec/FunctorBase.h"
|
||||
#include <vtkm/CellShape.h>
|
||||
#include <vtkm/CellTraits.h>
|
||||
#include <vtkm/VecTraits.h>
|
||||
#include <vtkm/VectorAnalysis.h>
|
||||
#include <vtkm/exec/FunctorBase.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -21,8 +21,8 @@
|
||||
#ifndef vtk_m_filter_CellMeasures_h
|
||||
#define vtk_m_filter_CellMeasures_h
|
||||
|
||||
#include "vtkm/filter/FilterCell.h"
|
||||
#include "vtkm/worklet/CellMeasure.h"
|
||||
#include <vtkm/filter/FilterCell.h>
|
||||
#include <vtkm/worklet/CellMeasure.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -18,10 +18,10 @@
|
||||
// this software.
|
||||
//============================================================================
|
||||
|
||||
#include "vtkm/cont/DynamicCellSet.h"
|
||||
#include "vtkm/cont/ErrorFilterExecution.h"
|
||||
#include "vtkm/filter/internal/CreateResult.h"
|
||||
#include "vtkm/worklet/DispatcherMapTopology.h"
|
||||
#include <vtkm/cont/DynamicCellSet.h>
|
||||
#include <vtkm/cont/ErrorFilterExecution.h>
|
||||
#include <vtkm/filter/internal/CreateResult.h>
|
||||
#include <vtkm/worklet/DispatcherMapTopology.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -20,8 +20,8 @@
|
||||
#ifndef vtk_m_filter_OscillatorSource_h
|
||||
#define vtk_m_filter_OscillatorSource_h
|
||||
|
||||
#include "vtkm/filter/FilterField.h"
|
||||
#include "vtkm/worklet/OscillatorSource.h"
|
||||
#include <vtkm/filter/FilterField.h>
|
||||
#include <vtkm/worklet/OscillatorSource.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -18,10 +18,10 @@
|
||||
// this software.
|
||||
//============================================================================
|
||||
|
||||
#include "vtkm/filter/CellMeasures.h"
|
||||
#include <vtkm/filter/CellMeasures.h>
|
||||
|
||||
#include "vtkm/cont/testing/MakeTestDataSet.h"
|
||||
#include "vtkm/cont/testing/Testing.h"
|
||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include <vtkm/cont/ArrayPortalToIterators.h>
|
||||
|
||||
#include "iterator"
|
||||
#include <iterator>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -21,9 +21,9 @@
|
||||
#ifndef vtk_m_worklet_CellMeasure_h
|
||||
#define vtk_m_worklet_CellMeasure_h
|
||||
|
||||
#include "vtkm/worklet/WorkletMapTopology.h"
|
||||
#include <vtkm/worklet/WorkletMapTopology.h>
|
||||
|
||||
#include "vtkm/exec/CellMeasure.h"
|
||||
#include <vtkm/exec/CellMeasure.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -87,9 +87,9 @@
|
||||
#ifndef vtkm_worklet_contourtree_join_super_arc_finder_h
|
||||
#define vtkm_worklet_contourtree_join_super_arc_finder_h
|
||||
|
||||
#include "vtkm/worklet/contourtree/Types.h"
|
||||
#include "vtkm/worklet/contourtree/VertexValueComparator.h"
|
||||
#include <vtkm/worklet/WorkletMapField.h>
|
||||
#include <vtkm/worklet/contourtree/Types.h>
|
||||
#include <vtkm/worklet/contourtree/VertexValueComparator.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -83,10 +83,10 @@
|
||||
#ifndef vtkm_worklet_contourtree_regular_point_transferrer_h
|
||||
#define vtkm_worklet_contourtree_regular_point_transferrer_h
|
||||
|
||||
#include "vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation_Macros.h"
|
||||
#include "vtkm/worklet/contourtree/Types.h"
|
||||
#include "vtkm/worklet/contourtree/VertexValueComparator.h"
|
||||
#include <vtkm/worklet/WorkletMapField.h>
|
||||
#include <vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation_Macros.h>
|
||||
#include <vtkm/worklet/contourtree/Types.h>
|
||||
#include <vtkm/worklet/contourtree/VertexValueComparator.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -67,8 +67,8 @@
|
||||
#ifndef vtkm_worklet_contourtree_regular_to_candidate_h
|
||||
#define vtkm_worklet_contourtree_regular_to_candidate_h
|
||||
|
||||
#include "vtkm/worklet/contourtree/Types.h"
|
||||
#include <vtkm/worklet/WorkletMapField.h>
|
||||
#include <vtkm/worklet/contourtree/Types.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -72,7 +72,7 @@
|
||||
#include <vtkm/cont/ArrayHandleTransform.h>
|
||||
|
||||
// local includes
|
||||
#include "Types.h"
|
||||
#include <vtkm/worklet/contourtree_augmented/Types.h>
|
||||
|
||||
|
||||
namespace vtkm
|
||||
|
@ -69,8 +69,8 @@
|
||||
#include <iostream>
|
||||
|
||||
// local includes
|
||||
#include "PrintVectors.h"
|
||||
#include "Types.h"
|
||||
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/Types.h>
|
||||
|
||||
//VTKM includes
|
||||
#include <vtkm/Pair.h>
|
||||
|
@ -63,7 +63,6 @@
|
||||
#ifndef vtkm_worklet_contourtree_augmented_contourtreemaker_h
|
||||
#define vtkm_worklet_contourtree_augmented_contourtreemaker_h
|
||||
|
||||
#include "Types.h"
|
||||
#include <iomanip>
|
||||
|
||||
// local includes
|
||||
|
@ -67,8 +67,8 @@
|
||||
#include <iomanip>
|
||||
|
||||
// local includes
|
||||
#include "PrintVectors.h"
|
||||
#include "Types.h"
|
||||
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/Types.h>
|
||||
|
||||
//VTKM includes
|
||||
#include <vtkm/Types.h>
|
||||
|
@ -66,12 +66,12 @@
|
||||
#include <iomanip>
|
||||
|
||||
// local includes
|
||||
#include "PrintVectors.h"
|
||||
#include "Types.h"
|
||||
#include <vtkm/cont/Algorithm.h>
|
||||
#include <vtkm/cont/ArrayHandleConstant.h>
|
||||
#include <vtkm/worklet/Invoker.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/PointerDoubling.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/Types.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/meshextrema/SetStarts.h>
|
||||
|
||||
|
||||
|
@ -357,8 +357,8 @@ void Mesh_DEM_Triangulation_3D<T, StorageType>::DebugPrintValues(
|
||||
} // worklet
|
||||
} // vtkm
|
||||
|
||||
#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h" // include Mesh_DEM_Triangulation_2D_Freudenthal
|
||||
#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_Freudenthal
|
||||
#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_MarchinCubes
|
||||
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h> // include Mesh_DEM_Triangulation_2D_Freudenthal
|
||||
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h> // include Mesh_DEM_Triangulation_3D_Freudenthal
|
||||
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h> // include Mesh_DEM_Triangulation_3D_MarchinCubes
|
||||
|
||||
#endif
|
||||
|
@ -75,8 +75,8 @@
|
||||
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
|
||||
|
||||
// local includes
|
||||
#include "../../cont/arg/Transport.h"
|
||||
#include "Types.h"
|
||||
#include <vtkm/cont/arg/Transport.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/Types.h>
|
||||
|
||||
|
||||
namespace vtkm
|
||||
|
@ -70,8 +70,8 @@
|
||||
#include <iostream>
|
||||
|
||||
// local includes
|
||||
#include "PrintVectors.h"
|
||||
#include "Types.h"
|
||||
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
|
||||
#include <vtkm/worklet/contourtree_augmented/Types.h>
|
||||
|
||||
//VTKM includes
|
||||
#include <vtkm/Pair.h>
|
||||
|
@ -20,7 +20,7 @@
|
||||
#ifndef VTKM_KERNEL_GAUSSIAN_H
|
||||
#define VTKM_KERNEL_GAUSSIAN_H
|
||||
|
||||
#include "KernelBase.h"
|
||||
#include <vtkm/worklet/splatkernels/KernelBase.h>
|
||||
|
||||
//
|
||||
// Gaussian kernel.
|
||||
|
@ -20,7 +20,7 @@
|
||||
#ifndef VTKM_KERNEL_SPLINE_3RD_ORDER_H
|
||||
#define VTKM_KERNEL_SPLINE_3RD_ORDER_H
|
||||
|
||||
#include "KernelBase.h"
|
||||
#include <vtkm/worklet/splatkernels/KernelBase.h>
|
||||
|
||||
//
|
||||
// Spline 3rd Order kernel.
|
||||
|
@ -18,11 +18,11 @@
|
||||
// this software.
|
||||
//============================================================================
|
||||
|
||||
#include "vtkm/worklet/CellMeasure.h"
|
||||
#include "vtkm/worklet/DispatcherMapTopology.h"
|
||||
#include <vtkm/worklet/CellMeasure.h>
|
||||
#include <vtkm/worklet/DispatcherMapTopology.h>
|
||||
|
||||
#include "vtkm/cont/testing/MakeTestDataSet.h"
|
||||
#include "vtkm/cont/testing/Testing.h"
|
||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
@ -23,13 +23,7 @@
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
#include <vtkm/worklet/splatkernels/Gaussian.h>
|
||||
#include <vtkm/worklet/splatkernels/Spline3rdOrder.h>
|
||||
/*
|
||||
#include "KernelBox.h"
|
||||
#include "KernelCusp.h"
|
||||
#include "KernelQuadratic.h"
|
||||
#include "KernelSpline5thOrder.h"
|
||||
#include "KernelWendland.h"
|
||||
*/
|
||||
|
||||
|
||||
using Vector = vtkm::Vec<vtkm::Float64, 3>;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user