DLR-AMR · chiaraMaHe · Mar 28, 2023 · Mar 6, 2023 · Mar 6, 2023 · Mar 7, 2023
diff --git a/benchmarks/ExtremeScaling/bunny.cxx b/benchmarks/ExtremeScaling/bunny.cxx
@@ -24,7 +24,7 @@
 #include <t8.h>
 #include <t8_cmesh.h>
 #include <t8_cmesh_tetgen.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest.h>
 #include <t8_schemes/t8_default/t8_default_cxx.hxx>

diff --git a/benchmarks/time_forest_partition.cxx b/benchmarks/time_forest_partition.cxx
@@ -28,7 +28,7 @@
 #include <p4est_connectivity.h>
 #include <t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_partition.h>
 #include <t8_cmesh/t8_cmesh_occ.hxx>
 #include <t8_cmesh_readmshfile.h>

diff --git a/benchmarks/time_partition.c b/benchmarks/time_partition.c
@@ -26,7 +26,7 @@
 #include <sc_options.h>
 #include <p4est_connectivity.h>
 #include <t8_cmesh.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_partition.h>
 #include "t8_cmesh/t8_cmesh_types.h"
 #include <t8_cmesh/t8_cmesh_examples.h>

diff --git a/example/IO/cmesh/gmsh/t8_load_and_refine_square_w_hole.cxx b/example/IO/cmesh/gmsh/t8_load_and_refine_square_w_hole.cxx
@@ -27,7 +27,7 @@
 
 #include <sc_refcount.h>
 #include <t8_cmesh.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_partition.h>
 #include <t8_cmesh_readmshfile.h>
 #include <t8_forest.h>

diff --git a/example/IO/cmesh/gmsh/t8_read_msh_file.cxx b/example/IO/cmesh/gmsh/t8_read_msh_file.cxx
@@ -22,10 +22,9 @@
 
 #include <sc_options.h>
 #include <t8.h>
-#include <t8_cmesh.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_partition.h>
 #include <t8_cmesh_readmshfile.h>
