Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Change all usage of IsField* to Is*Field.

Browse Source
This commit is contained in:
Dave Pugmire 2022-08-29 14:42:02 -04:00
parent e395fe8fe8
commit fbe78b45cf
50 changed files with 99 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tutorial/extract_edges.cxx
View File

@ -127,11 +127,11 @@ VTKM_CONT bool DoMapField(
{
vtkm::cont::Field outputField;
if (inputField.IsFieldPoint())
if (inputField.IsPointField())
{
outputField = inputField; // pass through
}
else if (inputField.IsFieldCell())
else if (inputField.IsCellField())
{
vtkm::cont::Field permuted;
vtkm::filter::MapFieldPermutation(inputField, OutputToInputCellMap, permuted);

3
vtkm/cont/Field.h
View File

@ -40,7 +40,7 @@ public:
Partitions,
Global,
ANY VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::Any.") = Any,
WHOLE_MESH VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::WholeMesh.") =
WHOLE_MESH VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::WholeDataSet.") =
WholeDataSet,
POINTS VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::Points.") = Points,
CELL_SET VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::Cells.") = Cells,
@ -78,7 +78,6 @@ public:
}
VTKM_CONT bool IsPartitionsField() const
{
return this->FieldAssociation == Association::WholeMesh;
return this->FieldAssociation == Association::Partitions;
}
VTKM_CONT bool IsGlobalField() const { return this->FieldAssociation == Association::Global; }

2
vtkm/filter/Lagrangian.hxx
View File

@ -333,7 +333,7 @@ inline VTKM_CONT bool Lagrangian::MapFieldOntoOutput(vtkm::cont::DataSet& result
const vtkm::cont::Field& field,
vtkm::filter::PolicyBase<DerivedPolicy>)
{
if (field.IsFieldGlobal())
if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

2
vtkm/filter/LagrangianStructures.hxx
View File

@ -176,7 +176,7 @@ inline VTKM_CONT bool LagrangianStructures::MapFieldOntoOutput(
const vtkm::cont::Field& field,
vtkm::filter::PolicyBase<DerivedPolicy>)
{
if (field.IsFieldGlobal())
if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

4
vtkm/filter/clean_grid/CleanGrid.cxx
View File

@ -45,7 +45,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::filter::clean_grid::CleanGrid& self,
vtkm::filter::clean_grid::SharedStates& worklets)
{
if (field.IsFieldPoint() && (self.GetCompactPointFields() || self.GetMergePoints()))
if (field.IsPointField() && (self.GetCompactPointFields() || self.GetMergePoints()))
{
vtkm::cont::Field compactedField;
if (self.GetCompactPointFields())
@ -72,7 +72,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
return true;
}
}
else if (field.IsFieldCell() && self.GetRemoveDegenerateCells())
else if (field.IsCellField() && self.GetRemoveDegenerateCells())
{
return vtkm::filter::MapFieldPermutation(
field, worklets.CellCompactor.GetValidCellIds(), result);

2
vtkm/filter/connected_components/ImageConnectivity.cxx
View File

@ -21,7 +21,7 @@ VTKM_CONT vtkm::cont::DataSet ImageConnectivity::DoExecute(const vtkm::cont::Dat
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorBadValue("Active field for ImageConnectivity must be a point field.");
}

8
vtkm/filter/contour/ClipWithField.cxx
View File

@ -41,7 +41,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
vtkm::worklet::Clip& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
auto resolve = [&](const auto& concrete) {
// use std::decay to remove const ref from the decltype of concrete.
@ -56,13 +56,13 @@ bool DoMapField(vtkm::cont::DataSet& result,
resolve);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
// Use the precompiled field permutation function.
vtkm::cont::ArrayHandle<vtkm::Id> permutation = worklet.GetCellMapOutputToInput();
return vtkm::filter::MapFieldPermutation(field, permutation, result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;
@ -78,7 +78,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
vtkm::cont::DataSet ClipWithField::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

6
vtkm/filter/contour/ClipWithImplicitFunction.cxx
View File

@ -41,7 +41,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::Clip& Worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
auto resolve = [&](const auto& concrete) {
// use std::decay to remove const ref from the decltype of concrete.
@ -56,13 +56,13 @@ bool DoMapField(vtkm::cont::DataSet& result,
resolve);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
// Use the precompiled field permutation function.
vtkm::cont::ArrayHandle<vtkm::Id> permutation = Worklet.GetCellMapOutputToInput();
return vtkm::filter::MapFieldPermutation(field, permutation, result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

8
vtkm/filter/contour/Contour.cxx
View File

@ -43,7 +43,7 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
vtkm::worklet::Contour& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
auto functor = [&](const auto& concrete) {
auto fieldArray = worklet.ProcessPointField(concrete);
@ -54,13 +54,13 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
functor);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
// Use the precompiled field permutation function.
vtkm::cont::ArrayHandle<vtkm::Id> permutation = worklet.GetCellIdMap();
return vtkm::filter::MapFieldPermutation(field, permutation, result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;
@ -93,7 +93,7 @@ vtkm::cont::DataSet Contour::DoExecute(const vtkm::cont::DataSet& inDataSet)
vtkm::worklet::Contour worklet;
worklet.SetMergeDuplicatePoints(this->GetMergeDuplicatePoints());
if (!this->GetFieldFromDataSet(inDataSet).IsFieldPoint())
if (!this->GetFieldFromDataSet(inDataSet).IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

6
vtkm/filter/contour/MIRFilter.cxx
View File

@ -53,7 +53,7 @@ VTKM_CONT bool MIRFilter::DoMapField(
return false;
}
if (field.IsFieldPoint())
if (field.IsPointField())
{
auto resolve = [&](const auto& concrete) {
using T = typename std::decay_t<decltype(concrete)>::ValueType;
@ -67,7 +67,7 @@ VTKM_CONT bool MIRFilter::DoMapField(
resolve);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, filterCellInterp, result);
}
@ -117,7 +117,7 @@ VTKM_CONT vtkm::cont::DataSet MIRFilter::DoExecute(const vtkm::cont::DataSet& in
vtkm::cont::Field or_len = input.GetField(this->len_name);
vtkm::cont::Field or_ids = input.GetField(this->id_name);
vtkm::cont::Field or_vfs = input.GetField(this->vf_name);
// TODO: Check all fields for 'IsFieldCell'
// TODO: Check all fields for 'IsCellField'
vtkm::cont::ArrayHandle<vtkm::FloatDefault> vfsdata_or, vfsdata;
vtkm::cont::ArrayHandle<vtkm::Id> idsdata_or, idsdata, lendata_or, lendata, posdata_or, posdata,
allids;

8
vtkm/filter/entity_extraction/ExternalFaces.cxx
View File

@ -47,7 +47,7 @@ vtkm::cont::DataSet ExternalFaces::GenerateOutput(const vtkm::cont::DataSet& inp
for (vtkm::Id fieldIdx = 0; fieldIdx < numFields && !hasCellFields; ++fieldIdx)
{
const auto& f = input.GetField(fieldIdx);
hasCellFields = f.IsFieldCell();
hasCellFields = f.IsCellField();
}
if (!hasCellFields)
@ -104,16 +104,16 @@ vtkm::cont::DataSet ExternalFaces::DoExecute(const vtkm::cont::DataSet& input)
bool ExternalFaces::MapFieldOntoOutput(vtkm::cont::DataSet& result, const vtkm::cont::Field& field)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
result.AddField(field);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, this->Worklet->GetCellIdMap(), result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

6
vtkm/filter/entity_extraction/ExtractGeometry.cxx
View File

@ -20,17 +20,17 @@ bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::ExtractGeometry& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
result.AddField(field);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
vtkm::cont::ArrayHandle<vtkm::Id> permutation = worklet.GetValidCellIds();
return vtkm::filter::MapFieldPermutation(field, permutation, result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

4
vtkm/filter/entity_extraction/ExtractPoints.cxx
View File

@ -17,12 +17,12 @@ namespace
bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field)
{
// point data is copied as is because it was not collapsed
if (field.IsFieldPoint())
if (field.IsPointField())
{
result.AddField(field);
return true;
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

6
vtkm/filter/entity_extraction/ExtractStructured.cxx
View File

@ -20,15 +20,15 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::ArrayHandle<vtkm::Id>& CellFieldMap,
const vtkm::cont::ArrayHandle<vtkm::Id>& PointFieldMap)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
return vtkm::filter::MapFieldPermutation(field, PointFieldMap, result);
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, CellFieldMap, result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

6
vtkm/filter/entity_extraction/GhostCellRemove.cxx
View File

@ -277,17 +277,17 @@ bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::Threshold& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
//we copy the input handle to the result dataset, reusing the metadata
result.AddField(field);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetValidCellIds(), result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

4
vtkm/filter/entity_extraction/Mask.cxx
View File

@ -17,12 +17,12 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::Mask& worklet)
{
if (field.IsFieldPoint() || field.IsFieldGlobal())
if (field.IsPointField() || field.IsWholeDataSetField())
{
result.AddField(field); // pass through
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetValidCellIds(), result);
}

4
vtkm/filter/entity_extraction/MaskPoints.cxx
View File

@ -17,12 +17,12 @@ namespace
bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field)
{
// point data is copied as is because it was not collapsed
if (field.IsFieldPoint())
if (field.IsPointField())
{
result.AddField(field);
return true;
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

4
vtkm/filter/entity_extraction/Threshold.cxx
View File

@ -48,13 +48,13 @@ bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::Threshold& worklet)
{
if (field.IsFieldPoint() || field.IsFieldGlobal())
if (field.IsPointField() || field.IsWholeDataSetField())
{
//we copy the input handle to the result dataset, reusing the metadata
result.AddField(field);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetValidCellIds(), result);
}

6
vtkm/filter/entity_extraction/ThresholdPoints.cxx
View File

@ -81,12 +81,12 @@ private:
bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field)
{
// point data is copied as is because it was not collapsed
if (field.IsFieldPoint())
if (field.IsPointField())
{
result.AddField(field);
return true;
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;
@ -138,7 +138,7 @@ VTKM_CONT vtkm::cont::DataSet ThresholdPoints::DoExecute(const vtkm::cont::DataS
const auto& field = this->GetFieldFromDataSet(input);
// field to threshold on must be a point field
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

2
vtkm/filter/field_conversion/CellAverage.cxx
View File

@ -22,7 +22,7 @@ namespace field_conversion
vtkm::cont::DataSet CellAverage::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

2
vtkm/filter/field_conversion/PointAverage.cxx
View File

@ -23,7 +23,7 @@ namespace field_conversion
vtkm::cont::DataSet PointAverage::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = GetFieldFromDataSet(input);
if (!field.IsFieldCell())
if (!field.IsCellField())
{
throw vtkm::cont::ErrorFilterExecution("Cell field expected.");
}

4
vtkm/filter/geometry_refinement/SplitSharpEdges.cxx
View File

@ -24,11 +24,11 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::SplitSharpEdges& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetNewPointsIdArray(), result);
}
else if (field.IsFieldCell() || field.IsFieldGlobal())
else if (field.IsCellField() || field.IsWholeDataSetField())
{
result.AddField(field); // pass through
return true;

6
vtkm/filter/geometry_refinement/Tetrahedralize.cxx
View File

@ -18,20 +18,20 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::Tetrahedralize& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
// point data is copied as is because it was not collapsed
result.AddField(field);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
// cell data must be scattered to the cells created per input cell
vtkm::cont::ArrayHandle<vtkm::Id> permutation =
worklet.GetOutCellScatter().GetOutputToInputMap();
return vtkm::filter::MapFieldPermutation(field, permutation, result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

6
vtkm/filter/geometry_refinement/Triangulate.cxx
View File

@ -19,20 +19,20 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::Triangulate& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
// point data is copied as is because it was not collapsed
result.AddField(field);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
// cell data must be scattered to the cells created per input cell
vtkm::cont::ArrayHandle<vtkm::Id> permutation =
worklet.GetOutCellScatter().GetOutputToInputMap();
return vtkm::filter::MapFieldPermutation(field, permutation, result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

6
vtkm/filter/geometry_refinement/Tube.cxx
View File

@ -18,15 +18,15 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::Tube& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetOutputPointSourceIndex(), result);
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetOutputCellSourceIndex(), result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

6
vtkm/filter/geometry_refinement/VertexClustering.cxx
View File

@ -19,15 +19,15 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::cont::Field& field,
const vtkm::worklet::VertexClustering& worklet)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetPointIdMap(), result);
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
return vtkm::filter::MapFieldPermutation(field, worklet.GetCellIdMap(), result);
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

2
vtkm/filter/image_processing/ComputeMoments.cxx
View File

@ -42,7 +42,7 @@ VTKM_CONT ComputeMoments::ComputeMoments()
VTKM_CONT vtkm::cont::DataSet ComputeMoments::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorBadValue("Active field for ComputeMoments must be a point field.");
}

2
vtkm/filter/image_processing/ImageDifference.cxx
View File

@ -49,7 +49,7 @@ VTKM_CONT vtkm::cont::DataSet ImageDifference::DoExecute(const vtkm::cont::DataS
this->ImageDiffWithinThreshold = true;
const auto& primaryField = this->GetFieldFromDataSet(input);
if (!primaryField.IsFieldPoint())
if (!primaryField.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

2
vtkm/filter/image_processing/ImageMedian.cxx
View File

@ -90,7 +90,7 @@ namespace image_processing
VTKM_CONT vtkm::cont::DataSet ImageMedian::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorBadValue("Active field for ImageMedian must be a point field.");
}

2
vtkm/filter/mesh_info/CellMeasures.cxx
View File

@ -31,7 +31,7 @@ VTKM_CONT CellMeasures::CellMeasures(IntegrationType m)
VTKM_CONT vtkm::cont::DataSet CellMeasures::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("CellMeasures expects point field input.");
}

2
vtkm/filter/mesh_info/MeshQualityArea.cxx
View File

@ -143,7 +143,7 @@ vtkm::Float64 MeshQualityArea::ComputeAverageArea(const vtkm::cont::DataSet& inp
vtkm::cont::DataSet MeshQualityArea::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorBadValue("Active field for MeshQuality must be point coordinates. "
"But the active field is not a point field.");

2
vtkm/filter/mesh_info/MeshQualityVolume.cxx
View File

@ -132,7 +132,7 @@ vtkm::Float64 MeshQualityVolume::ComputeAverageVolume(const vtkm::cont::DataSet&
vtkm::cont::DataSet MeshQualityVolume::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorBadValue("Active field for MeshQuality must be point coordinates. "
"But the active field is not a point field.");

2
vtkm/filter/mesh_info/worklet/MeshQualityWorklet.h
View File

@ -82,7 +82,7 @@ struct MeshQualityWorklet : vtkm::worklet::WorkletVisitCellsWithPoints
VTKM_CONT vtkm::cont::UnknownArrayHandle Run(const vtkm::cont::DataSet& input,
const vtkm::cont::Field& field) const
{
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorBadValue("Active field for MeshQuality must be point coordinates. "
"But the active field is not a point field.");

6
vtkm/filter/resampling/Probe.cxx
View File

@ -28,7 +28,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
const vtkm::worklet::Probe& worklet,
vtkm::Float64 invalidValue)
{
if (field.IsFieldPoint())
if (field.IsPointField())
{
auto resolve = [&](const auto& concrete) {
using T = typename std::decay_t<decltype(concrete)>::ValueType;
@ -41,7 +41,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
resolve);
return true;
}
else if (field.IsFieldCell())
else if (field.IsCellField())
{
vtkm::cont::Field outField;
if (vtkm::filter::MapFieldPermutation(field, worklet.GetCellIds(), outField, invalidValue))
@ -54,7 +54,7 @@ bool DoMapField(vtkm::cont::DataSet& result,
}
return false;
}
else if (field.IsFieldGlobal())
else if (field.IsWholeDataSetField())
{
result.AddField(field);
return true;

4
vtkm/filter/scalar_topology/ContourTreeUniform.cxx
View File

@ -74,7 +74,7 @@ ContourTreeMesh2D::ContourTreeMesh2D()
vtkm::cont::DataSet ContourTreeMesh2D::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("ContourTreeMesh2D expects point field input.");
}
@ -109,7 +109,7 @@ ContourTreeMesh3D::ContourTreeMesh3D()
vtkm::cont::DataSet ContourTreeMesh3D::DoExecute(const vtkm::cont::DataSet& input)
{
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

2
vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx
View File

@ -121,7 +121,7 @@ vtkm::cont::DataSet ContourTreeAugmented::DoExecute(const vtkm::cont::DataSet& i
// Check that the field is Ok
const auto& field = this->GetFieldFromDataSet(input);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

2
vtkm/filter/scalar_topology/ContourTreeUniformDistributed.cxx
View File

@ -531,7 +531,7 @@ vtkm::cont::PartitionedDataSet ContourTreeUniformDistributed::DoExecutePartition
const auto& dataset = input.GetPartition(blockNo);
const auto& field =
dataset.GetField(this->GetActiveFieldName(), this->GetActiveFieldAssociation());
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

2
vtkm/filter/vector_analysis/Gradient.cxx
View File

@ -40,7 +40,7 @@ namespace vector_analysis
vtkm::cont::DataSet Gradient::DoExecute(const vtkm::cont::DataSet& inputDataSet)
{
const auto& field = this->GetFieldFromDataSet(inputDataSet);
if (!field.IsFieldPoint())
if (!field.IsPointField())
{
throw vtkm::cont::ErrorFilterExecution("Point field expected.");
}

2
vtkm/io/VTKDataSetWriter.cxx
View File

@ -353,7 +353,7 @@ void WriteCellFields(std::ostream& out,
for (vtkm::Id f = 0; f < dataSet.GetNumberOfFields(); f++)
{
const vtkm::cont::Field field = dataSet.GetField(f);
if (!field.IsFieldCell())
if (!field.IsCellField())
{
continue;
}

12
vtkm/io/testing/UnitTestVTKDataSetReader.cxx
View File

@ -395,7 +395,7 @@ void TestReadingFishTank()
// And if we open the file in Paraview, we can observe the bounds [0, 156.905].
const vtkm::cont::Field& vec_magnitude = ds.GetField("vec_magnitude");
VTKM_TEST_ASSERT(vec_magnitude.GetName() == "vec_magnitude");
VTKM_TEST_ASSERT(vec_magnitude.IsFieldPoint());
VTKM_TEST_ASSERT(vec_magnitude.IsPointField());
vtkm::Range mag_range;
vec_magnitude.GetRange(&mag_range);
@ -405,7 +405,7 @@ void TestReadingFishTank()
// This info was gleaned from the Paraview Information panel:
const vtkm::cont::Field& vec = ds.GetField("vec");
VTKM_TEST_ASSERT(vec.GetName() == "vec");
VTKM_TEST_ASSERT(vec.IsFieldPoint());
VTKM_TEST_ASSERT(vec.IsPointField());
// Bounds from Information panel:
// [-65.3147, 86.267], [-88.0325, 78.7217], [-67.0969, 156.867]
const vtkm::cont::ArrayHandle<vtkm::Range>& vecRanges = vec.GetRange();
@ -460,7 +460,7 @@ void TestReadingDoublePrecisionFishTank()
// This info was gleaned from the Paraview Information panel:
const vtkm::cont::Field& vec = ds.GetField("vec");
VTKM_TEST_ASSERT(vec.GetName() == "vec");
VTKM_TEST_ASSERT(vec.IsFieldPoint());
VTKM_TEST_ASSERT(vec.IsPointField());
// Bounds from Information panel:
// [-65.3147, 86.267], [-88.0325, 78.7217], [-67.0969, 156.867]
const vtkm::cont::ArrayHandle<vtkm::Range>& vecRanges = vec.GetRange();
@ -508,7 +508,7 @@ void TestReadingASCIIFishTank()
const vtkm::cont::Field& vec = ds.GetField("vec");
VTKM_TEST_ASSERT(vec.GetName() == "vec");
VTKM_TEST_ASSERT(vec.IsFieldPoint());
VTKM_TEST_ASSERT(vec.IsPointField());
// Bounds from Paraview information panel:
// [-65.3147, 86.267], [-88.0325, 78.7217], [-67.0969, 156.867]
const vtkm::cont::ArrayHandle<vtkm::Range>& vecRanges = vec.GetRange();
@ -561,7 +561,7 @@ void TestReadingFusion()
// vec_magnitude [0, 3.73778]
vtkm::cont::Field vec_magnitude = ds.GetField("vec_magnitude");
VTKM_TEST_ASSERT(vec_magnitude.GetName() == "vec_magnitude");
VTKM_TEST_ASSERT(vec_magnitude.IsFieldPoint());
VTKM_TEST_ASSERT(vec_magnitude.IsPointField());
vtkm::Range mag_range;
vec_magnitude.GetRange(&mag_range);
@ -571,7 +571,7 @@ void TestReadingFusion()
vtkm::cont::Field vec = ds.GetField("vec");
VTKM_TEST_ASSERT(vec.GetName() == "vec");
VTKM_TEST_ASSERT(vec.IsFieldPoint());
VTKM_TEST_ASSERT(vec.IsPointField());
const vtkm::cont::ArrayHandle<vtkm::Range>& vecRanges = vec.GetRange();
VTKM_TEST_ASSERT(vecRanges.GetNumberOfValues() == 3);
auto vecRangesReadPortal = vecRanges.ReadPortal();

2
vtkm/rendering/MapperWireframer.cxx
View File

@ -245,7 +245,7 @@ void MapperWireframer::RenderCells(const vtkm::cont::UnknownCellSet& inCellSet,
if (is1D)
{
const bool isSupportedField = inScalarField.IsFieldPoint();
const bool isSupportedField = inScalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue(

4
vtkm/rendering/Wireframer.h
View File

@ -529,12 +529,12 @@ private:
xOffset = static_cast<vtkm::Id>(_x);
}
const bool isSupportedField = ScalarField.IsFieldCell() || ScalarField.IsFieldPoint();
const bool isSupportedField = ScalarField.IsCellField() || ScalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue("Field not associated with cell set or points");
}
const bool isAssocPoints = ScalarField.IsFieldPoint();
const bool isAssocPoints = ScalarField.IsPointField();
{
vtkm::cont::Token token;

4
vtkm/rendering/raytracing/ConnectivityTracer.cxx
View File

@ -205,12 +205,12 @@ void ConnectivityTracer::SetVolumeData(const vtkm::cont::Field& scalarField,
Coords = coords;
MeshConnIsConstructed = false;
const bool isSupportedField = ScalarField.IsFieldCell() || ScalarField.IsFieldPoint();
const bool isSupportedField = ScalarField.IsCellField() || ScalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points");
}
FieldAssocPoints = ScalarField.IsFieldPoint();
FieldAssocPoints = ScalarField.IsPointField();
this->Integrator = Volume;

2
vtkm/rendering/raytracing/CylinderIntersector.cxx
View File

@ -476,7 +476,7 @@ void CylinderIntersector::IntersectionDataImp(Ray<Precision>& rays,
ShapeIntersector::IntersectionPoint(rays);
// TODO: if this is nodes of a mesh, support points
const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint();
const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue("Field not accociated with a cell set");

2
vtkm/rendering/raytracing/GlyphIntersector.cxx
View File

@ -587,7 +587,7 @@ void GlyphIntersector::IntersectionDataImp(Ray<Precision>& rays,
{
ShapeIntersector::IntersectionPoint(rays);
const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint();
const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue(

2
vtkm/rendering/raytracing/GlyphIntersectorVector.cxx
View File

@ -664,7 +664,7 @@ void GlyphIntersectorVector::IntersectionDataImp(Ray<Precision>& rays,
{
ShapeIntersector::IntersectionPoint(rays);
const bool isSupportedField = field.IsFieldCell() || field.IsFieldPoint();
const bool isSupportedField = field.IsCellField() || field.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue(

4
vtkm/rendering/raytracing/QuadIntersector.cxx
View File

@ -501,7 +501,7 @@ void QuadIntersector::IntersectionDataImp(Ray<Precision>& rays,
ShapeIntersector::IntersectionPoint(rays);
// TODO: if this is nodes of a mesh, support points
const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint();
const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue("Field not accociated with a cell set");
@ -510,7 +510,7 @@ void QuadIntersector::IntersectionDataImp(Ray<Precision>& rays,
vtkm::worklet::DispatcherMapField<detail::CalculateNormals>(detail::CalculateNormals())
.Invoke(rays.HitIdx, rays.Dir, rays.NormalX, rays.NormalY, rays.NormalZ, CoordsHandle, QuadIds);
if (scalarField.IsFieldPoint())
if (scalarField.IsPointField())
{
vtkm::worklet::DispatcherMapField<detail::GetLerpedScalar<Precision>>(
detail::GetLerpedScalar<Precision>(vtkm::Float32(scalarRange.Min),

2
vtkm/rendering/raytracing/SphereIntersector.cxx
View File

@ -351,7 +351,7 @@ void SphereIntersector::IntersectionDataImp(Ray<Precision>& rays,
{
ShapeIntersector::IntersectionPoint(rays);
const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint();
const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue(

4
vtkm/rendering/raytracing/TriangleIntersector.cxx
View File

@ -356,12 +356,12 @@ public:
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange)
{
const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint();
const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points");
}
const bool isAssocPoints = scalarField.IsFieldPoint();
const bool isAssocPoints = scalarField.IsPointField();
// Find the triangle normal
vtkm::worklet::DispatcherMapField<CalculateNormals>(CalculateNormals())

4
vtkm/rendering/raytracing/VolumeRendererStructured.cxx
View File

@ -829,12 +829,12 @@ void VolumeRendererStructured::RenderOnDevice(vtkm::rendering::raytracing::Ray<P
logger->AddLogData("calc_ray_start", time);
timer.Start();
const bool isSupportedField = ScalarField->IsFieldCell() || ScalarField->IsFieldPoint();
const bool isSupportedField = ScalarField->IsCellField() || ScalarField->IsPointField();
if (!isSupportedField)
{
throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points");
}
const bool isAssocPoints = ScalarField->IsFieldPoint();
const bool isAssocPoints = ScalarField->IsPointField();
if (IsUniformDataSet)
{