eecbb30d96
If the user does not specify a name for the output field in a filter, that filter should provide some default name. Having blank names for fields is not a great idea. (In fact, an earlier commit added an assert to make sure that a ResultField is given a non-empty name.) This covers issue #61.
79 lines
2.7 KiB
C++
79 lines
2.7 KiB
C++
//============================================================================
|
|
// Copyright (c) Kitware, Inc.
|
|
// All rights reserved.
|
|
// See LICENSE.txt for details.
|
|
// This software is distributed WITHOUT ANY WARRANTY; without even
|
|
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
// PURPOSE. See the above copyright notice for more information.
|
|
//
|
|
// Copyright 2014 Sandia Corporation.
|
|
// Copyright 2014 UT-Battelle, LLC.
|
|
// Copyright 2014 Los Alamos National Security.
|
|
//
|
|
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
|
|
// the U.S. Government retains certain rights in this software.
|
|
//
|
|
// Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
|
|
// Laboratory (LANL), the U.S. Government retains certain rights in
|
|
// this software.
|
|
//============================================================================
|
|
|
|
#include <vtkm/cont/DynamicCellSet.h>
|
|
|
|
#include <vtkm/worklet/DispatcherMapTopology.h>
|
|
|
|
namespace vtkm {
|
|
namespace filter {
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
CellAverage::CellAverage():
|
|
vtkm::filter::FilterCell<CellAverage>(),
|
|
Worklet()
|
|
{
|
|
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template<typename T,
|
|
typename StorageType,
|
|
typename DerivedPolicy,
|
|
typename DeviceAdapter>
|
|
vtkm::filter::ResultField CellAverage::DoExecute(
|
|
const vtkm::cont::DataSet &input,
|
|
const vtkm::cont::ArrayHandle<T, StorageType> &inField,
|
|
const vtkm::filter::FieldMetadata &fieldMetadata,
|
|
const vtkm::filter::PolicyBase<DerivedPolicy>&,
|
|
const DeviceAdapter&)
|
|
{
|
|
vtkm::cont::DynamicCellSet cellSet =
|
|
input.GetCellSet(this->GetActiveCellSetIndex());
|
|
|
|
//todo: we need to ask the policy what storage type we should be using
|
|
//If the input is implicit, we should know what to fall back to
|
|
vtkm::cont::ArrayHandle<T> outArray;
|
|
|
|
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellAverage,
|
|
DeviceAdapter > dispatcher(this->Worklet);
|
|
|
|
//todo: we need to use the policy to determine the valid conversions
|
|
//that the dispatcher should do, including the result from GetCellSet
|
|
dispatcher.Invoke(inField, cellSet, outArray);
|
|
|
|
std::string outputName = this->GetOutputFieldName();
|
|
if (outputName == "")
|
|
{
|
|
// Default name is name of input.
|
|
outputName = fieldMetadata.GetName();
|
|
}
|
|
|
|
return vtkm::filter::ResultField(input,
|
|
outArray,
|
|
outputName,
|
|
vtkm::cont::Field::ASSOC_CELL_SET,
|
|
cellSet.GetCellSet().GetName());
|
|
}
|
|
|
|
}
|
|
} // namespace vtkm::filter
|