Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more code cleanup.

Browse Source
This commit is contained in:
Dave Pugmire 2022-07-27 11:39:55 -04:00
parent 752fd6ab71
commit b9fd70105d
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/filter/flow/NewFilterParticleAdvection.h
View File

@ -35,11 +35,6 @@ namespace flow
class VTKM_FILTER_FLOW_EXPORT NewFilterParticleAdvection : public vtkm::filter::NewFilterField
{
public:
using SupportedTypes = vtkm::TypeListFieldVec3;
VTKM_CONT
NewFilterParticleAdvection() {}
VTKM_CONT
void SetStepSize(vtkm::FloatDefault s) { this->StepSize = s; }
@ -89,6 +84,9 @@ protected:
throw vtkm::cont::ErrorFilterExecution("Coordinate system as field not supported");
if (this->Seeds.GetNumberOfValues() == 0)
throw vtkm::cont::ErrorFilterExecution("No seeds provided.");
if (!this->Seeds.IsBaseComponentType<vtkm::Particle>() &&
this->Seeds.IsBaseComponentType<vtkm::ChargedParticle>())
throw vtkm::cont::ErrorFilterExecution("Unsupported particle type in seed array.");
if (this->NumberOfSteps == 0)
throw vtkm::cont::ErrorFilterExecution("Number of steps not specified.");
if (this->StepSize == 0)

4
vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.h
View File

@ -75,8 +75,8 @@ protected:
}
vtkm::cont::PartitionedDataSet Input2;
vtkm::FloatDefault Time1;
vtkm::FloatDefault Time2;
vtkm::FloatDefault Time1 = -1;
vtkm::FloatDefault Time2 = -1;
};
}

3
vtkm/filter/flow/ParticleAdvection.h
View File

@ -32,11 +32,10 @@ class VTKM_FILTER_FLOW_EXPORT ParticleAdvection
: public vtkm::filter::flow::NewFilterParticleAdvectionSteadyState
{
public:
protected:
private:
VTKM_CONT vtkm::cont::PartitionedDataSet DoExecutePartitions(
const vtkm::cont::PartitionedDataSet& inData) override;
private:
const vtkm::filter::flow::FlowResultType ResultType =
vtkm::filter::flow::FlowResultType::PARTICLE_ADVECT_TYPE;
};

3
vtkm/filter/flow/PathParticle.h
View File

@ -32,11 +32,10 @@ class VTKM_FILTER_FLOW_EXPORT PathParticle
: public vtkm::filter::flow::NewFilterParticleAdvectionUnsteadyState
{
public:
protected:
private:
VTKM_CONT vtkm::cont::PartitionedDataSet DoExecutePartitions(
const vtkm::cont::PartitionedDataSet& inData) override;
private:
const vtkm::filter::flow::FlowResultType ResultType =
vtkm::filter::flow::FlowResultType::PARTICLE_ADVECT_TYPE;
};

3
vtkm/filter/flow/Pathline.h
View File

@ -32,11 +32,10 @@ class VTKM_FILTER_FLOW_EXPORT Pathline
: public vtkm::filter::flow::NewFilterParticleAdvectionUnsteadyState
{
public:
protected:
private:
VTKM_CONT vtkm::cont::PartitionedDataSet DoExecutePartitions(
const vtkm::cont::PartitionedDataSet& inData) override;
private:
const vtkm::filter::flow::FlowResultType ResultType =
vtkm::filter::flow::FlowResultType::STREAMLINE_TYPE;
};

3
vtkm/filter/flow/Streamline.h
View File

@ -32,11 +32,10 @@ class VTKM_FILTER_FLOW_EXPORT Streamline
: public vtkm::filter::flow::NewFilterParticleAdvectionSteadyState
{
public:
protected:
private:
VTKM_CONT vtkm::cont::PartitionedDataSet DoExecutePartitions(
const vtkm::cont::PartitionedDataSet& inData) override;
private:
const vtkm::filter::flow::FlowResultType ResultType =
vtkm::filter::flow::FlowResultType::STREAMLINE_TYPE;
};