mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
fixes to the header files included in tutorial examples and CMakeLists.txt
This commit is contained in:
parent
ca79c2ae2e
commit
03ffa3b53e
@ -51,10 +51,29 @@ target_link_libraries(point_to_cell vtkm_cont vtkm_filter vtkm_io)
|
||||
add_executable(extract_edges extract_edges.cxx)
|
||||
target_link_libraries(extract_edges vtkm_cont vtkm_filter vtkm_io)
|
||||
|
||||
set(tutorial_targets
|
||||
io
|
||||
contour
|
||||
contour_two_fields
|
||||
two_filters
|
||||
mag_grad
|
||||
error_handling
|
||||
logging
|
||||
point_to_cell
|
||||
extract_edges
|
||||
)
|
||||
|
||||
set(tutorial_targets io contour contour_two_fields two_filters mag_grad error_handling logging point_to_cell extract_edges)
|
||||
|
||||
set(tutorial_sources io.cxx contour.cxx contour_two_fields.cxx two_filters.cxx mag_grad.cxx error_handling.cxx logging.cxx point_to_cell.cxx extract_edges.cxx)
|
||||
set(tutorial_sources
|
||||
io.cxx
|
||||
contour.cxx
|
||||
contour_two_fields.cxx
|
||||
two_filters.cxx
|
||||
mag_grad.cxx
|
||||
error_handling.cxx
|
||||
logging.cxx
|
||||
point_to_cell.cxx
|
||||
extract_edges.cxx
|
||||
)
|
||||
|
||||
if (VTKm_ENABLE_RENDERING)
|
||||
list(APPEND tutorial_sources rendering.cxx)
|
||||
|
@ -1,6 +1,6 @@
|
||||
# vtk-m-tutorial
|
||||
The repository containts code samples for the tutorial of the [VTK-m code library](http://m.vtk.org).
|
||||
Other tutorial material is avaialble on the [VTK-m wiki](http://m.vtk.org/index.php/Tutorial)
|
||||
Other tutorial material is avaialble on the [VTK-m tutorial](https://m.vtk.org/tutorial)
|
||||
|
||||
# Organization
|
||||
The tutorial is divided into 3 sections based on what users want to accomplish with VTK-m:
|
||||
|
@ -10,9 +10,9 @@
|
||||
// Example 2: do a contour!, write it out.
|
||||
//
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
#include <vtkm/filter/Contour.h>
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/filter/contour/Contour.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
@ -22,16 +22,16 @@ int main(int argc, char** argv)
|
||||
vtkm::io::VTKDataSetReader reader("data/kitchen.vtk");
|
||||
vtkm::cont::DataSet ds_from_file = reader.ReadDataSet();
|
||||
|
||||
vtkm::filter::Contour contour;
|
||||
vtkm::filter::contour::Contour contour;
|
||||
contour.SetActiveField("c1");
|
||||
contour.SetNumberOfIsoValues(3);
|
||||
contour.SetIsoValue(0, 0.05);
|
||||
contour.SetIsoValue(1, 0.10);
|
||||
contour.SetIsoValue(2, 0.15);
|
||||
|
||||
vtkm::cont::DataSet ds_from_mc = contour.Execute(ds_from_file);
|
||||
vtkm::cont::DataSet ds_from_contour = contour.Execute(ds_from_file);
|
||||
vtkm::io::VTKDataSetWriter writer("out_mc.vtk");
|
||||
writer.WriteDataSet(ds_from_mc);
|
||||
writer.WriteDataSet(ds_from_contour);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -10,9 +10,9 @@
|
||||
// Example 3: do a contour (but only evaluate two fields), write it out.
|
||||
//
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
#include <vtkm/filter/Contour.h>
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/filter/contour/Contour.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
@ -22,7 +22,7 @@ int main(int argc, char** argv)
|
||||
vtkm::io::VTKDataSetReader reader("data/kitchen.vtk");
|
||||
vtkm::cont::DataSet ds_from_file = reader.ReadDataSet();
|
||||
|
||||
vtkm::filter::Contour contour;
|
||||
vtkm::filter::contour::Contour contour;
|
||||
contour.SetActiveField("c1");
|
||||
contour.SetFieldsToPass({ "c1", "ke" });
|
||||
contour.SetNumberOfIsoValues(3);
|
||||
@ -30,9 +30,9 @@ int main(int argc, char** argv)
|
||||
contour.SetIsoValue(1, 0.10);
|
||||
contour.SetIsoValue(2, 0.15);
|
||||
|
||||
vtkm::cont::DataSet ds_from_mc = contour.Execute(ds_from_file);
|
||||
vtkm::cont::DataSet ds_from_contour = contour.Execute(ds_from_file);
|
||||
vtkm::io::VTKDataSetWriter writer("out_mc_2fields.vtk");
|
||||
writer.WriteDataSet(ds_from_mc);
|
||||
writer.WriteDataSet(ds_from_contour);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -8,9 +8,9 @@
|
||||
// PURPOSE. See the above copyright notice for more information.
|
||||
//============================================================================
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
#include <vtkm/filter/Contour.h>
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/filter/contour/Contour.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
@ -25,16 +25,16 @@ int main(int argc, char** argv)
|
||||
//vtkm::cont::DataSet ds_from_file = reader.ReadDataSet();
|
||||
vtkm::cont::DataSet ds_from_file;
|
||||
|
||||
vtkm::filter::Contour contour;
|
||||
vtkm::filter::contour::Contour contour;
|
||||
contour.SetActiveField("c1");
|
||||
contour.SetNumberOfIsoValues(3);
|
||||
contour.SetIsoValue(0, 0.05);
|
||||
contour.SetIsoValue(1, 0.10);
|
||||
contour.SetIsoValue(2, 0.15);
|
||||
|
||||
vtkm::cont::DataSet ds_from_mc = contour.Execute(ds_from_file);
|
||||
vtkm::cont::DataSet ds_from_contour = contour.Execute(ds_from_file);
|
||||
vtkm::io::VTKDataSetWriter writer("out_mc.vtk");
|
||||
writer.WriteDataSet(ds_from_mc);
|
||||
writer.WriteDataSet(ds_from_contour);
|
||||
}
|
||||
catch (const vtkm::cont::Error& error)
|
||||
{
|
||||
|
@ -17,11 +17,12 @@
|
||||
#include <vtkm/worklet/Keys.h>
|
||||
#include <vtkm/worklet/ScatterCounting.h>
|
||||
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
#include <vtkm/filter/Contour.h>
|
||||
#include <vtkm/filter/FilterDataSet.h>
|
||||
#include <vtkm/filter/contour/Contour.h>
|
||||
#include <vtkm/worklet/WorkletMapTopology.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
@ -220,7 +221,7 @@ int main(int argc, char** argv)
|
||||
vtkm::io::VTKDataSetReader reader(input);
|
||||
vtkm::cont::DataSet ds_from_file = reader.ReadDataSet();
|
||||
|
||||
vtkm::filter::Contour contour;
|
||||
vtkm::filter::contour::Contour contour;
|
||||
contour.SetActiveField("c1");
|
||||
contour.SetIsoValue(0.10);
|
||||
vtkm::cont::DataSet ds_from_contour = contour.Execute(ds_from_file);
|
||||
|
@ -11,8 +11,8 @@
|
||||
// Read data set, write it out.
|
||||
//
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
|
@ -8,8 +8,8 @@
|
||||
// PURPOSE. See the above copyright notice for more information.
|
||||
//============================================================================
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
|
||||
int main(int argc, char** argv)
|
||||
|
@ -12,11 +12,9 @@
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
#include <vtkm/cont/Invoker.h>
|
||||
|
||||
#include <vtkm/filter/Gradient.h>
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
|
||||
#include <vtkm/filter/Gradient.h>
|
||||
#include <vtkm/filter/vector_analysis/Gradient.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
#include <vtkm/worklet/WorkletMapField.h>
|
||||
|
||||
@ -64,7 +62,7 @@ int main(int argc, char** argv)
|
||||
vtkm::io::VTKDataSetReader reader("data/kitchen.vtk");
|
||||
vtkm::cont::DataSet ds_from_file = reader.ReadDataSet();
|
||||
|
||||
vtkm::filter::Gradient grad;
|
||||
vtkm::filter::vector_analysis::Gradient grad;
|
||||
grad.SetActiveField("c1");
|
||||
vtkm::cont::DataSet ds_from_grad = grad.Execute(ds_from_file);
|
||||
|
||||
|
@ -15,10 +15,10 @@
|
||||
#include <vtkm/cont/Invoker.h>
|
||||
#include <vtkm/cont/VariantArrayHandle.h>
|
||||
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
#include <vtkm/filter/Gradient.h>
|
||||
#include <vtkm/filter/vector_analysis/Gradient.h>
|
||||
|
||||
#include <vtkm/worklet/WorkletMapField.h>
|
||||
|
||||
@ -88,7 +88,7 @@ int main(int argc, char** argv)
|
||||
vtkm::io::VTKDataSetReader reader("data/kitchen.vtk");
|
||||
vtkm::cont::DataSet ds_from_file = reader.ReadDataSet();
|
||||
|
||||
vtkm::filter::Gradient grad;
|
||||
vtkm::filter::vector_analysis::Gradient grad;
|
||||
grad.SetActiveField("c1");
|
||||
vtkm::cont::DataSet ds_from_grad = grad.Execute(ds_from_file);
|
||||
|
||||
|
@ -9,8 +9,8 @@
|
||||
//============================================================================
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
#include <vtkm/worklet/WorkletMapTopology.h>
|
||||
|
||||
|
@ -11,8 +11,8 @@
|
||||
#include <vtkm/cont/DataSet.h>
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
#include <vtkm/rendering/Actor.h>
|
||||
#include <vtkm/rendering/CanvasRayTracer.h>
|
||||
#include <vtkm/rendering/MapperRayTracer.h>
|
||||
|
@ -10,10 +10,10 @@
|
||||
// Example 4: do a contour and a clip-with-field, and write it out.
|
||||
//
|
||||
#include <vtkm/cont/Initialize.h>
|
||||
#include <vtkm/filter/ClipWithField.h>
|
||||
#include <vtkm/filter/Contour.h>
|
||||
#include <vtkm/io/reader/VTKDataSetReader.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/filter/contour/ClipWithField.h>
|
||||
#include <vtkm/filter/contour/Contour.h>
|
||||
#include <vtkm/io/VTKDataSetReader.h>
|
||||
#include <vtkm/io/VTKDataSetWriter.h>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
@ -23,21 +23,21 @@ int main(int argc, char** argv)
|
||||
vtkm::io::VTKDataSetReader reader("data/kitchen.vtk");
|
||||
vtkm::cont::DataSet ds_from_file = reader.ReadDataSet();
|
||||
|
||||
vtkm::filter::Contour contour;
|
||||
vtkm::filter::contour::Contour contour;
|
||||
contour.SetActiveField("c1");
|
||||
contour.SetFieldsToPass({ "c1", "ke" });
|
||||
contour.SetNumberOfIsoValues(3);
|
||||
contour.SetIsoValue(0, 0.05);
|
||||
contour.SetIsoValue(1, 0.10);
|
||||
contour.SetIsoValue(2, 0.15);
|
||||
vtkm::cont::DataSet ds_from_mc = contour.Execute(ds_from_file);
|
||||
vtkm::cont::DataSet ds_from_contour = contour.Execute(ds_from_file);
|
||||
|
||||
vtkm::filter::ClipWithField clip;
|
||||
vtkm::filter::contour::ClipWithField clip;
|
||||
clip.SetActiveField("ke");
|
||||
clip.SetClipValue(1e-7);
|
||||
//clip.SetInvertClip(true); // <1e-7 instead of >1e-7
|
||||
|
||||
vtkm::cont::DataSet ds_from_clip = clip.Execute(ds_from_mc);
|
||||
vtkm::cont::DataSet ds_from_clip = clip.Execute(ds_from_contour);
|
||||
|
||||
vtkm::io::VTKDataSetWriter writer("out_2filters.vtk");
|
||||
writer.WriteDataSet(ds_from_clip);
|
||||
|
Loading…
Reference in New Issue
Block a user