From 03ffa3b53ef4f0fef2e6672e351dc7376af831f2 Mon Sep 17 00:00:00 2001 From: Tushar Athawale Date: Mon, 7 Feb 2022 15:34:18 -0500 Subject: [PATCH] fixes to the header files included in tutorial examples and CMakeLists.txt --- tutorial/CMakeLists.txt | 25 ++++++++++++++++++++++--- tutorial/README.md | 2 +- tutorial/contour.cxx | 12 ++++++------ tutorial/contour_two_fields.cxx | 12 ++++++------ tutorial/error_handling.cxx | 12 ++++++------ tutorial/extract_edges.cxx | 9 +++++---- tutorial/io.cxx | 4 ++-- tutorial/logging.cxx | 4 ++-- tutorial/mag_grad.cxx | 10 ++++------ tutorial/mag_grad_generalized.cxx | 8 ++++---- tutorial/point_to_cell.cxx | 4 ++-- tutorial/rendering.cxx | 4 ++-- tutorial/two_filters.cxx | 16 ++++++++-------- 13 files changed, 70 insertions(+), 52 deletions(-) diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index d5b60838d..4bb41627a 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -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) diff --git a/tutorial/README.md b/tutorial/README.md index 1aff329d9..154cf94b1 100644 --- a/tutorial/README.md +++ b/tutorial/README.md @@ -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: diff --git a/tutorial/contour.cxx b/tutorial/contour.cxx index 297d5f341..be7eb5d5d 100644 --- a/tutorial/contour.cxx +++ b/tutorial/contour.cxx @@ -10,9 +10,9 @@ // Example 2: do a contour!, write it out. // #include -#include -#include -#include +#include +#include +#include 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; } diff --git a/tutorial/contour_two_fields.cxx b/tutorial/contour_two_fields.cxx index 0f3aba459..90fb5af10 100644 --- a/tutorial/contour_two_fields.cxx +++ b/tutorial/contour_two_fields.cxx @@ -10,9 +10,9 @@ // Example 3: do a contour (but only evaluate two fields), write it out. // #include -#include -#include -#include +#include +#include +#include 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; } diff --git a/tutorial/error_handling.cxx b/tutorial/error_handling.cxx index 2ab1795af..aa7a87210 100644 --- a/tutorial/error_handling.cxx +++ b/tutorial/error_handling.cxx @@ -8,9 +8,9 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ #include -#include -#include -#include +#include +#include +#include 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) { diff --git a/tutorial/extract_edges.cxx b/tutorial/extract_edges.cxx index a7431b354..3a6895941 100644 --- a/tutorial/extract_edges.cxx +++ b/tutorial/extract_edges.cxx @@ -17,11 +17,12 @@ #include #include -#include -#include +#include +#include -#include #include +#include +#include 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); diff --git a/tutorial/io.cxx b/tutorial/io.cxx index 53f2af74a..4b24d441d 100644 --- a/tutorial/io.cxx +++ b/tutorial/io.cxx @@ -11,8 +11,8 @@ // Read data set, write it out. // #include -#include -#include +#include +#include int main(int argc, char** argv) { diff --git a/tutorial/logging.cxx b/tutorial/logging.cxx index cdaa6ee83..000de3fcb 100644 --- a/tutorial/logging.cxx +++ b/tutorial/logging.cxx @@ -8,8 +8,8 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ #include -#include -#include +#include +#include int main(int argc, char** argv) diff --git a/tutorial/mag_grad.cxx b/tutorial/mag_grad.cxx index b6a4fd752..68b603768 100644 --- a/tutorial/mag_grad.cxx +++ b/tutorial/mag_grad.cxx @@ -12,11 +12,9 @@ #include #include -#include -#include -#include - -#include +#include +#include +#include #include @@ -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); diff --git a/tutorial/mag_grad_generalized.cxx b/tutorial/mag_grad_generalized.cxx index 1da9d2f34..5aea2ec47 100644 --- a/tutorial/mag_grad_generalized.cxx +++ b/tutorial/mag_grad_generalized.cxx @@ -15,10 +15,10 @@ #include #include -#include -#include +#include +#include -#include +#include #include @@ -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); diff --git a/tutorial/point_to_cell.cxx b/tutorial/point_to_cell.cxx index c5614ec14..4bc051855 100644 --- a/tutorial/point_to_cell.cxx +++ b/tutorial/point_to_cell.cxx @@ -9,8 +9,8 @@ //============================================================================ #include -#include -#include +#include +#include #include diff --git a/tutorial/rendering.cxx b/tutorial/rendering.cxx index 7ff1be7bf..b15d350c3 100644 --- a/tutorial/rendering.cxx +++ b/tutorial/rendering.cxx @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tutorial/two_filters.cxx b/tutorial/two_filters.cxx index 40866631e..462e0c47d 100644 --- a/tutorial/two_filters.cxx +++ b/tutorial/two_filters.cxx @@ -10,10 +10,10 @@ // Example 4: do a contour and a clip-with-field, and write it out. // #include -#include -#include -#include -#include +#include +#include +#include +#include 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);