Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 02:25:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Move MeshQualityJacobian to its own filter

Browse Source
This commit is contained in:
Kenneth Moreland 2022-06-22 09:01:05 -06:00
parent 2431d4fef4
commit cb119cf231
5 changed files with 118 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/filter/mesh_info/CMakeLists.txt
View File

@ -12,6 +12,7 @@ set(mesh_info_headers
GhostCellClassify.h
MeshQuality.h
MeshQualityArea.h
MeshQualityJacobian.h
MeshQualityMaxAngle.h
MeshQualityMaxDiagonal.h
MeshQualityMinAngle.h
@ -34,6 +35,7 @@ set(mesh_info_sources
GhostCellClassify.cxx
MeshQuality.cxx
MeshQualityArea.cxx
MeshQualityJacobian.cxx
MeshQualityMaxAngle.cxx
MeshQualityMaxDiagonal.cxx
MeshQualityMinAngle.cxx

4
vtkm/filter/mesh_info/MeshQuality.cxx
View File

@ -22,6 +22,7 @@
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/filter/mesh_info/MeshQuality.h>
#include <vtkm/filter/mesh_info/MeshQualityArea.h>
#include <vtkm/filter/mesh_info/MeshQualityJacobian.h>
#include <vtkm/filter/mesh_info/MeshQualityMaxAngle.h>
#include <vtkm/filter/mesh_info/MeshQualityMaxDiagonal.h>
#include <vtkm/filter/mesh_info/MeshQualityMinAngle.h>
@ -90,6 +91,9 @@ VTKM_CONT vtkm::cont::DataSet MeshQuality::DoExecute(const vtkm::cont::DataSet&
case vtkm::filter::mesh_info::CellMetric::Area:
implementation.reset(new vtkm::filter::mesh_info::MeshQualityArea);
break;
case vtkm::filter::mesh_info::CellMetric::Jacobian:
implementation.reset(new vtkm::filter::mesh_info::MeshQualityJacobian);
break;
case vtkm::filter::mesh_info::CellMetric::MaxAngle:
implementation.reset(new vtkm::filter::mesh_info::MeshQualityMaxAngle);
break;

66
vtkm/filter/mesh_info/MeshQualityJacobian.cxx Normal file
View File

@ -0,0 +1,66 @@
//============================================================================
// 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 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
// Copyright 2014 UT-Battelle, LLC.
// Copyright 2014 Los Alamos National Security.
//
// Under the terms of Contract DE-NA0003525 with NTESS,
// 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/filter/mesh_info/MeshQualityJacobian.h>
#include <vtkm/filter/mesh_info/worklet/MeshQualityWorklet.h>
#include <vtkm/filter/mesh_info/worklet/cellmetrics/CellJacobianMetric.h>
namespace
{
struct JacobianWorklet : MeshQualityWorklet<JacobianWorklet>
{
template <typename OutType, typename PointCoordVecType, typename CellShapeType>
VTKM_EXEC OutType ComputeMetric(const vtkm::IdComponent& numPts,
const PointCoordVecType& pts,
CellShapeType shape,
vtkm::ErrorCode& ec) const
{
return vtkm::worklet::cellmetrics::CellJacobianMetric<OutType>(numPts, pts, shape, ec);
}
};
} // anonymous namespace
namespace vtkm
{
namespace filter
{
namespace mesh_info
{
MeshQualityJacobian::MeshQualityJacobian()
{
this->SetUseCoordinateSystemAsField(true);
this->SetOutputFieldName("jacobian");
}
vtkm::cont::DataSet MeshQualityJacobian::DoExecute(const vtkm::cont::DataSet& input)
{
vtkm::cont::UnknownArrayHandle outArray =
JacobianWorklet{}.Run(input, this->GetFieldFromDataSet(input));
return this->CreateResultFieldCell(input, this->GetOutputFieldName(), outArray);
}
} // namespace mesh_info
} // namespace filter
} // namespace vtkm

46
vtkm/filter/mesh_info/MeshQualityJacobian.h Normal file
View File

@ -0,0 +1,46 @@
//============================================================================
// 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 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
// Copyright 2014 UT-Battelle, LLC.
// Copyright 2014 Los Alamos National Security.
//
// Under the terms of Contract DE-NA0003525 with NTESS,
// 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.
//============================================================================
#ifndef vtk_m_filter_mesh_info_MeshQualityJacobian_h
#define vtk_m_filter_mesh_info_MeshQualityJacobian_h
#include <vtkm/filter/NewFilterField.h>
#include <vtkm/filter/mesh_info/vtkm_filter_mesh_info_export.h>
namespace vtkm
{
namespace filter
{
namespace mesh_info
{
class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityJacobian : public vtkm::filter::NewFilterField
{
public:
MeshQualityJacobian();
private:
vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input) override;
};
} // namespace mesh_info
} // namespace filter
} // namespace vtkm
#endif //vtk_m_filter_mesh_info_MeshQualityJacobian_h

5
vtkm/filter/mesh_info/worklet/MeshQuality.h
View File

@ -29,7 +29,6 @@
#include <vtkm/filter/mesh_info/worklet/cellmetrics/CellConditionMetric.h>
#include <vtkm/filter/mesh_info/worklet/cellmetrics/CellDiagonalRatioMetric.h>
#include <vtkm/filter/mesh_info/worklet/cellmetrics/CellDimensionMetric.h>
#include <vtkm/filter/mesh_info/worklet/cellmetrics/CellJacobianMetric.h>
#include <vtkm/worklet/WorkletMapTopology.h>
namespace vtkm
@ -121,10 +120,6 @@ private:
metricValue =
vtkm::worklet::cellmetrics::CellDimensionMetric<OutType>(numPts, pts, tag, ec);
break;
case vtkm::filter::mesh_info::CellMetric::Jacobian:
metricValue =
vtkm::worklet::cellmetrics::CellJacobianMetric<OutType>(numPts, pts, tag, ec);
break;
case vtkm::filter::mesh_info::CellMetric::None:
break;
default: