More cleanup of classes.
This commit is contained in:
parent
6a934167c2
commit
6b668b9fe8
@ -28,7 +28,7 @@ enum class VectorFieldType
|
||||
ELECTRO_MAGNETIC_FIELD_TYPE,
|
||||
};
|
||||
|
||||
enum class FlowResultType
|
||||
enum FlowResultType
|
||||
{
|
||||
UNKNOWN_TYPE = -1,
|
||||
PARTICLE_ADVECT_TYPE,
|
||||
|
@ -37,16 +37,7 @@ public:
|
||||
using SupportedTypes = vtkm::TypeListFieldVec3;
|
||||
|
||||
VTKM_CONT
|
||||
NewFilterParticleAdvection(vtkm::filter::flow::FlowResultType rType)
|
||||
// : vtkm::filter::NewFilterField()
|
||||
: NumberOfSteps(0)
|
||||
, ResultType(rType)
|
||||
, SolverType(vtkm::filter::flow::IntegrationSolverType::RK4_TYPE)
|
||||
, StepSize(0)
|
||||
, UseThreadedAlgorithm(false)
|
||||
, VecFieldType(vtkm::filter::flow::VectorFieldType::VELOCITY_FIELD_TYPE)
|
||||
{
|
||||
}
|
||||
NewFilterParticleAdvection() {}
|
||||
|
||||
VTKM_CONT
|
||||
void SetStepSize(vtkm::FloatDefault s) { this->StepSize = s; }
|
||||
@ -107,13 +98,14 @@ protected:
|
||||
throw vtkm::cont::ErrorFilterExecution("StepSize cannot be negative");
|
||||
}
|
||||
|
||||
vtkm::Id NumberOfSteps;
|
||||
vtkm::filter::flow::FlowResultType ResultType = vtkm::filter::flow::FlowResultType::UNKNOWN_TYPE;
|
||||
vtkm::Id NumberOfSteps = 0;
|
||||
vtkm::cont::UnknownArrayHandle Seeds;
|
||||
vtkm::filter::flow::IntegrationSolverType SolverType;
|
||||
vtkm::FloatDefault StepSize;
|
||||
bool UseThreadedAlgorithm;
|
||||
vtkm::filter::flow::VectorFieldType VecFieldType;
|
||||
vtkm::filter::flow::IntegrationSolverType SolverType =
|
||||
vtkm::filter::flow::IntegrationSolverType::RK4_TYPE;
|
||||
vtkm::FloatDefault StepSize = 0;
|
||||
bool UseThreadedAlgorithm = false;
|
||||
vtkm::filter::flow::VectorFieldType VecFieldType =
|
||||
vtkm::filter::flow::VectorFieldType::VELOCITY_FIELD_TYPE;
|
||||
|
||||
private:
|
||||
};
|
||||
|
@ -24,15 +24,13 @@ class NewFilterParticleAdvectionSteadyState : public NewFilterParticleAdvection
|
||||
{
|
||||
public:
|
||||
VTKM_CONT
|
||||
NewFilterParticleAdvectionSteadyState(vtkm::filter::flow::FlowResultType rType)
|
||||
: NewFilterParticleAdvection(rType)
|
||||
{
|
||||
}
|
||||
NewFilterParticleAdvectionSteadyState() {}
|
||||
|
||||
protected:
|
||||
VTKM_CONT std::vector<vtkm::filter::flow::DataSetIntegratorSteadyState*> CreateDataSetIntegrators(
|
||||
const vtkm::cont::PartitionedDataSet& input,
|
||||
const vtkm::filter::flow::BoundsMap& boundsMap) const
|
||||
const vtkm::filter::flow::BoundsMap& boundsMap,
|
||||
const vtkm::filter::flow::FlowResultType& resultType) const
|
||||
{
|
||||
using DSIType = vtkm::filter::flow::DataSetIntegratorSteadyState;
|
||||
|
||||
@ -46,8 +44,8 @@ protected:
|
||||
if (!ds.HasPointField(activeField) && !ds.HasCellField(activeField))
|
||||
throw vtkm::cont::ErrorFilterExecution("Unsupported field assocation");
|
||||
|
||||
dsi.push_back(new DSIType(
|
||||
ds, blockId, activeField, this->SolverType, this->VecFieldType, this->ResultType));
|
||||
dsi.push_back(
|
||||
new DSIType(ds, blockId, activeField, this->SolverType, this->VecFieldType, resultType));
|
||||
}
|
||||
|
||||
return dsi;
|
||||
|
@ -24,10 +24,7 @@ class NewFilterParticleAdvectionUnsteadyState : public NewFilterParticleAdvectio
|
||||
{
|
||||
public:
|
||||
VTKM_CONT
|
||||
NewFilterParticleAdvectionUnsteadyState(vtkm::filter::flow::FlowResultType rType)
|
||||
: NewFilterParticleAdvection(rType)
|
||||
{
|
||||
}
|
||||
NewFilterParticleAdvectionUnsteadyState() {}
|
||||
|
||||
VTKM_CONT void SetPreviousTime(vtkm::FloatDefault t1) { this->Time1 = t1; }
|
||||
|
||||
@ -47,7 +44,8 @@ protected:
|
||||
|
||||
VTKM_CONT std::vector<vtkm::filter::flow::DataSetIntegratorUnsteadyState*>
|
||||
CreateDataSetIntegrators(const vtkm::cont::PartitionedDataSet& input,
|
||||
const vtkm::filter::flow::BoundsMap& boundsMap) const
|
||||
const vtkm::filter::flow::BoundsMap& boundsMap,
|
||||
const vtkm::filter::flow::FlowResultType& resultType) const
|
||||
{
|
||||
using DSIType = vtkm::filter::flow::DataSetIntegratorUnsteadyState;
|
||||
|
||||
@ -71,7 +69,7 @@ protected:
|
||||
activeField,
|
||||
this->SolverType,
|
||||
this->VecFieldType,
|
||||
this->ResultType));
|
||||
resultType));
|
||||
}
|
||||
|
||||
return dsi;
|
||||
|
@ -29,7 +29,7 @@ VTKM_CONT vtkm::cont::PartitionedDataSet ParticleAdvection::DoExecutePartitions(
|
||||
this->ValidateOptions();
|
||||
|
||||
vtkm::filter::flow::BoundsMap boundsMap(input);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap, this->ResultType);
|
||||
|
||||
vtkm::filter::flow::ParticleAdvector<DSIType> pav(
|
||||
boundsMap, dsi, this->UseThreadedAlgorithm, this->ResultType);
|
||||
|
@ -32,15 +32,15 @@ class VTKM_FILTER_FLOW_EXPORT ParticleAdvection
|
||||
: public vtkm::filter::flow::NewFilterParticleAdvectionSteadyState
|
||||
{
|
||||
public:
|
||||
VTKM_CONT ParticleAdvection()
|
||||
: NewFilterParticleAdvectionSteadyState(
|
||||
vtkm::filter::flow::FlowResultType::PARTICLE_ADVECT_TYPE)
|
||||
{
|
||||
}
|
||||
VTKM_CONT ParticleAdvection() {}
|
||||
|
||||
protected:
|
||||
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;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -22,6 +22,9 @@ namespace filter
|
||||
namespace flow
|
||||
{
|
||||
|
||||
//vtkm::filter::flow::FlowResultType PathParticle::ResultType = vtkm::filter::flow::FlowResultType::PARTICLE_ADVECT_TYPE;
|
||||
|
||||
|
||||
VTKM_CONT vtkm::cont::PartitionedDataSet PathParticle::DoExecutePartitions(
|
||||
const vtkm::cont::PartitionedDataSet& input)
|
||||
{
|
||||
@ -29,7 +32,7 @@ VTKM_CONT vtkm::cont::PartitionedDataSet PathParticle::DoExecutePartitions(
|
||||
this->ValidateOptions();
|
||||
|
||||
vtkm::filter::flow::BoundsMap boundsMap(input);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap, this->ResultType);
|
||||
|
||||
vtkm::filter::flow::ParticleAdvector<DSIType> pav(
|
||||
boundsMap, dsi, this->UseThreadedAlgorithm, this->ResultType);
|
||||
|
@ -32,15 +32,15 @@ class VTKM_FILTER_FLOW_EXPORT PathParticle
|
||||
: public vtkm::filter::flow::NewFilterParticleAdvectionUnsteadyState
|
||||
{
|
||||
public:
|
||||
VTKM_CONT PathParticle()
|
||||
: NewFilterParticleAdvectionUnsteadyState(
|
||||
vtkm::filter::flow::FlowResultType::PARTICLE_ADVECT_TYPE)
|
||||
{
|
||||
}
|
||||
VTKM_CONT PathParticle() {}
|
||||
|
||||
protected:
|
||||
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;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ VTKM_CONT vtkm::cont::PartitionedDataSet Pathline::DoExecutePartitions(
|
||||
this->ValidateOptions();
|
||||
|
||||
vtkm::filter::flow::BoundsMap boundsMap(input);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap, this->ResultType);
|
||||
|
||||
vtkm::filter::flow::ParticleAdvector<DSIType> pav(
|
||||
boundsMap, dsi, this->UseThreadedAlgorithm, this->ResultType);
|
||||
|
@ -32,14 +32,15 @@ class VTKM_FILTER_FLOW_EXPORT Pathline
|
||||
: public vtkm::filter::flow::NewFilterParticleAdvectionUnsteadyState
|
||||
{
|
||||
public:
|
||||
VTKM_CONT Pathline()
|
||||
: NewFilterParticleAdvectionUnsteadyState(vtkm::filter::flow::FlowResultType::STREAMLINE_TYPE)
|
||||
{
|
||||
}
|
||||
VTKM_CONT Pathline() {}
|
||||
|
||||
protected:
|
||||
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;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -32,10 +32,7 @@ class VTKM_FILTER_FLOW_EXPORT StreamSurface
|
||||
: public vtkm::filter::flow::NewFilterParticleAdvectionSteadyState
|
||||
{
|
||||
public:
|
||||
VTKM_CONT StreamSurface()
|
||||
: NewFilterParticleAdvectionSteadyState(vtkm::filter::flow::FlowResultType::STREAMLINE_TYPE)
|
||||
{
|
||||
}
|
||||
VTKM_CONT StreamSurface() {}
|
||||
|
||||
protected:
|
||||
VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& inData) override;
|
||||
|
@ -29,7 +29,7 @@ VTKM_CONT vtkm::cont::PartitionedDataSet Streamline::DoExecutePartitions(
|
||||
this->ValidateOptions();
|
||||
|
||||
vtkm::filter::flow::BoundsMap boundsMap(input);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap);
|
||||
auto dsi = this->CreateDataSetIntegrators(input, boundsMap, this->ResultType);
|
||||
|
||||
vtkm::filter::flow::ParticleAdvector<DSIType> pav(
|
||||
boundsMap, dsi, this->UseThreadedAlgorithm, this->ResultType);
|
||||
|
@ -32,14 +32,15 @@ class VTKM_FILTER_FLOW_EXPORT Streamline
|
||||
: public vtkm::filter::flow::NewFilterParticleAdvectionSteadyState
|
||||
{
|
||||
public:
|
||||
VTKM_CONT Streamline()
|
||||
: NewFilterParticleAdvectionSteadyState(vtkm::filter::flow::FlowResultType::STREAMLINE_TYPE)
|
||||
{
|
||||
}
|
||||
VTKM_CONT Streamline() {}
|
||||
|
||||
protected:
|
||||
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;
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user