From 91631760a78f950827ec294cbd230911baaa00cf Mon Sep 17 00:00:00 2001 From: Abhishek Yenpure Date: Thu, 6 Jan 2022 08:42:21 -0800 Subject: [PATCH] Missing changes for cell centered velocity fields --- vtkm/filter/FilterParticleAdvection.hxx | 2 +- vtkm/filter/FilterTemporalParticleAdvection.hxx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vtkm/filter/FilterParticleAdvection.hxx b/vtkm/filter/FilterParticleAdvection.hxx index d4f9bf800..aff2ebb74 100644 --- a/vtkm/filter/FilterParticleAdvection.hxx +++ b/vtkm/filter/FilterParticleAdvection.hxx @@ -57,7 +57,7 @@ FilterParticleAdvection::CreateDataSetIntegrators( { vtkm::Id blockId = boundsMap.GetLocalBlockId(i); auto ds = input.GetPartition(i); - if (!ds.HasPointField(activeField)) + if (!ds.HasPointField(activeField) && !ds.HasCellField(activeField)) throw vtkm::cont::ErrorFilterExecution("Unsupported field assocation"); dsi.push_back(DSIType(ds, blockId, activeField)); } diff --git a/vtkm/filter/FilterTemporalParticleAdvection.hxx b/vtkm/filter/FilterTemporalParticleAdvection.hxx index 9d9769ce2..5e86dc19d 100644 --- a/vtkm/filter/FilterTemporalParticleAdvection.hxx +++ b/vtkm/filter/FilterTemporalParticleAdvection.hxx @@ -55,7 +55,8 @@ FilterTemporalParticleAdvection::CreateDataSetIntegrators( vtkm::Id blockId = boundsMap.GetLocalBlockId(i); auto dsPrev = input.GetPartition(i); auto dsNext = this->NextDataSet.GetPartition(i); - if (!dsPrev.HasPointField(activeField) || !dsNext.HasPointField(activeField)) + if (!(dsPrev.HasPointField(activeField) || dsPrev.HasCellField(activeField)) || + !(dsNext.HasPointField(activeField) || dsNext.HasCellField(activeField))) throw vtkm::cont::ErrorFilterExecution("Unsupported field assocation"); dsi.push_back( DSIType(dsPrev, this->PreviousTime, dsNext, this->NextTime, blockId, activeField));