Merge pull request #928 from DLR-AMR/feature-remove_binary_vtk_option

Remove binary vtk option
DLR-AMR · Feb 8, 2024 · 36ec0ef · 36ec0ef
2 parents 3dbe4d0 + be8bed2
commit 36ec0ef
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 35 deletions.
diff --git a/src/t8_cmesh/t8_cmesh_vtk_writer.c b/src/t8_cmesh/t8_cmesh_vtk_writer.c
@@ -103,9 +103,6 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
     }
     fprintf (vtufile, "<?xml version=\"1.0\"?>\n");
     fprintf (vtufile, "<VTKFile type=\"UnstructuredGrid\" version=\"0.1\"");
-#if defined T8_VTK_BINARY && defined T8_VTK_COMPRESSION
-    fprintf (vtufile, " compressor=\"vtkZLibDataCompressor\"");
-#endif
 #ifdef SC_IS_BIGENDIAN
     fprintf (vtufile, " byte_order=\"BigEndian\">\n");
 #else
@@ -122,7 +119,6 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
              " NumberOfComponents=\"3\" format=\"%s\">\n",
              T8_VTK_FLOAT_NAME, T8_VTK_FORMAT_STRING);
 
-#ifdef T8_VTK_ASCII
     for (tree = t8_cmesh_get_first_tree (cmesh); tree != NULL; tree = t8_cmesh_get_next_tree (cmesh, tree)) {
       /*  TODO: Use new geometry here. Need cmesh_get_reference coords function. */
       vertices = t8_cmesh_get_tree_vertices (cmesh, tree->treeid);
@@ -163,9 +159,6 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
         }
       } /* end ghost loop */
     }
-#else
-    SC_ABORT ("Binary vtk file not implemented\n");
-#endif /* T8_VTK_ASCII */
     fprintf (vtufile, "        </DataArray>\n");
     fprintf (vtufile, "      </Points>\n");
     fprintf (vtufile, "      <Cells>\n");
@@ -175,7 +168,6 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
              "        <DataArray type=\"%s\" Name=\"connectivity\""
              " format=\"%s\">\n",
              T8_VTK_LOCIDX, T8_VTK_FORMAT_STRING);
-#ifdef T8_VTK_ASCII
     for (tree = t8_cmesh_get_first_tree (cmesh), count_vertices = 0; tree != NULL;
          tree = t8_cmesh_get_next_tree (cmesh, tree)) {
       fprintf (vtufile, "         ");
@@ -195,17 +187,13 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
         fprintf (vtufile, "\n");
       }
     }
-#else
-    SC_ABORT ("Binary vtk file not implemented\n");
-#endif /* T8_VTK_ASCII */
     fprintf (vtufile, "        </DataArray>\n");
 
     /* write offset data */
     fprintf (vtufile,
              "        <DataArray type=\"%s\" Name=\"offsets\""
              " format=\"%s\">\n",
              T8_VTK_LOCIDX, T8_VTK_FORMAT_STRING);
-#ifdef T8_VTK_ASCII
     fprintf (vtufile, "         ");
     for (tree = t8_cmesh_get_first_tree (cmesh), sk = 1, offset = 0; tree != NULL;
          tree = t8_cmesh_get_next_tree (cmesh, tree), ++sk) {
@@ -225,16 +213,12 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
       }
     }
     fprintf (vtufile, "\n");
-#else
-    SC_ABORT ("Binary vtk file not implemented\n");
-#endif /* T8_VTK_ASCII */
     fprintf (vtufile, "        </DataArray>\n");
     /* write type data */
     fprintf (vtufile,
              "        <DataArray type=\"UInt8\" Name=\"types\""
              " format=\"%s\">\n",
              T8_VTK_FORMAT_STRING);
-#ifdef T8_VTK_ASCII
     fprintf (vtufile, "         ");
     for (tree = t8_cmesh_get_first_tree (cmesh), sk = 1; tree != NULL;
          tree = t8_cmesh_get_next_tree (cmesh, tree), ++sk) {
@@ -252,9 +236,6 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
       }
     }
     fprintf (vtufile, "\n");
-#else
-    SC_ABORT ("Binary vtk file not implemented\n");
-#endif /* T8_VTK_ASCII */
     fprintf (vtufile, "        </DataArray>\n");
     fprintf (vtufile, "      </Cells>\n");
     /* write treeif data */
@@ -263,7 +244,6 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
              "        <DataArray type=\"%s\" Name=\"treeid\""
              " format=\"%s\">\n",
              T8_VTK_GLOIDX, T8_VTK_FORMAT_STRING);
-#ifdef T8_VTK_ASCII
     fprintf (vtufile, "         ");
     for (tree = t8_cmesh_get_first_tree (cmesh), sk = 1, offset = 0; tree != NULL;
          tree = t8_cmesh_get_next_tree (cmesh, tree), ++sk) {
@@ -292,16 +272,12 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
       }
     }
     fprintf (vtufile, "\n");
-#else
-    SC_ABORT ("Binary vtk file not implemented\n");
-#endif /* T8_VTK_ASCII */
     fprintf (vtufile, "        </DataArray>\n");
     /* write mpirank data */
     fprintf (vtufile,
              "        <DataArray type=\"%s\" Name=\"mpirank\""
              " format=\"%s\">\n",
              "Int32", T8_VTK_FORMAT_STRING);
-#ifdef T8_VTK_ASCII
     fprintf (vtufile, "         ");
     for (tree = t8_cmesh_get_first_tree (cmesh), sk = 1, offset = 0; tree != NULL;
          tree = t8_cmesh_get_next_tree (cmesh, tree), ++sk) {
@@ -318,9 +294,6 @@ t8_cmesh_vtk_write_file_ext (t8_cmesh_t cmesh, const char *fileprefix, double sc
       }
     }
     fprintf (vtufile, "\n");
-#else
-    SC_ABORT ("Binary vtk file not implemented\n");
-#endif /* T8_VTK_ASCII */
     fprintf (vtufile, "        </DataArray>\n");
     fprintf (vtufile, "      </CellData>\n");
     /* write type data */

diff --git a/src/t8_forest/t8_forest_vtk.cxx b/src/t8_forest/t8_forest_vtk.cxx
@@ -1275,9 +1275,6 @@ t8_forest_vtk_write_file (t8_forest_t forest, const char *fileprefix, const int
   }
   T8_ASSERT (forest->ghosts != NULL || !write_ghosts);
 
-  /* Currently we only support output in ascii format, not binary */
-  T8_ASSERT (T8_VTK_ASCII == 1);
-
   /* process 0 creates the .pvtu file */
   if (forest->mpirank == 0) {
     if (t8_write_pvtu (fileprefix, forest->mpisize, write_treeid, write_mpirank, write_level, write_element_id,

diff --git a/src/t8_vtk.h b/src/t8_vtk.h
@@ -47,12 +47,7 @@
 #define T8_VTK_FLOAT_TYPE double
 #endif
 
-#ifndef T8_VTK_BINARY
-#define T8_VTK_ASCII 1
 #define T8_VTK_FORMAT_STRING "ascii"
-#else
-#define T8_VTK_FORMAT_STRING "binary"
-#endif
 
 #if T8_WITH_VTK
 #define t8_vtk_locidx_array_type_t vtkTypeInt32Array