-#include <t8_cmesh_vtk.h>
 #include <t8_schemes/t8_default/t8_default_cxx.hxx>
 
 /* Output a cmesh in .vtk format. Process i writes to the file

diff --git a/example/IO/cmesh/t8_cmesh_load_save.cxx b/example/IO/cmesh/t8_cmesh_load_save.cxx
@@ -22,7 +22,7 @@
 
 #include <sc_options.h>
 #include <t8_cmesh.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh_readmshfile.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_schemes/t8_default/t8_default_cxx.hxx>

diff --git a/example/IO/cmesh/tetgen/t8_forest_from_tetgen.cxx b/example/IO/cmesh/tetgen/t8_forest_from_tetgen.cxx
@@ -25,7 +25,7 @@
 #include <t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_partition.h>
 #include <t8_cmesh_tetgen.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_schemes/t8_default/t8_default_cxx.hxx>
 #include <t8_forest.h>
 

diff --git a/example/IO/cmesh/tetgen/t8_read_tetgen_file.c b/example/IO/cmesh/tetgen/t8_read_tetgen_file.c
@@ -25,7 +25,7 @@
 #include <t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_partition.h>
 #include <t8_cmesh_tetgen.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 
 void
 t8_read_tetgen_file_build_cmesh (const char *prefix, int do_dup,

diff --git a/example/IO/cmesh/tetgen/t8_time_tetgen_file.c b/example/IO/cmesh/tetgen/t8_time_tetgen_file.c
@@ -24,7 +24,7 @@
 #include <t8.h>
 #include <t8_cmesh.h>
 #include <t8_cmesh_tetgen.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <sc_flops.h>
 #include <sc_statistics.h>
 #include <sc_options.h>

diff --git a/example/IO/cmesh/triangle/t8_read_triangle_file.cxx b/example/IO/cmesh/triangle/t8_read_triangle_file.cxx
@@ -24,7 +24,7 @@
 #include <t8.h>
 #include <t8_cmesh.h>
 #include <t8_cmesh_triangle.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_schemes/t8_default/t8_default_cxx.hxx>
 
 void

diff --git a/example/advect/t8_advection.cxx b/example/advect/t8_advection.cxx
@@ -30,7 +30,7 @@
 #include <example/common/t8_example_common.h>
 #include <t8_cmesh.h>
 #include <t8_cmesh_readmshfile.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_vec.h>
 

diff --git a/example/cmesh/t8_cmesh_create_partitioned.cxx b/example/cmesh/t8_cmesh_create_partitioned.cxx
@@ -20,7 +20,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 
 /* Create a coarse mesh that is partitioned across two processes
  * (if mpisize >= 2).

diff --git a/example/cmesh/t8_cmesh_partition.cxx b/example/cmesh/t8_cmesh_partition.cxx
@@ -23,7 +23,7 @@
 #include <sc_refcount.h>
 #include <t8_forest/t8_forest_adapt.h>
 #include <t8_forest.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_partition.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <p4est_connectivity.h>

diff --git a/example/cmesh/t8_cmesh_refine.cxx b/example/cmesh/t8_cmesh_refine.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <t8_cmesh.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_schemes/t8_default/t8_default_cxx.hxx>
 

diff --git a/example/forest/t8_test_face_iterate.cxx b/example/forest/t8_test_face_iterate.cxx
@@ -29,7 +29,7 @@
 #include <t8_forest.h>
 #include <t8_cmesh.h>
 #include <t8_cmesh_readmshfile.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_data/t8_containers.h>
 

diff --git a/example/forest/t8_test_ghost.cxx b/example/forest/t8_test_ghost.cxx
@@ -28,7 +28,7 @@
 #include <t8_forest.h>
 #include <t8_cmesh.h>
 #include <t8_cmesh_readmshfile.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <example/common/t8_example_common.h>
 

diff --git a/example/forest/t8_test_ghost_large_level_diff.cxx b/example/forest/t8_test_ghost_large_level_diff.cxx
@@ -37,7 +37,7 @@
 #include <sc_statistics.h>
 #include <sc_options.h>
 #include <t8_cmesh_readmshfile.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_schemes/t8_default/t8_default_prism/t8_dprism.h>
 #include <t8_schemes/t8_default/t8_default_tet/t8_dtet.h>

diff --git a/example/geometry/t8_example_geometries.cxx b/example/geometry/t8_example_geometries.cxx
@@ -24,7 +24,7 @@
 #include <sc_refcount.h>
 #include <t8_schemes/t8_default/t8_default_cxx.hxx>
 #include <t8_forest.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_geometry/t8_geometry_base.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_analytic.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.hxx>

diff --git a/scripts/t8indent_custom_datatypes.txt b/scripts/t8indent_custom_datatypes.txt
@@ -40,4 +40,5 @@ t8_shmem_array_t
 t8_stash_attribute_struct_t
 t8_stash_t
 t8_vtk_data_field_t
+vtk_file_type_t
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -25,7 +25,8 @@ libt8_installed_headers = \
   src/t8_element_c_interface.h \
   src/t8_refcount.h src/t8_cmesh.h src/t8_cmesh_triangle.h \
   src/t8_cmesh_tetgen.h src/t8_cmesh_readmshfile.h \
-  src/t8_cmesh_vtk.h \
+  src/t8_cmesh_vtk_writer.h \
+  src/t8_cmesh_vtk_reader.hxx \
   src/t8_forest.h \
   src/t8_vec.h \
   src/t8_version.h \
@@ -84,7 +85,8 @@ libt8_compiled_sources = \
   src/t8_refcount.c src/t8_cmesh/t8_cmesh.c \
   src/t8_cmesh/t8_cmesh_occ.cxx \
   src/t8_cmesh/t8_cmesh_cxx.cxx src/t8_cmesh/t8_cmesh_triangle.c \
-  src/t8_cmesh/t8_cmesh_vtk.c src/t8_cmesh/t8_cmesh_stash.c \
+  src/t8_cmesh/t8_cmesh_vtk_writer.c src/t8_cmesh/t8_cmesh_stash.c \
+  src/t8_cmesh/t8_cmesh_vtk_reader.cxx \
   src/t8_cmesh/t8_cmesh_save.c \
   src/t8_cmesh/t8_cmesh_netcdf.c \
   src/t8_cmesh/t8_cmesh_trees.c src/t8_cmesh/t8_cmesh_commit.c \

diff --git a/src/t8_cmesh/t8_cmesh.c b/src/t8_cmesh/t8_cmesh.c
@@ -22,7 +22,7 @@
 
 #include <sc_statistics.h>
 #include <t8_cmesh.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_geometry.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.h>
 #include <t8_refcount.h>

diff --git a/src/t8_cmesh/t8_cmesh_examples.c b/src/t8_cmesh/t8_cmesh_examples.c
@@ -24,7 +24,7 @@
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_cmesh/t8_cmesh_geometry.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 
 /* TODO: In p4est a tree edge is joined with itself to denote a domain boundary.
  *       Will we do it the same in t8code? This is not yet decided, however the

diff --git a/src/t8_cmesh/t8_cmesh_occ.cxx b/src/t8_cmesh/t8_cmesh_occ.cxx
@@ -28,7 +28,7 @@
 #include <t8_cmesh/t8_cmesh_occ.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_occ.hxx>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 
 #if T8_WITH_OCC
 #include <gp_Pnt.hxx>

diff --git a/src/t8_cmesh/t8_cmesh_readmshfile.cxx b/src/t8_cmesh/t8_cmesh_readmshfile.cxx
@@ -22,7 +22,7 @@
 
 #include <t8_eclass.h>
 #include <t8_cmesh_readmshfile.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_occ.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_occ.h>

diff --git a/src/t8_cmesh/t8_cmesh_triangle.c b/src/t8_cmesh/t8_cmesh_triangle.c
@@ -22,7 +22,7 @@
 
 #include <t8_cmesh_triangle.h>
 #include <t8_cmesh_tetgen.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.h>
 #include "t8_cmesh_types.h"
 #include "t8_cmesh_stash.h"

diff --git a/src/t8_cmesh/t8_cmesh_vtk_reader.cxx b/src/t8_cmesh/t8_cmesh_vtk_reader.cxx
@@ -0,0 +1,47 @@
+/*
+This file is part of t8code.
+t8code is a C library to manage a collection (a forest) of multiple
+connected adaptive space-trees of general element classes in parallel.
+
+Copyright (C) 2015 the developers
+
+t8code is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+t8code is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with t8code; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+/** \file t8_cmesh_vtk_reader.cxx
+* Implementation of a Reader for vtk/vtu files using the vtk-library.
+* The functions can only be used when t8code is linked with the vtk-library.
+*/
+
+#include <t8_cmesh_vtk_reader.hxx>
+
+T8_EXTERN_C_BEGIN ();
+
+t8_cmesh_t
+t8_cmesh_vtk_reader (const char *filename, const int partition,
+                     const int main_proc, sc_MPI_Comm comm,
+                     const vtk_file_type_t vtk_file_type)
+{
+#if T8_WITH_VTK
+  SC_ABORT ("This function is not yet implemented.\n");
+#else
+  /* Return NULL if not linked against vtk */
+  t8_global_errorf
+    ("WARNING: t8code is not linked against the vtk library. Without proper linking t8code cannot use the vtk-reader\n");
+#endif
+  return NULL;
+}
+
+T8_EXTERN_C_END ();
diff --git a/src/t8_cmesh/t8_cmesh_vtk.c → src/t8_cmesh/t8_cmesh_vtk_writer.c b/src/t8_cmesh/t8_cmesh_vtk.c → src/t8_cmesh/t8_cmesh_vtk_writer.c
@@ -20,7 +20,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_vtk.h>
 #include "t8_cmesh_trees.h"
 #include "t8_cmesh_types.h"

