Commit b64bc583 authored by Dan Lipsa's avatar Dan Lipsa Committed by Kitware Robot

Merge topic 'moment-invariants'

4133101e Use local variable and WANT instead of YES.
0f8d91b2 Add name for computing moments for ParallelMomentInvariants.
267844b0 Enable Name fields.
1f5a646d Don't add rejected for remote modules.
370fd4e3 Add MomentInvariants option.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !3340
parents bde94c1f 4133101e
Pipeline #139902 failed with stage
in 0 seconds
......@@ -208,6 +208,8 @@ option(PARAVIEW_ENABLE_PDAL "Enable PDAL support." OFF)
mark_as_advanced(PARAVIEW_ENABLE_PDAL)
option(PARAVIEW_ENABLE_MOTIONFX "Enable MotionFX support." OFF)
mark_as_advanced(PARAVIEW_ENABLE_MOTIONFX)
option(PARAVIEW_ENABLE_MOMENTINVARIANTS "Enable MomentInvariants filters" OFF)
mark_as_advanced(PARAVIEW_ENABLE_MOMENTINVARIANTS)
option(PARAVIEW_ENABLE_VISITBRIDGE "Enable VisIt readers." OFF)
option(PARAVIEW_ENABLE_XDMF2 "Enable Xdmf2 support." ON)
mark_as_advanced(PARAVIEW_ENABLE_XDMF2)
......@@ -439,6 +441,17 @@ if (PARAVIEW_ENABLE_MOTIONFX)
VTK::IOMotionFX)
endif ()
set(use_vtk_remote_modules OFF)
if (PARAVIEW_ENABLE_MOMENTINVARIANTS)
list(APPEND paraview_requested_modules
VTK::MomentInvariants)
if (PARAVIEW_USE_MPI)
list(APPEND paraview_requested_modules
VTK::ParallelMomentInvariants)
endif()
set(use_vtk_remote_modules ON)
endif ()
if (PARAVIEW_ENABLE_VISITBRIDGE)
list(APPEND paraview_requested_modules
ParaView::IOVisItBridge
......@@ -756,6 +769,18 @@ else ()
list(APPEND vtk_requested_modules VTK::loguru)
endif()
if (use_vtk_remote_modules)
if (PARAVIEW_ENABLE_MOMENTINVARIANTS)
set(VTK_MODULE_ENABLE_VTK_MomentInvariants WANT)
endif()
# include the Remote module
include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/vtkDownload.cmake")
# TODO: remove this after changing in vtkModuleRemote.cmake:160
# "${VTK_SOURCE_DIR}/Remote/${_name}" to "${CMAKE_CURRENT_LIST_DIR}/${_name}"
set(VTK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/VTK")
add_subdirectory(VTK/Remote)
endif()
vtk_module_find_modules(vtk_module_files "${CMAKE_CURRENT_SOURCE_DIR}/VTK")
vtk_module_find_kits(vtk_kit_files "${CMAKE_CURRENT_SOURCE_DIR}/VTK")
vtk_module_scan(
......
......@@ -237,6 +237,8 @@ More advanced options:
files.
* `PARAVIEW_ENABLE_MOTIONFX` (default `OFF`): Enable support for reading
MotionFX files.
* `PARAVIEW_ENABLE_MOMENTINVARIANTS` (default `OFF`): Enable
MomentInvariants filters.
* `PARAVIEW_ENABLE_XDMF2` (default `OFF`): Enable support for reading Xdmf2
files.
* `PARAVIEW_ENABLE_XDMF3` (default `OFF`): Enable support for reading Xdmf3
......
......@@ -109,11 +109,17 @@ if (TARGET VTK::FiltersOpenTURNS)
Resources/proxies_openturns.xml)
endif ()
if (TARGET VTK::FiltersMomentInvariants)
if (TARGET VTK::MomentInvariants)
list(APPEND xml_files
Resources/MomentInvariants.xml)
endif ()
if (TARGET VTK::ParallelMomentInvariants)
list(APPEND xml_files
Resources/ParallelMomentInvariants.xml)
endif ()
if (TARGET VTK::PythonInterpreter)
_vtk_module_set_module_property(ParaView::ServerManagerApplication APPEND
PROPERTY "forward_link"
......
......@@ -35,11 +35,14 @@
Optional. The grid locations where the moments are computed. If not set, use the original grid.
</Documentation>
</InputProperty>
<!-- <StringVectorProperty name="NameOfPointData"
<StringVectorProperty name="NameOfPointData"
command="SetNameOfPointData"
number_of_elements="1"
default_values="points">
</StringVectorProperty> -->
default_values="velocity">
<Documentation>
Field used in computing moments.
</Documentation>
</StringVectorProperty>
<IntVectorProperty name="Order"
command="SetOrder"
number_of_elements="1"
......@@ -61,67 +64,7 @@
<ShowInMenu category="Moment Invariants" />
</Hints>
</SourceProxy>
<SourceProxy name="ParallelComputeMoments" class="vtkPComputeMoments" label="Parallel Compute Moments">
<Documentation
long_help="MomentInvariants vtkPComputeMoments"
short_help="MomentInvariants vtkPComputeMoments">
</Documentation>
<InputProperty
name="Input"
port_index="0"
command="SetInputConnection">
<ProxyGroupDomain name="groups">
<Group name="sources"/>
<Group name="filters"/>
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkImageData"/>
</DataTypeDomain>
<Documentation>
The dataset of which the moments are computed
</Documentation>
</InputProperty>
<InputProperty
name="InputGrid"
port_index="1"
command="SetInputConnection">
<ProxyGroupDomain name="groups">
<Group name="sources"/>
<Group name="filters"/>
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkImageData"/>
</DataTypeDomain>
<Documentation>
Optional. The grid locations where the moments are computed. If not set, use the original grid.
</Documentation>
</InputProperty>
<!-- <StringVectorProperty name="NameOfPointData"
command="SetNameOfPointData"
number_of_elements="1"
default_values="points">
</StringVectorProperty> -->
<IntVectorProperty name="Order"
command="SetOrder"
number_of_elements="1"
default_values="2">
</IntVectorProperty>
<IntVectorProperty name="NumberOfIntegrationSteps"
command="SetNumberOfIntegrationSteps"
number_of_elements="1"
default_values="5">
</IntVectorProperty>
<DoubleVectorProperty name="Radii"
command="SetRadiiArray"
argument_is_array="1"
number_of_elements="10"
default_values="1 0 0 0 0 0 0 0 0 0">
</DoubleVectorProperty>
<Hints>
<ShowInMenu category="Moment Invariants" />
</Hints>
</SourceProxy>
<SourceProxy name="MomentInvariants" class="vtkMomentInvariants" label="Moment Invariants">
<Documentation
long_help="MomentInvariants vtkMomentInvariants"
......@@ -157,11 +100,14 @@
The output of computeMoments, which is vtkImageData.
</Documentation>
</InputProperty>
<!-- <StringVectorProperty name="NameOfPointData"
<StringVectorProperty name="NameOfPointData"
command="SetNameOfPointData"
number_of_elements="1"
default_values="">
</StringVectorProperty> -->
default_values="Result">
<Documentation>
Pattern field name to use.
</Documentation>
</StringVectorProperty>
<IntVectorProperty name="Order"
command="SetOrder"
number_of_elements="1"
......
<ServerManagerConfiguration>
<ProxyGroup name="filters">
<SourceProxy name="ParallelComputeMoments" class="vtkPComputeMoments" label="Parallel Compute Moments">
<Documentation
long_help="MomentInvariants vtkPComputeMoments"
short_help="MomentInvariants vtkPComputeMoments">
</Documentation>
<InputProperty
name="Input"
port_index="0"
command="SetInputConnection">
<ProxyGroupDomain name="groups">
<Group name="sources"/>
<Group name="filters"/>
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkImageData"/>
</DataTypeDomain>
<Documentation>
The dataset of which the moments are computed
</Documentation>
</InputProperty>
<InputProperty
name="InputGrid"
port_index="1"
command="SetInputConnection">
<ProxyGroupDomain name="groups">
<Group name="sources"/>
<Group name="filters"/>
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkImageData"/>
</DataTypeDomain>
<Documentation>
Optional. The grid locations where the moments are computed. If not set, use the original grid.
</Documentation>
</InputProperty>
<StringVectorProperty name="NameOfPointData"
command="SetNameOfPointData"
number_of_elements="1"
default_values="velocity">
<Documentation>
Field used in computing moments.
</Documentation>
</StringVectorProperty>
<IntVectorProperty name="Order"
command="SetOrder"
number_of_elements="1"
default_values="2">
</IntVectorProperty>
<IntVectorProperty name="NumberOfIntegrationSteps"
command="SetNumberOfIntegrationSteps"
number_of_elements="1"
default_values="5">
</IntVectorProperty>
<DoubleVectorProperty name="Radii"
command="SetRadiiArray"
argument_is_array="1"
number_of_elements="10"
default_values="1 0 0 0 0 0 0 0 0 0">
</DoubleVectorProperty>
<Hints>
<ShowInMenu category="Moment Invariants" />
</Hints>
</SourceProxy>
</ProxyGroup>
</ServerManagerConfiguration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment