From f8db9640230e344da04add7b3ed5ed399162f60b Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:32:55 +0200 Subject: [PATCH 01/25] Add vtkDataSet as custom datatype --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_vtk/t8_vtk_parallel.cxx | 4 ++-- src/t8_vtk/t8_vtk_parallel.hxx | 5 +++-- src/t8_vtk/t8_vtk_polydata.cxx | 2 +- src/t8_vtk/t8_vtk_polydata.hxx | 3 +-- src/t8_vtk/t8_vtk_reader.cxx | 16 ++++++++-------- src/t8_vtk/t8_vtk_reader.hxx | 21 +++++++++++---------- src/t8_vtk/t8_vtk_unstructured.cxx | 2 +- src/t8_vtk/t8_vtk_unstructured.hxx | 3 +-- 9 files changed, 29 insertions(+), 28 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index d62511537d..93de62d425 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -42,3 +42,4 @@ t8_stash_t t8_vtk_data_field_t vtk_file_type_t vtk_read_success_t +vtkDataSet diff --git a/src/t8_vtk/t8_vtk_parallel.cxx b/src/t8_vtk/t8_vtk_parallel.cxx index 06a851fc53..ef4e2b370e 100644 --- a/src/t8_vtk/t8_vtk_parallel.cxx +++ b/src/t8_vtk/t8_vtk_parallel.cxx @@ -100,7 +100,7 @@ setup_reader (const char *filename, vtk_read_success_t t8_read_parallel_polyData (const char *filename, - vtkSmartPointer < vtkDataSet > grid, + vtkSmartPointer < vtkDataSet >grid, sc_MPI_Comm comm) { /* Setup parallel reader. */ @@ -138,7 +138,7 @@ t8_read_parallel_polyData (const char *filename, vtk_read_success_t t8_read_parallel_unstructured (const char *filename, - vtkSmartPointer < vtkDataSet > grid, + vtkSmartPointer < vtkDataSet >grid, sc_MPI_Comm comm) { /* Setup parallel reader. */ diff --git a/src/t8_vtk/t8_vtk_parallel.hxx b/src/t8_vtk/t8_vtk_parallel.hxx index 32f45a62e3..7b404ea30a 100644 --- a/src/t8_vtk/t8_vtk_parallel.hxx +++ b/src/t8_vtk/t8_vtk_parallel.hxx @@ -56,8 +56,9 @@ vtk_read_success_t t8_read_parallel_unstructured (const char *filename, * \returns non-zero on success, zero if the reading failed. */ vtk_read_success_t t8_read_parallel_polyData (const char *filename, - vtkSmartPointer < vtkDataSet > - grid, sc_MPI_Comm comm); + vtkSmartPointer < + vtkDataSet >grid, + sc_MPI_Comm comm); #endif /* T8_WITH_VTK */ #endif /* T8_VTK_PARALLEL_HXX */ diff --git a/src/t8_vtk/t8_vtk_polydata.cxx b/src/t8_vtk/t8_vtk_polydata.cxx index 3aa8b744b6..4886fc875c 100644 --- a/src/t8_vtk/t8_vtk_polydata.cxx +++ b/src/t8_vtk/t8_vtk_polydata.cxx @@ -126,7 +126,7 @@ t8_read_poly_ext (const char *filename, vtkSmartPointer < vtkPolyData > grid) } vtk_read_success_t -t8_read_polyData (const char *filename, vtkDataSet * grid) +t8_read_polyData (const char *filename, vtkDataSet *grid) { vtkSmartPointer < vtkPolyData > poly_data = vtkSmartPointer < vtkPolyData >::New (); diff --git a/src/t8_vtk/t8_vtk_polydata.hxx b/src/t8_vtk/t8_vtk_polydata.hxx index e64d428481..ea15b517f6 100644 --- a/src/t8_vtk/t8_vtk_polydata.hxx +++ b/src/t8_vtk/t8_vtk_polydata.hxx @@ -47,8 +47,7 @@ along with t8code; if not, write to the Free Software Foundation, Inc., * \returns non-zero on success, zero if the reading failed. * */ -vtk_read_success_t t8_read_polyData (const char *filename, - vtkDataSet * grid); +vtk_read_success_t t8_read_polyData (const char *filename, vtkDataSet *grid); #endif /* T8_WITH_VTK */ #endif /* T8_CMESH_VTK_POLYDATA */ diff --git a/src/t8_vtk/t8_vtk_reader.cxx b/src/t8_vtk/t8_vtk_reader.cxx index a24347035f..6c6b941301 100644 --- a/src/t8_vtk/t8_vtk_reader.cxx +++ b/src/t8_vtk/t8_vtk_reader.cxx @@ -113,7 +113,7 @@ t8_cmesh_correct_volume (double *tree_vertices, t8_eclass_t eclass) vtk_read_success_t t8_file_to_vtkGrid (const char *filename, - vtkSmartPointer < vtkDataSet > vtkGrid, + vtkSmartPointer < vtkDataSet >vtkGrid, const int partition, const int main_proc, sc_MPI_Comm comm, const vtk_file_type_t vtk_file_type) { @@ -195,7 +195,7 @@ t8_file_to_vtkGrid (const char *filename, * \return The dimension of \a vtkGrid. */ int -t8_get_dimension (vtkSmartPointer < vtkDataSet > vtkGrid) +t8_get_dimension (vtkSmartPointer < vtkDataSet >vtkGrid) { /* This array contains the type of each cell */ vtkSmartPointer < vtkCellTypes > cell_type_of_each_cell = @@ -234,7 +234,7 @@ t8_get_dimension (vtkSmartPointer < vtkDataSet > vtkGrid) */ static void -t8_vtk_iterate_cells (vtkSmartPointer < vtkDataSet > vtkGrid, +t8_vtk_iterate_cells (vtkSmartPointer < vtkDataSet >vtkGrid, t8_cmesh_t cmesh, const t8_gloidx_t first_tree, sc_MPI_Comm comm) { @@ -363,7 +363,7 @@ t8_vtk_partition (t8_cmesh_t cmesh, const int mpirank, } t8_cmesh_t -t8_vtkGrid_to_cmesh (vtkSmartPointer < vtkDataSet > vtkGrid, +t8_vtkGrid_to_cmesh (vtkSmartPointer < vtkDataSet >vtkGrid, const int partition, const int main_proc, const int distributed_grid, sc_MPI_Comm comm) { @@ -424,7 +424,7 @@ t8_vtkGrid_to_cmesh (vtkSmartPointer < vtkDataSet > vtkGrid, } vtkSmartPointer < vtkPointSet > -t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < vtkDataSet > vtkGrid) +t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < vtkDataSet >vtkGrid) { /* Set points */ vtkSmartPointer < vtkPoints > points = @@ -474,7 +474,7 @@ t8_vtk_reader (const char *filename, const int partition, T8_ASSERT (filename != NULL); vtk_read_success_t main_proc_read_successful = read_failure; - vtkSmartPointer < vtkDataSet > vtkGrid = NULL; + vtkSmartPointer < vtkDataSet >vtkGrid = NULL; switch (vtk_file_type) { case VTK_UNSTRUCTURED_FILE: vtkGrid = vtkSmartPointer < vtkUnstructuredGrid >::New (); @@ -516,7 +516,7 @@ t8_vtk_reader_pointSet (const char *filename, sc_MPI_Comm comm, const vtk_file_type_t vtk_file_type) { #if T8_WITH_VTK - vtkSmartPointer < vtkDataSet > vtkGrid = + vtkSmartPointer < vtkDataSet >vtkGrid = t8_vtk_reader (filename, partition, main_proc, comm, vtk_file_type); return t8_vtkGrid_to_vtkPointSet (vtkGrid); #else @@ -535,7 +535,7 @@ t8_vtk_reader_cmesh (const char *filename, const int partition, const vtk_file_type_t vtk_file_type) { #if T8_WITH_VTK - vtkSmartPointer < vtkDataSet > vtkGrid = + vtkSmartPointer < vtkDataSet >vtkGrid = t8_vtk_reader (filename, partition, main_proc, comm, vtk_file_type); if (vtkGrid != NULL) { const int distributed_grid = diff --git a/src/t8_vtk/t8_vtk_reader.hxx b/src/t8_vtk/t8_vtk_reader.hxx index 05cc62db41..7e6a848cde 100644 --- a/src/t8_vtk/t8_vtk_reader.hxx +++ b/src/t8_vtk/t8_vtk_reader.hxx @@ -48,8 +48,9 @@ T8_EXTERN_C_BEGIN (); * \param[in] comm The communicator. * \return t8_cmesh_t */ -t8_cmesh_t t8_vtkGrid_to_cmesh (vtkSmartPointer < vtkDataSet > - vtkGrid, const int partition, +t8_cmesh_t t8_vtkGrid_to_cmesh (vtkSmartPointer < + vtkDataSet >vtkGrid, + const int partition, const int main_proc, const int distributed_grid, sc_MPI_Comm comm); @@ -62,8 +63,8 @@ t8_cmesh_t t8_vtkGrid_to_cmesh (vtkSmartPointer < vtkDataSet > * \return A pointer to a vtkPointSet */ vtkSmartPointer < vtkPointSet > t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < - vtkDataSet > - vtkGrid); + vtkDataSet + >vtkGrid); /** * Given a filename to a vtkUnstructuredGrid or vtkPolyData read the file and @@ -78,12 +79,12 @@ vtkSmartPointer < vtkPointSet > t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < * \param[in] vtk_file_type A vtk-filetype that is readable by t8code. * \return Pointer to vtkDataSet */ -vtkSmartPointer < vtkDataSet > t8_vtk_reader (const char *filename, - const int partition, - const int main_proc, - sc_MPI_Comm comm, - const vtk_file_type_t - vtk_file_type); +vtkSmartPointer < vtkDataSet >t8_vtk_reader (const char *filename, + const int partition, + const int main_proc, + sc_MPI_Comm comm, + const vtk_file_type_t + vtk_file_type); /** * Given a filename to a vtkUnstructuredGrid or vtkPolyData read the file and diff --git a/src/t8_vtk/t8_vtk_unstructured.cxx b/src/t8_vtk/t8_vtk_unstructured.cxx index 248225b28a..5f1e5faf98 100644 --- a/src/t8_vtk/t8_vtk_unstructured.cxx +++ b/src/t8_vtk/t8_vtk_unstructured.cxx @@ -30,7 +30,7 @@ along with t8code; if not, write to the Free Software Foundation, Inc., vtk_read_success_t t8_read_unstructured (const char *filename, - vtkSmartPointer < vtkDataSet > grid) + vtkSmartPointer < vtkDataSet >grid) { char tmp[BUFSIZ], *extension; strcpy (tmp, filename); diff --git a/src/t8_vtk/t8_vtk_unstructured.hxx b/src/t8_vtk/t8_vtk_unstructured.hxx index f5ec877a28..c7a642fb3e 100644 --- a/src/t8_vtk/t8_vtk_unstructured.hxx +++ b/src/t8_vtk/t8_vtk_unstructured.hxx @@ -44,7 +44,6 @@ along with t8code; if not, write to the Free Software Foundation, Inc., * \returns non-zero on success, zero if the reading failed. */ vtk_read_success_t t8_read_unstructured (const char *filename, - vtkSmartPointer < vtkDataSet > - grid); + vtkSmartPointer < vtkDataSet >grid); #endif #endif /* T8_CMESH_VTK_UNSTRUCTURED_READER */ From a19645adcf6726fdb4361f83f07755c9dcfcdff3 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:37:56 +0200 Subject: [PATCH 02/25] Add vtkPoints as custom datatype --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_forest/t8_forest_to_vtkUnstructured.hxx | 4 ++-- src/t8_forest/t8_forest_vtk.cxx | 5 ++--- src/t8_vtk/t8_vtk_parallel.hxx | 5 ++--- src/t8_vtk/t8_vtk_reader.cxx | 5 ++--- src/t8_vtk/t8_vtk_reader.hxx | 15 ++++++--------- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 93de62d425..fbfe8af445 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -43,3 +43,4 @@ t8_vtk_data_field_t vtk_file_type_t vtk_read_success_t vtkDataSet +vtkPoints \ No newline at end of file diff --git a/src/t8_forest/t8_forest_to_vtkUnstructured.hxx b/src/t8_forest/t8_forest_to_vtkUnstructured.hxx index ace3290ba3..602d41d163 100644 --- a/src/t8_forest/t8_forest_to_vtkUnstructured.hxx +++ b/src/t8_forest/t8_forest_to_vtkUnstructured.hxx @@ -55,8 +55,8 @@ T8_EXTERN_C_BEGIN (); * \note If t8code was not configured with vtk, use \ref t8_forest_vtk_write_file */ void t8_forest_to_vtkUnstructuredGrid (t8_forest_t forest, - vtkSmartPointer < - vtkUnstructuredGrid > + vtkSmartPointer + < vtkUnstructuredGrid > unstructuredGrid, const int write_treeid, const int write_mpirank, diff --git a/src/t8_forest/t8_forest_vtk.cxx b/src/t8_forest/t8_forest_vtk.cxx index dd52ae3c09..7fd8e9d494 100644 --- a/src/t8_forest/t8_forest_vtk.cxx +++ b/src/t8_forest/t8_forest_vtk.cxx @@ -252,7 +252,7 @@ t8_forest_element_to_vtk_cell (t8_forest_t forest, const int elem_id, long int *point_id, int *cellTypes, - vtkSmartPointer < vtkPoints > points, + vtkSmartPointer < vtkPoints >points, vtkSmartPointer < vtkCellArray > cellArray, vtkSmartPointer < t8_vtk_gloidx_array_type_t > vtk_treeid, @@ -513,8 +513,7 @@ t8_forest_to_vtkUnstructuredGrid (t8_forest_t forest, vtkSmartPointer < vtkCellArray > cellArray = vtkSmartPointer < vtkCellArray >::New (); - vtkSmartPointer < vtkPoints > points = - vtkSmartPointer < vtkPoints >::New (); + vtkSmartPointer < vtkPoints >points = vtkSmartPointer < vtkPoints >::New (); int ghosts = write_ghosts; if (forest->ghosts == NULL || forest->ghosts->num_ghosts_elements == 0) { diff --git a/src/t8_vtk/t8_vtk_parallel.hxx b/src/t8_vtk/t8_vtk_parallel.hxx index 7b404ea30a..c694e6311f 100644 --- a/src/t8_vtk/t8_vtk_parallel.hxx +++ b/src/t8_vtk/t8_vtk_parallel.hxx @@ -56,9 +56,8 @@ vtk_read_success_t t8_read_parallel_unstructured (const char *filename, * \returns non-zero on success, zero if the reading failed. */ vtk_read_success_t t8_read_parallel_polyData (const char *filename, - vtkSmartPointer < - vtkDataSet >grid, - sc_MPI_Comm comm); + vtkSmartPointer < vtkDataSet + >grid, sc_MPI_Comm comm); #endif /* T8_WITH_VTK */ #endif /* T8_VTK_PARALLEL_HXX */ diff --git a/src/t8_vtk/t8_vtk_reader.cxx b/src/t8_vtk/t8_vtk_reader.cxx index 6c6b941301..491e882173 100644 --- a/src/t8_vtk/t8_vtk_reader.cxx +++ b/src/t8_vtk/t8_vtk_reader.cxx @@ -243,7 +243,7 @@ t8_vtk_iterate_cells (vtkSmartPointer < vtkDataSet >vtkGrid, t8_gloidx_t tree_id = first_tree; vtkCellIterator *cell_it; - vtkSmartPointer < vtkPoints > points; + vtkSmartPointer < vtkPoints >points; vtkSmartPointer < vtkCellData > cell_data = vtkGrid->GetCellData (); const int max_cell_points = vtkGrid->GetMaxCellSize (); @@ -427,8 +427,7 @@ vtkSmartPointer < vtkPointSet > t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < vtkDataSet >vtkGrid) { /* Set points */ - vtkSmartPointer < vtkPoints > points = - vtkSmartPointer < vtkPoints >::New (); + vtkSmartPointer < vtkPoints >points = vtkSmartPointer < vtkPoints >::New (); const vtkIdType num_points = vtkGrid->GetNumberOfPoints (); points->SetDataType (VTK_DOUBLE); points->SetNumberOfPoints (num_points); diff --git a/src/t8_vtk/t8_vtk_reader.hxx b/src/t8_vtk/t8_vtk_reader.hxx index 7e6a848cde..1872dac06f 100644 --- a/src/t8_vtk/t8_vtk_reader.hxx +++ b/src/t8_vtk/t8_vtk_reader.hxx @@ -62,9 +62,8 @@ t8_cmesh_t t8_vtkGrid_to_cmesh (vtkSmartPointer < * \param[in] vtkGrid A pointer to a vtkDataSet * \return A pointer to a vtkPointSet */ -vtkSmartPointer < vtkPointSet > t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < - vtkDataSet - >vtkGrid); +vtkSmartPointer < vtkPointSet > +t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < vtkDataSet >vtkGrid); /** * Given a filename to a vtkUnstructuredGrid or vtkPolyData read the file and @@ -103,12 +102,10 @@ vtkSmartPointer < vtkDataSet >t8_vtk_reader (const char *filename, * \param[in] vtk_file_type A vtk-filetype that is readable by t8code. * \return Pointer to vtkDataSet */ -vtkSmartPointer < vtkPointSet > t8_vtk_reader_pointSet (const char *filename, - const int partition, - const int main_proc, - sc_MPI_Comm comm, - const vtk_file_type_t - vtk_file_type); +vtkSmartPointer < vtkPointSet > +t8_vtk_reader_pointSet (const char *filename, const int partition, + const int main_proc, sc_MPI_Comm comm, + const vtk_file_type_t vtk_file_type); #endif From cc6512ed52393a16559496794311cef6707a633c Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:39:12 +0200 Subject: [PATCH 03/25] Add vtkCellArray as custom datatype --- scripts/t8indent_custom_datatypes.txt | 3 ++- src/t8_forest/t8_forest_vtk.cxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index fbfe8af445..a0153c5ab7 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -43,4 +43,5 @@ t8_vtk_data_field_t vtk_file_type_t vtk_read_success_t vtkDataSet -vtkPoints \ No newline at end of file +vtkPoints +vtkCellArray \ No newline at end of file diff --git a/src/t8_forest/t8_forest_vtk.cxx b/src/t8_forest/t8_forest_vtk.cxx index 7fd8e9d494..10eea08e9b 100644 --- a/src/t8_forest/t8_forest_vtk.cxx +++ b/src/t8_forest/t8_forest_vtk.cxx @@ -253,7 +253,7 @@ t8_forest_element_to_vtk_cell (t8_forest_t forest, long int *point_id, int *cellTypes, vtkSmartPointer < vtkPoints >points, - vtkSmartPointer < vtkCellArray > cellArray, + vtkSmartPointer < vtkCellArray >cellArray, vtkSmartPointer < t8_vtk_gloidx_array_type_t > vtk_treeid, vtkSmartPointer < t8_vtk_gloidx_array_type_t > @@ -510,7 +510,7 @@ t8_forest_to_vtkUnstructuredGrid (t8_forest_t forest, const t8_gloidx_t offset = t8_forest_get_first_local_element_id (forest); t8_gloidx_t elem_id = offset; - vtkSmartPointer < vtkCellArray > cellArray = + vtkSmartPointer < vtkCellArray >cellArray = vtkSmartPointer < vtkCellArray >::New (); vtkSmartPointer < vtkPoints >points = vtkSmartPointer < vtkPoints >::New (); From 6737cdec6587bbeaad688d651ddcc5a576575cda Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:40:34 +0200 Subject: [PATCH 04/25] Add t8_vtk_gloidx_array_type as custom datatype --- scripts/t8indent_custom_datatypes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index a0153c5ab7..feae56ab18 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -44,4 +44,5 @@ vtk_file_type_t vtk_read_success_t vtkDataSet vtkPoints -vtkCellArray \ No newline at end of file +vtkCellArray +t8_vtk_gloidx_array_type \ No newline at end of file From 2c8b1d3d20dfa7da2af0e8364076f317ded0f044 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:41:50 +0200 Subject: [PATCH 05/25] Add vtkCell as custom datatype --- scripts/t8indent_custom_datatypes.txt | 3 ++- src/t8_forest/t8_forest_vtk.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index feae56ab18..b7df147143 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -45,4 +45,5 @@ vtk_read_success_t vtkDataSet vtkPoints vtkCellArray -t8_vtk_gloidx_array_type \ No newline at end of file +t8_vtk_gloidx_array_type +vtkCell diff --git a/src/t8_forest/t8_forest_vtk.cxx b/src/t8_forest/t8_forest_vtk.cxx index 10eea08e9b..367a49b21d 100644 --- a/src/t8_forest/t8_forest_vtk.cxx +++ b/src/t8_forest/t8_forest_vtk.cxx @@ -263,7 +263,7 @@ t8_forest_element_to_vtk_cell (t8_forest_t forest, vtkSmartPointer < t8_vtk_gloidx_array_type_t > vtk_element_id) { - vtkSmartPointer < vtkCell > pvtkCell = NULL; + vtkSmartPointer < vtkCell >pvtkCell = NULL; const t8_element_shape_t element_shape = scheme->t8_element_shape (element); const int num_node = From cc5ab2fc002d31743f98e27522b946e91e80df16 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:43:56 +0200 Subject: [PATCH 06/25] Add vtk*Celltype* as custom datatype --- scripts/t8indent_custom_datatypes.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index b7df147143..6d57aa1cae 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -47,3 +47,19 @@ vtkPoints vtkCellArray t8_vtk_gloidx_array_type vtkCell +vtkVertex +vtkLine +vtkQuad +vtkTriangle +vtkHexahedron +vtkTetra +vtkWedge +vtkPyramid +vtkVertex +vtkQuadraticEdge +vtkQuadraticQuad +vtkQuadraticTriangle +vtkQuadraticHexahedron +vtkQuadraticTetra +vtkQuadraticWedge +vtkQuadraticPyramid \ No newline at end of file From cf9161b696dd24902ea834a8f7680ea157ac670d Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:47:05 +0200 Subject: [PATCH 07/25] Add vtkXMLUnstructuredGridReader as custom datatype --- scripts/t8indent_custom_datatypes.txt | 3 ++- src/t8_vtk/t8_vtk_unstructured.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 6d57aa1cae..aeebfe13c3 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -62,4 +62,5 @@ vtkQuadraticTriangle vtkQuadraticHexahedron vtkQuadraticTetra vtkQuadraticWedge -vtkQuadraticPyramid \ No newline at end of file +vtkQuadraticPyramid +vtkXMLUnstructuredGridReader diff --git a/src/t8_vtk/t8_vtk_unstructured.cxx b/src/t8_vtk/t8_vtk_unstructured.cxx index 5f1e5faf98..ebd195c513 100644 --- a/src/t8_vtk/t8_vtk_unstructured.cxx +++ b/src/t8_vtk/t8_vtk_unstructured.cxx @@ -48,7 +48,7 @@ t8_read_unstructured (const char *filename, /* Chose the vtk-Reader according to the file-ending and read the file */ if (strcmp (extension, "vtu") == 0) { - vtkSmartPointer < vtkXMLUnstructuredGridReader > reader = + vtkSmartPointer < vtkXMLUnstructuredGridReader >reader = vtkSmartPointer < vtkXMLUnstructuredGridReader >::New (); if (!reader->CanReadFile (filename)) { t8_errorf ("Unable to read file.\n"); From e198a78a5ebfd56bff93033f7d96551bff495625 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:47:59 +0200 Subject: [PATCH 08/25] Add vtkXMLPUnstructuredGridReader as custom datatype --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_vtk/t8_vtk_parallel.cxx | 2 +- src/t8_vtk/t8_vtk_unstructured.cxx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index aeebfe13c3..b2a9ad3df3 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -64,3 +64,4 @@ vtkQuadraticTetra vtkQuadraticWedge vtkQuadraticPyramid vtkXMLUnstructuredGridReader +vtkXMLPUnstructuredGridReader \ No newline at end of file diff --git a/src/t8_vtk/t8_vtk_parallel.cxx b/src/t8_vtk/t8_vtk_parallel.cxx index ef4e2b370e..0a042a97bb 100644 --- a/src/t8_vtk/t8_vtk_parallel.cxx +++ b/src/t8_vtk/t8_vtk_parallel.cxx @@ -142,7 +142,7 @@ t8_read_parallel_unstructured (const char *filename, sc_MPI_Comm comm) { /* Setup parallel reader. */ - vtkSmartPointer < vtkXMLPUnstructuredGridReader > reader = + vtkSmartPointer < vtkXMLPUnstructuredGridReader >reader = vtkSmartPointer < vtkXMLPUnstructuredGridReader >::New (); vtk_read_success_t read_status = read_failure; diff --git a/src/t8_vtk/t8_vtk_unstructured.cxx b/src/t8_vtk/t8_vtk_unstructured.cxx index ebd195c513..bbed931ca3 100644 --- a/src/t8_vtk/t8_vtk_unstructured.cxx +++ b/src/t8_vtk/t8_vtk_unstructured.cxx @@ -72,7 +72,7 @@ t8_read_unstructured (const char *filename, return read_success; } else if (strcmp (extension, "pvtu") == 0) { - vtkSmartPointer < vtkXMLPUnstructuredGridReader > reader = + vtkSmartPointer < vtkXMLPUnstructuredGridReader >reader = vtkSmartPointer < vtkXMLPUnstructuredGridReader >::New (); if (!reader->CanReadFile (filename)) { t8_errorf ("Unable to read file.\n"); From 6ff2777c41bc7a45a889a6219ef4801a1bfdb0c7 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:55:23 +0200 Subject: [PATCH 09/25] Add vtkUnstructuredGrid to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 3 ++- src/t8_forest/t8_forest_to_vtkUnstructured.hxx | 5 +++-- src/t8_forest/t8_forest_vtk.cxx | 8 +++++--- test/t8_gtest_vtk_linkage.cxx | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index b2a9ad3df3..d95fb32256 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -64,4 +64,5 @@ vtkQuadraticTetra vtkQuadraticWedge vtkQuadraticPyramid vtkXMLUnstructuredGridReader -vtkXMLPUnstructuredGridReader \ No newline at end of file +vtkXMLPUnstructuredGridReader +vtkUnstructuredGrid \ No newline at end of file diff --git a/src/t8_forest/t8_forest_to_vtkUnstructured.hxx b/src/t8_forest/t8_forest_to_vtkUnstructured.hxx index 602d41d163..4e2ecfa7b1 100644 --- a/src/t8_forest/t8_forest_to_vtkUnstructured.hxx +++ b/src/t8_forest/t8_forest_to_vtkUnstructured.hxx @@ -54,9 +54,9 @@ T8_EXTERN_C_BEGIN (); * \return True if successful, false if not (process local). * \note If t8code was not configured with vtk, use \ref t8_forest_vtk_write_file */ +/* *INDENT-OFF* */ void t8_forest_to_vtkUnstructuredGrid (t8_forest_t forest, - vtkSmartPointer - < vtkUnstructuredGrid > + vtkSmartPointer < vtkUnstructuredGrid > unstructuredGrid, const int write_treeid, const int write_mpirank, @@ -68,6 +68,7 @@ void t8_forest_to_vtkUnstructuredGrid (t8_forest_t forest, const int num_data, t8_vtk_data_field_t *data); +/* *INDENT-ON* */ #endif T8_EXTERN_C_END (); diff --git a/src/t8_forest/t8_forest_vtk.cxx b/src/t8_forest/t8_forest_vtk.cxx index 367a49b21d..36921e81b4 100644 --- a/src/t8_forest/t8_forest_vtk.cxx +++ b/src/t8_forest/t8_forest_vtk.cxx @@ -400,7 +400,7 @@ t8_forest_vtk_write_file_via_API (t8_forest_t forest, const char *fileprefix, * and the cells(cellTypes and which points belong to this cell) */ - vtkSmartPointer < vtkUnstructuredGrid > unstructuredGrid = + vtkSmartPointer < vtkUnstructuredGrid >unstructuredGrid = vtkSmartPointer < vtkUnstructuredGrid >::New (); t8_forest_to_vtkUnstructuredGrid (forest, unstructuredGrid, write_treeid, write_mpirank, write_level, @@ -489,16 +489,18 @@ t8_forest_vtk_write_file_via_API (t8_forest_t forest, const char *fileprefix, } #if T8_WITH_VTK +/* *INDENT-OFF* */ void t8_forest_to_vtkUnstructuredGrid (t8_forest_t forest, - vtkSmartPointer < vtkUnstructuredGrid > - unstructuredGrid, const int write_treeid, + vtkSmartPointer < vtkUnstructuredGrid >unstructuredGrid, + const int write_treeid, const int write_mpirank, const int write_level, const int write_element_id, const int write_ghosts, const int curved_flag, const int num_data, t8_vtk_data_field_t *data) +/* *INDENT-ON* */ { /*Check assertions: forest and fileprefix are not NULL and forest is committed */ T8_ASSERT (forest != NULL); diff --git a/test/t8_gtest_vtk_linkage.cxx b/test/t8_gtest_vtk_linkage.cxx index 0b0afc1f50..ea089793f3 100644 --- a/test/t8_gtest_vtk_linkage.cxx +++ b/test/t8_gtest_vtk_linkage.cxx @@ -67,7 +67,7 @@ TEST (t8_gtest_vtk_linkage, t8_test_vtk_version_number) TEST (t8_gtest_vtk_linkage, t8_test_vtk_linkage) { #if T8_WITH_VTK - vtkNew < vtkUnstructuredGrid > unstructuredGrid; + vtkNew < vtkUnstructuredGrid >unstructuredGrid; t8_debugf ("Successfully created VTK unstructuredGrid object.\n"); #else From 2e21f86e89f3dade5c4d3065e525c1158d4f547f Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:56:48 +0200 Subject: [PATCH 10/25] Added vtkPolyData to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 3 ++- src/t8_vtk/t8_vtk_polydata.cxx | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index d95fb32256..e3d744539c 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -65,4 +65,5 @@ vtkQuadraticWedge vtkQuadraticPyramid vtkXMLUnstructuredGridReader vtkXMLPUnstructuredGridReader -vtkUnstructuredGrid \ No newline at end of file +vtkUnstructuredGrid +vtkPolyData diff --git a/src/t8_vtk/t8_vtk_polydata.cxx b/src/t8_vtk/t8_vtk_polydata.cxx index 4886fc875c..f4d9f8a655 100644 --- a/src/t8_vtk/t8_vtk_polydata.cxx +++ b/src/t8_vtk/t8_vtk_polydata.cxx @@ -35,7 +35,7 @@ along with t8code; if not, write to the Free Software Foundation, Inc., #include static vtk_read_success_t -t8_read_poly_ext (const char *filename, vtkSmartPointer < vtkPolyData > grid) +t8_read_poly_ext (const char *filename, vtkSmartPointer < vtkPolyData >grid) { char tmp[BUFSIZ]; char *extension; @@ -128,9 +128,9 @@ t8_read_poly_ext (const char *filename, vtkSmartPointer < vtkPolyData > grid) vtk_read_success_t t8_read_polyData (const char *filename, vtkDataSet *grid) { - vtkSmartPointer < vtkPolyData > poly_data = + vtkSmartPointer < vtkPolyData >poly_data = vtkSmartPointer < vtkPolyData >::New (); - vtkSmartPointer < vtkPolyData > triangulated; + vtkSmartPointer < vtkPolyData >triangulated; vtkNew < vtkTriangleFilter > tri_filter; /* Prepare the poly-data for the translation from vtk to t8code. * We split all polygons (which are not supported by t8code) to From 61ce0c96cafe863497afc745bc4ba3f2ce173aa5 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 12:58:51 +0200 Subject: [PATCH 11/25] Added all types of polydata-reader to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 6 ++++++ src/t8_vtk/t8_vtk_parallel.cxx | 2 +- src/t8_vtk/t8_vtk_polydata.cxx | 12 ++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index e3d744539c..ecf7e7272a 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -67,3 +67,9 @@ vtkXMLUnstructuredGridReader vtkXMLPUnstructuredGridReader vtkUnstructuredGrid vtkPolyData +vtkPLYReader +vtkXMLPolyDataReader +vtkOBJReader +vtkSTLReader +vtkBYUReader +vtkXMLPPolyDataReader diff --git a/src/t8_vtk/t8_vtk_parallel.cxx b/src/t8_vtk/t8_vtk_parallel.cxx index 0a042a97bb..77705e4a33 100644 --- a/src/t8_vtk/t8_vtk_parallel.cxx +++ b/src/t8_vtk/t8_vtk_parallel.cxx @@ -104,7 +104,7 @@ t8_read_parallel_polyData (const char *filename, sc_MPI_Comm comm) { /* Setup parallel reader. */ - vtkSmartPointer < vtkXMLPPolyDataReader > reader = + vtkSmartPointer < vtkXMLPPolyDataReader >reader = vtkSmartPointer < vtkXMLPPolyDataReader >::New (); vtk_read_success_t read_status = read_failure; diff --git a/src/t8_vtk/t8_vtk_polydata.cxx b/src/t8_vtk/t8_vtk_polydata.cxx index f4d9f8a655..ea754332ab 100644 --- a/src/t8_vtk/t8_vtk_polydata.cxx +++ b/src/t8_vtk/t8_vtk_polydata.cxx @@ -56,14 +56,14 @@ t8_read_poly_ext (const char *filename, vtkSmartPointer < vtkPolyData >grid) /* Read the file depending on the extension. Not all readers have * a built-in check if the file is readable. */ if (strcmp (extension, "ply") == 0) { - vtkNew < vtkPLYReader > reader; + vtkNew < vtkPLYReader >reader; reader->SetFileName (filename); reader->Update (); grid->ShallowCopy (vtkDataSet::SafeDownCast (reader->GetOutput ())); return read_success; } else if (strcmp (extension, "vtp") == 0) { - vtkNew < vtkXMLPolyDataReader > reader; + vtkNew < vtkXMLPolyDataReader >reader; reader->SetFileName (filename); if (!reader->CanReadFile (filename)) { t8_errorf ("Unable to read file %s.\n", filename); @@ -74,14 +74,14 @@ t8_read_poly_ext (const char *filename, vtkSmartPointer < vtkPolyData >grid) return read_success; } else if (strcmp (extension, "obj") == 0) { - vtkNew < vtkOBJReader > reader; + vtkNew < vtkOBJReader >reader; reader->SetFileName (filename); reader->Update (); grid->ShallowCopy (vtkDataSet::SafeDownCast (reader->GetOutput ())); return read_success; } else if (strcmp (extension, "stl") == 0) { - vtkNew < vtkSTLReader > reader; + vtkNew < vtkSTLReader >reader; reader->SetFileName (filename); reader->Update (); grid->ShallowCopy (vtkDataSet::SafeDownCast (reader->GetOutput ())); @@ -100,14 +100,14 @@ t8_read_poly_ext (const char *filename, vtkSmartPointer < vtkPolyData >grid) return read_success; } else if (strcmp (extension, "g") == 0) { - vtkNew < vtkBYUReader > reader; + vtkNew < vtkBYUReader >reader; reader->SetGeometryFileName (filename); reader->Update (); grid->ShallowCopy (vtkDataSet::SafeDownCast (reader->GetOutput ())); return read_failure; } else if (strcmp (extension, "pvtp") == 0) { - vtkSmartPointer < vtkXMLPPolyDataReader > reader = + vtkSmartPointer < vtkXMLPPolyDataReader >reader = vtkSmartPointer < vtkXMLPPolyDataReader >::New (); if (!reader->CanReadFile (filename)) { t8_errorf ("Unable to read file.\n"); From 0ac4de00681441f920788fde75049779b4f55a2a Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:00:23 +0200 Subject: [PATCH 12/25] Add vtkTriangleFilter to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_vtk/t8_vtk_polydata.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index ecf7e7272a..7ce4d4c041 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -73,3 +73,4 @@ vtkOBJReader vtkSTLReader vtkBYUReader vtkXMLPPolyDataReader +vtkTriangleFilter diff --git a/src/t8_vtk/t8_vtk_polydata.cxx b/src/t8_vtk/t8_vtk_polydata.cxx index ea754332ab..88fff14364 100644 --- a/src/t8_vtk/t8_vtk_polydata.cxx +++ b/src/t8_vtk/t8_vtk_polydata.cxx @@ -131,7 +131,7 @@ t8_read_polyData (const char *filename, vtkDataSet *grid) vtkSmartPointer < vtkPolyData >poly_data = vtkSmartPointer < vtkPolyData >::New (); vtkSmartPointer < vtkPolyData >triangulated; - vtkNew < vtkTriangleFilter > tri_filter; + vtkNew < vtkTriangleFilter >tri_filter; /* Prepare the poly-data for the translation from vtk to t8code. * We split all polygons (which are not supported by t8code) to * triangles, vertices and lines. */ From 9e9d725be7a47e6eec806849337d05e811caf5f6 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:01:50 +0200 Subject: [PATCH 13/25] Added vtkIdType to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 7ce4d4c041..c8cf3bba57 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -74,3 +74,4 @@ vtkSTLReader vtkBYUReader vtkXMLPPolyDataReader vtkTriangleFilter +vtkIdType \ No newline at end of file From 0d3cc70cb7e50c9da25e79c2349f52121f8aafa7 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:02:51 +0200 Subject: [PATCH 14/25] Added vtkCellIterator to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index c8cf3bba57..b7cdae2b54 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -74,4 +74,5 @@ vtkSTLReader vtkBYUReader vtkXMLPPolyDataReader vtkTriangleFilter -vtkIdType \ No newline at end of file +vtkIdType +vtkCellIterator From f4e96182a9bc1e467da54888d8d2442f498d2285 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:03:48 +0200 Subject: [PATCH 15/25] Added vtkCellData to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 2 ++ src/t8_vtk/t8_vtk_reader.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index b7cdae2b54..5530055cd3 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -76,3 +76,5 @@ vtkXMLPPolyDataReader vtkTriangleFilter vtkIdType vtkCellIterator +vtkCellData + diff --git a/src/t8_vtk/t8_vtk_reader.cxx b/src/t8_vtk/t8_vtk_reader.cxx index 491e882173..8e344d9031 100644 --- a/src/t8_vtk/t8_vtk_reader.cxx +++ b/src/t8_vtk/t8_vtk_reader.cxx @@ -244,7 +244,7 @@ t8_vtk_iterate_cells (vtkSmartPointer < vtkDataSet >vtkGrid, vtkCellIterator *cell_it; vtkSmartPointer < vtkPoints >points; - vtkSmartPointer < vtkCellData > cell_data = vtkGrid->GetCellData (); + vtkSmartPointer < vtkCellData >cell_data = vtkGrid->GetCellData (); const int max_cell_points = vtkGrid->GetMaxCellSize (); T8_ASSERT (max_cell_points >= 0); From 518c5fbdf1ac7aac0d647bce416995fc56261c99 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:05:01 +0200 Subject: [PATCH 16/25] Added vtkDataArray to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 5530055cd3..85241e1781 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -77,4 +77,4 @@ vtkTriangleFilter vtkIdType vtkCellIterator vtkCellData - +vtkDataArray From e04455e93f9dd3b888d53856e391267d9e9e665d Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:07:46 +0200 Subject: [PATCH 17/25] Added vtkPointSet to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_vtk/t8_vtk_reader.cxx | 2 +- src/t8_vtk/t8_vtk_reader.hxx | 17 +++++++++++------ test/t8_IO/t8_gtest_vtk_reader.cxx | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 85241e1781..db3f480ed8 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -78,3 +78,4 @@ vtkIdType vtkCellIterator vtkCellData vtkDataArray +vtkPointSet \ No newline at end of file diff --git a/src/t8_vtk/t8_vtk_reader.cxx b/src/t8_vtk/t8_vtk_reader.cxx index 8e344d9031..462974ffef 100644 --- a/src/t8_vtk/t8_vtk_reader.cxx +++ b/src/t8_vtk/t8_vtk_reader.cxx @@ -439,7 +439,7 @@ t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < vtkDataSet >vtkGrid) } points->Modified (); T8_ASSERT (points->GetNumberOfPoints () == num_points); - vtkSmartPointer < vtkPointSet > cloud = + vtkSmartPointer < vtkPointSet >cloud = vtkSmartPointer < vtkPointSet >::New (); cloud->SetPoints (points); diff --git a/src/t8_vtk/t8_vtk_reader.hxx b/src/t8_vtk/t8_vtk_reader.hxx index 1872dac06f..6ef1901a25 100644 --- a/src/t8_vtk/t8_vtk_reader.hxx +++ b/src/t8_vtk/t8_vtk_reader.hxx @@ -62,8 +62,11 @@ t8_cmesh_t t8_vtkGrid_to_cmesh (vtkSmartPointer < * \param[in] vtkGrid A pointer to a vtkDataSet * \return A pointer to a vtkPointSet */ -vtkSmartPointer < vtkPointSet > -t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < vtkDataSet >vtkGrid); +/* *INDENT-OFF* */ +vtkSmartPointer < vtkPointSet >t8_vtkGrid_to_vtkPointSet (vtkSmartPointer + < vtkDataSet > + vtkGrid); +/* *INDENT-ON* */ /** * Given a filename to a vtkUnstructuredGrid or vtkPolyData read the file and @@ -102,10 +105,12 @@ vtkSmartPointer < vtkDataSet >t8_vtk_reader (const char *filename, * \param[in] vtk_file_type A vtk-filetype that is readable by t8code. * \return Pointer to vtkDataSet */ -vtkSmartPointer < vtkPointSet > -t8_vtk_reader_pointSet (const char *filename, const int partition, - const int main_proc, sc_MPI_Comm comm, - const vtk_file_type_t vtk_file_type); +vtkSmartPointer < vtkPointSet >t8_vtk_reader_pointSet (const char *filename, + const int partition, + const int main_proc, + sc_MPI_Comm comm, + const vtk_file_type_t + vtk_file_type); #endif diff --git a/test/t8_IO/t8_gtest_vtk_reader.cxx b/test/t8_IO/t8_gtest_vtk_reader.cxx index d53427af27..3981ebdfe7 100644 --- a/test/t8_IO/t8_gtest_vtk_reader.cxx +++ b/test/t8_IO/t8_gtest_vtk_reader.cxx @@ -136,7 +136,7 @@ TEST_P (vtk_reader, vtk_to_pointSet) { #if T8_WITH_VTK if (file_type != VTK_FILE_ERROR) { - vtkSmartPointer < vtkPointSet > points = + vtkSmartPointer < vtkPointSet >points = t8_vtk_reader_pointSet (test_files[file], partition, main_proc, sc_MPI_COMM_WORLD, file_type); int test_points = points->GetNumberOfPoints (); From 66f186f1a53b0dcd34f34766c11ee0a8835508d3 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:09:31 +0200 Subject: [PATCH 18/25] Added vtkCellDataToPointData to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 3 ++- src/t8_vtk/t8_vtk_reader.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index db3f480ed8..d8cf7cf847 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -78,4 +78,5 @@ vtkIdType vtkCellIterator vtkCellData vtkDataArray -vtkPointSet \ No newline at end of file +vtkPointSet +vtkCellDataToPointData diff --git a/src/t8_vtk/t8_vtk_reader.cxx b/src/t8_vtk/t8_vtk_reader.cxx index 462974ffef..8539b15d80 100644 --- a/src/t8_vtk/t8_vtk_reader.cxx +++ b/src/t8_vtk/t8_vtk_reader.cxx @@ -444,7 +444,7 @@ t8_vtkGrid_to_vtkPointSet (vtkSmartPointer < vtkDataSet >vtkGrid) cloud->SetPoints (points); /* Map cell data to point data */ - vtkSmartPointer < vtkCellDataToPointData > c2p = + vtkSmartPointer < vtkCellDataToPointData >c2p = vtkCellDataToPointData::New (); c2p->PassCellDataOff (); c2p->SetInputData (vtkGrid); From 931a62d109fbb3f7a36124606465c552be2fd070 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:10:25 +0200 Subject: [PATCH 19/25] Added ctkCellTypes to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_vtk/t8_vtk_reader.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index d8cf7cf847..9db576de2a 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -80,3 +80,4 @@ vtkCellData vtkDataArray vtkPointSet vtkCellDataToPointData +vtkCellTypes diff --git a/src/t8_vtk/t8_vtk_reader.cxx b/src/t8_vtk/t8_vtk_reader.cxx index 8539b15d80..39789ac63d 100644 --- a/src/t8_vtk/t8_vtk_reader.cxx +++ b/src/t8_vtk/t8_vtk_reader.cxx @@ -198,7 +198,7 @@ int t8_get_dimension (vtkSmartPointer < vtkDataSet >vtkGrid) { /* This array contains the type of each cell */ - vtkSmartPointer < vtkCellTypes > cell_type_of_each_cell = + vtkSmartPointer < vtkCellTypes >cell_type_of_each_cell = vtkSmartPointer < vtkCellTypes >::New (); vtkGrid->GetCellTypes (cell_type_of_each_cell); vtkSmartPointer < vtkUnsignedCharArray > cell_types = From 8441f54fa2cf3c9869f56af83bd1cef6c2ff0672 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:11:39 +0200 Subject: [PATCH 20/25] Added vtkUnsignedCharArray to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_vtk/t8_vtk_reader.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 9db576de2a..4cd8ca2b5e 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -81,3 +81,4 @@ vtkDataArray vtkPointSet vtkCellDataToPointData vtkCellTypes +vtkUnsignedCharArray diff --git a/src/t8_vtk/t8_vtk_reader.cxx b/src/t8_vtk/t8_vtk_reader.cxx index 39789ac63d..8de4a7b624 100644 --- a/src/t8_vtk/t8_vtk_reader.cxx +++ b/src/t8_vtk/t8_vtk_reader.cxx @@ -201,7 +201,7 @@ t8_get_dimension (vtkSmartPointer < vtkDataSet >vtkGrid) vtkSmartPointer < vtkCellTypes >cell_type_of_each_cell = vtkSmartPointer < vtkCellTypes >::New (); vtkGrid->GetCellTypes (cell_type_of_each_cell); - vtkSmartPointer < vtkUnsignedCharArray > cell_types = + vtkSmartPointer < vtkUnsignedCharArray >cell_types = cell_type_of_each_cell->GetCellTypesArray (); int max_cell_type = -1; const vtkIdType num_types = cell_types->GetNumberOfTuples (); From 1c0e0c6a673852ecc70d1c3fb283dc88e1888267 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:14:03 +0200 Subject: [PATCH 21/25] Added all types of t8_vtklocidx/gloidx_array_type to custom datatypes --- scripts/t8indent_custom_datatypes.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 4cd8ca2b5e..a25dce9dc5 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -45,6 +45,9 @@ vtk_read_success_t vtkDataSet vtkPoints vtkCellArray +vtkTypeInt32Array +vtkTypeInt64Array +t8_vtk_locidx_array_type_t t8_vtk_gloidx_array_type vtkCell vtkVertex From ef209c3e489c4e6dce6e1e92e629c269c78f825e Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:14:59 +0200 Subject: [PATCH 22/25] fix typo --- scripts/t8indent_custom_datatypes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index a25dce9dc5..563d159a4a 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -48,7 +48,7 @@ vtkCellArray vtkTypeInt32Array vtkTypeInt64Array t8_vtk_locidx_array_type_t -t8_vtk_gloidx_array_type +t8_vtk_gloidx_array_type_t vtkCell vtkVertex vtkLine From 9507cb90c6f612c233fdea9dcb9f3b78f9427357 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 13:17:44 +0200 Subject: [PATCH 23/25] Fix indentation --- scripts/t8indent_custom_datatypes.txt | 1 + src/t8_forest/t8_forest_vtk.cxx | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt index 563d159a4a..11464689cb 100644 --- a/scripts/t8indent_custom_datatypes.txt +++ b/scripts/t8indent_custom_datatypes.txt @@ -85,3 +85,4 @@ vtkPointSet vtkCellDataToPointData vtkCellTypes vtkUnsignedCharArray +t8_vtk_data_type_t \ No newline at end of file diff --git a/src/t8_forest/t8_forest_vtk.cxx b/src/t8_forest/t8_forest_vtk.cxx index 36921e81b4..094bc37fa3 100644 --- a/src/t8_forest/t8_forest_vtk.cxx +++ b/src/t8_forest/t8_forest_vtk.cxx @@ -237,6 +237,7 @@ t8_forest_vtk_get_element_nodes (t8_forest_t forest, t8_locidx_t ltreeid, * the data related to the element (not element_data). * */ +/* *INDENT-OFF* */ static void t8_forest_element_to_vtk_cell (t8_forest_t forest, const t8_element_t *element, @@ -254,14 +255,11 @@ t8_forest_element_to_vtk_cell (t8_forest_t forest, int *cellTypes, vtkSmartPointer < vtkPoints >points, vtkSmartPointer < vtkCellArray >cellArray, - vtkSmartPointer < t8_vtk_gloidx_array_type_t > - vtk_treeid, - vtkSmartPointer < t8_vtk_gloidx_array_type_t > - vtk_mpirank, - vtkSmartPointer < t8_vtk_gloidx_array_type_t > - vtk_level, - vtkSmartPointer < t8_vtk_gloidx_array_type_t > - vtk_element_id) + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_treeid, + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_mpirank, + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_level, + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_element_id) +/* *INDENT-ON* */ { vtkSmartPointer < vtkCell >pvtkCell = NULL; @@ -548,13 +546,13 @@ t8_forest_to_vtkUnstructuredGrid (t8_forest_t forest, * metadata if wanted. */ - vtkSmartPointer < t8_vtk_gloidx_array_type_t > vtk_treeid = + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_treeid = vtkSmartPointer < t8_vtk_gloidx_array_type_t >::New (); - vtkSmartPointer < t8_vtk_gloidx_array_type_t > vtk_mpirank = + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_mpirank = vtkSmartPointer < t8_vtk_gloidx_array_type_t >::New (); - vtkSmartPointer < t8_vtk_gloidx_array_type_t > vtk_level = + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_level = vtkSmartPointer < t8_vtk_gloidx_array_type_t >::New (); - vtkSmartPointer < t8_vtk_gloidx_array_type_t > vtk_element_id = + vtkSmartPointer < t8_vtk_gloidx_array_type_t >vtk_element_id = vtkSmartPointer < t8_vtk_gloidx_array_type_t >::New (); /* From 2a7a3ab170f3a1d2bea1b36c9f1bf43f768fa532 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 14:09:51 +0200 Subject: [PATCH 24/25] Apply suggestions from code review Co-authored-by: Sandro Elsweijer <49643115+sandro-elsweijer@users.noreply.github.com> --- src/t8_vtk/t8_vtk_parallel.hxx | 4 ++-- src/t8_vtk/t8_vtk_reader.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/t8_vtk/t8_vtk_parallel.hxx b/src/t8_vtk/t8_vtk_parallel.hxx index c694e6311f..32f45a62e3 100644 --- a/src/t8_vtk/t8_vtk_parallel.hxx +++ b/src/t8_vtk/t8_vtk_parallel.hxx @@ -56,8 +56,8 @@ vtk_read_success_t t8_read_parallel_unstructured (const char *filename, * \returns non-zero on success, zero if the reading failed. */ vtk_read_success_t t8_read_parallel_polyData (const char *filename, - vtkSmartPointer < vtkDataSet - >grid, sc_MPI_Comm comm); + vtkSmartPointer < vtkDataSet > + grid, sc_MPI_Comm comm); #endif /* T8_WITH_VTK */ #endif /* T8_VTK_PARALLEL_HXX */ diff --git a/src/t8_vtk/t8_vtk_reader.hxx b/src/t8_vtk/t8_vtk_reader.hxx index 6ef1901a25..269a009fd0 100644 --- a/src/t8_vtk/t8_vtk_reader.hxx +++ b/src/t8_vtk/t8_vtk_reader.hxx @@ -48,8 +48,8 @@ T8_EXTERN_C_BEGIN (); * \param[in] comm The communicator. * \return t8_cmesh_t */ -t8_cmesh_t t8_vtkGrid_to_cmesh (vtkSmartPointer < - vtkDataSet >vtkGrid, +t8_cmesh_t t8_vtkGrid_to_cmesh (vtkSmartPointer + < vtkDataSet >vtkGrid, const int partition, const int main_proc, const int distributed_grid, From 2abdde8707fabcc8db1686db32d8db9fbe4f33b7 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 8 Aug 2023 14:13:19 +0200 Subject: [PATCH 25/25] fix-indent --- src/t8_vtk/t8_vtk_parallel.hxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/t8_vtk/t8_vtk_parallel.hxx b/src/t8_vtk/t8_vtk_parallel.hxx index c694e6311f..2a1ba0ead8 100644 --- a/src/t8_vtk/t8_vtk_parallel.hxx +++ b/src/t8_vtk/t8_vtk_parallel.hxx @@ -55,9 +55,11 @@ vtk_read_success_t t8_read_parallel_unstructured (const char *filename, * by the pieces read on this proc. * \returns non-zero on success, zero if the reading failed. */ +/* *INDENT-OFF* */ vtk_read_success_t t8_read_parallel_polyData (const char *filename, - vtkSmartPointer < vtkDataSet - >grid, sc_MPI_Comm comm); + vtkSmartPointer < vtkDataSet > + grid, sc_MPI_Comm comm); +/* *INDENT-ON* */ #endif /* T8_WITH_VTK */ #endif /* T8_VTK_PARALLEL_HXX */