Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indent vtk related files #668

Merged
merged 26 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f8db964
Add vtkDataSet as custom datatype
Davknapp Aug 8, 2023
a19645a
Add vtkPoints as custom datatype
Davknapp Aug 8, 2023
cc6512e
Add vtkCellArray as custom datatype
Davknapp Aug 8, 2023
6737cde
Add t8_vtk_gloidx_array_type as custom datatype
Davknapp Aug 8, 2023
2c8b1d3
Add vtkCell as custom datatype
Davknapp Aug 8, 2023
cc5ab2f
Add vtk*Celltype* as custom datatype
Davknapp Aug 8, 2023
cf9161b
Add vtkXMLUnstructuredGridReader as custom datatype
Davknapp Aug 8, 2023
e198a78
Add vtkXMLPUnstructuredGridReader as custom datatype
Davknapp Aug 8, 2023
6ff2777
Add vtkUnstructuredGrid to custom datatypes
Davknapp Aug 8, 2023
2e21f86
Added vtkPolyData to custom datatypes
Davknapp Aug 8, 2023
61ce0c9
Added all types of polydata-reader to custom datatypes
Davknapp Aug 8, 2023
0ac4de0
Add vtkTriangleFilter to custom datatypes
Davknapp Aug 8, 2023
9e9d725
Added vtkIdType to custom datatypes
Davknapp Aug 8, 2023
0d3cc70
Added vtkCellIterator to custom datatypes
Davknapp Aug 8, 2023
f4e9618
Added vtkCellData to custom datatypes
Davknapp Aug 8, 2023
518c5fb
Added vtkDataArray to custom datatypes
Davknapp Aug 8, 2023
e04455e
Added vtkPointSet to custom datatypes
Davknapp Aug 8, 2023
66f186f
Added vtkCellDataToPointData to custom datatypes
Davknapp Aug 8, 2023
931a62d
Added ctkCellTypes to custom datatypes
Davknapp Aug 8, 2023
8441f54
Added vtkUnsignedCharArray to custom datatypes
Davknapp Aug 8, 2023
1c0e0c6
Added all types of t8_vtklocidx/gloidx_array_type to custom datatypes
Davknapp Aug 8, 2023
ef209c3
fix typo
Davknapp Aug 8, 2023
9507cb9
Fix indentation
Davknapp Aug 8, 2023
2a7a3ab
Apply suggestions from code review
Davknapp Aug 8, 2023
2abdde8
fix-indent
Davknapp Aug 8, 2023
ac4e18b
Merge remote-tracking branch 'origin/indent-vtk-related-files' into i…
Davknapp Aug 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions scripts/t8indent_custom_datatypes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,47 @@ t8_stash_t
t8_vtk_data_field_t
vtk_file_type_t
vtk_read_success_t
vtkDataSet
vtkPoints
vtkCellArray
vtkTypeInt32Array
vtkTypeInt64Array
t8_vtk_locidx_array_type_t
t8_vtk_gloidx_array_type_t
vtkCell
vtkVertex
vtkLine
vtkQuad
vtkTriangle
vtkHexahedron
vtkTetra
vtkWedge
vtkPyramid
vtkVertex
vtkQuadraticEdge
vtkQuadraticQuad
vtkQuadraticTriangle
vtkQuadraticHexahedron
vtkQuadraticTetra
vtkQuadraticWedge
vtkQuadraticPyramid
vtkXMLUnstructuredGridReader
vtkXMLPUnstructuredGridReader
vtkUnstructuredGrid
vtkPolyData
vtkPLYReader
vtkXMLPolyDataReader
vtkOBJReader
vtkSTLReader
vtkBYUReader
vtkXMLPPolyDataReader
vtkTriangleFilter
vtkIdType
vtkCellIterator
vtkCellData
vtkDataArray
vtkPointSet
vtkCellDataToPointData
vtkCellTypes
vtkUnsignedCharArray
t8_vtk_data_type_t
5 changes: 3 additions & 2 deletions src/t8_forest/t8_forest_to_vtkUnstructured.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 ();
Expand Down
41 changes: 20 additions & 21 deletions src/t8_forest/t8_forest_vtk.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -252,18 +253,15 @@ t8_forest_element_to_vtk_cell (t8_forest_t forest,
const int elem_id,
long int *point_id,
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 < 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)
/* *INDENT-ON* */
{
vtkSmartPointer < vtkCell > pvtkCell = NULL;
vtkSmartPointer < vtkCell >pvtkCell = NULL;

const t8_element_shape_t element_shape = scheme->t8_element_shape (element);
const int num_node =
Expand Down Expand Up @@ -400,7 +398,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,
Expand Down Expand Up @@ -489,16 +487,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);
Expand All @@ -510,11 +510,10 @@ 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 ();
vtkSmartPointer < vtkPoints >points = vtkSmartPointer < vtkPoints >::New ();

int ghosts = write_ghosts;
if (forest->ghosts == NULL || forest->ghosts->num_ghosts_elements == 0) {
Expand Down Expand Up @@ -547,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 ();

/*
Expand Down
8 changes: 4 additions & 4 deletions src/t8_vtk/t8_vtk_parallel.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ 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. */
vtkSmartPointer < vtkXMLPPolyDataReader > reader =
vtkSmartPointer < vtkXMLPPolyDataReader >reader =
vtkSmartPointer < vtkXMLPPolyDataReader >::New ();

vtk_read_success_t read_status = read_failure;
Expand Down Expand Up @@ -138,11 +138,11 @@ 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. */
vtkSmartPointer < vtkXMLPUnstructuredGridReader > reader =
vtkSmartPointer < vtkXMLPUnstructuredGridReader >reader =
vtkSmartPointer < vtkXMLPUnstructuredGridReader >::New ();

vtk_read_success_t read_status = read_failure;
Expand Down
2 changes: 2 additions & 0 deletions src/t8_vtk/t8_vtk_parallel.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
/* *INDENT-ON* */

#endif /* T8_WITH_VTK */
#endif /* T8_VTK_PARALLEL_HXX */
22 changes: 11 additions & 11 deletions src/t8_vtk/t8_vtk_polydata.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ along with t8code; if not, write to the Free Software Foundation, Inc.,
#include <vtkSmartPointer.h>

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;
Expand All @@ -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);
Expand All @@ -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 ()));
Expand All @@ -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");
Expand All @@ -126,12 +126,12 @@ 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 >poly_data =
vtkSmartPointer < vtkPolyData >::New ();
vtkSmartPointer < vtkPolyData > triangulated;
vtkNew < vtkTriangleFilter > tri_filter;
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
* triangles, vertices and lines. */
Expand Down
3 changes: 1 addition & 2 deletions src/t8_vtk/t8_vtk_polydata.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Loading