diff --git a/src/t8_cmesh_vtk_reader.hxx b/src/t8_cmesh_vtk_reader.hxx
@@ -0,0 +1,67 @@
+/*
+This file is part of t8code.
+t8code is a C library to manage a collection (a forest) of multiple
+connected adaptive space-trees of general element classes in parallel.
+
+Copyright (C) 2015 the developers
+
+t8code is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+t8code is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with t8code; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+/** \file t8_cmesh_vtk_reader.hxx
+* Header for the vtk-reader. 
+*/
+
+#ifndef T8_CMESH_VTK_READER
+#define T8_CMESH_VTK_READER
+
+#include <t8_cmesh.h>
+
+#if T8_WITH_VTK
+#include <vtkSmartPointer.h>
+#include <vtkCellData.h>
+#include <vtkDataSet.h>
+#endif
+
+T8_EXTERN_C_BEGIN ();
+/**
+ * Enumerator for all types of files readable by t8code. 
+ */
+typedef enum vtk_file_type
+{
+  VTK_UNSTRUCTURED_FILE = 0,
+  VTK_POLYDATA_FILE = 1
+} vtk_file_type_t;
+
+/**
+ * Construct a cmesh given a filename refering to a vtk-file either containing an
+ * unstructured grid, or vtk-polydata, most likely constructed by vtk. 
+ * 
+ * \param[in] filename      The name of the file
+ * \param[in] partition     Flag if the constructed mesh should be partitioned
+ * \param[in] main_proc     The main reading processor
+ * \param[in] comm          An mpi-communicator
+ * \param[in] vtk_file_type A vtk-filetype that is readable by t8code. 
+ * \return                  A commited cmesh.       
+ */
+t8_cmesh_t          t8_cmesh_vtk_reader (const char *filename,
+                                         const int partition,
+                                         const int main_proc,
+                                         sc_MPI_Comm comm,
+                                         const vtk_file_type_t vtk_file_type);
+
+T8_EXTERN_C_END ();
+
+#endif /* T8_CMESH_VTK_READER */
diff --git a/src/t8_cmesh_vtk.h → src/t8_cmesh_vtk_writer.h b/src/t8_cmesh_vtk.h → src/t8_cmesh_vtk_writer.h
diff --git a/src/t8_vtk.h b/src/t8_vtk.h
@@ -23,7 +23,7 @@
 /** file t8_vtk.h
  * This header file collects macros that are needed for
  * the forest and cmesh vtk routines.
- * \see t8_forest_vtk.h \see t8_cmesh_vtk.h
+ * \see t8_forest_vtk.h \see t8_cmesh_vtk_writer.h \see t8_cmesh_vtk_reader.hxx
  */
 
 #ifndef T8_VTK_H

diff --git a/test/t8_geometry/t8_gtest_point_inside.cxx b/test/t8_geometry/t8_gtest_point_inside.cxx
@@ -25,7 +25,7 @@
 #include <sc_functions.h>
 #include <t8_eclass.h>
 #include <t8_cmesh.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest.h>
 #include <t8_forest/t8_forest_iterate.h>

diff --git a/tutorials/general/t8_step1_coarsemesh.c b/tutorials/general/t8_step1_coarsemesh.c
@@ -37,7 +37,7 @@
 
 #include <t8.h>
 #include <t8_cmesh.h>
-#include <t8_cmesh_vtk.h>
+#include <t8_cmesh_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 
 /* Builds cmesh of 6 tetrahedra that build up a unit cube.