avoid deprecated names

diff --git a/examples/step-37/step-37.cc b/examples/step-37/step-37.cc
index 71538ac9cfcd5e3bcf04e6f9cd5a278aadbffc2b..af6a496d1103650de170dbbc44299b51056fe597 100644 (file)
--- a/examples/step-37/step-37.cc
+++ b/examples/step-37/step-37.cc
@@ -1103,8 +1103,8 @@ namespace Step37
   // optimized for speed rather than disk usage. The default setting (which
   // optimizes for disk usage) makes saving the output take about 4 times as
   // long as running the linear solver, while setting
-  // DataOutBase::VtkFlags::compression_level to
-  // DataOutBase::VtkFlags::best_speed lowers this to only one fourth the time
+  // DataOutBase::CompressionLevel to
+  // best_speed lowers this to only one fourth the time
   // of the linear solve.
   //
   // We disable the output when the mesh gets too large. A variant of this
@@ -1126,7 +1126,7 @@ namespace Step37
     data_out.build_patches(mapping);
 
     DataOutBase::VtkFlags flags;
-    flags.compression_level = DataOutBase::VtkFlags::best_speed;
+    flags.compression_level = DataOutBase::CompressionLevel::best_speed;
     data_out.set_flags(flags);
     data_out.write_vtu_with_pvtu_record(
       "./", "solution", cycle, MPI_COMM_WORLD, 3);

diff --git a/examples/step-64/step-64.cu b/examples/step-64/step-64.cu
index 0c734c000027ec8bba552638e8978b2a80e1ce26..f8d56f1d68d9844a076622daecca546515cef14c 100644 (file)
--- a/examples/step-64/step-64.cu
+++ b/examples/step-64/step-64.cu
@@ -548,7 +548,7 @@ namespace Step64
     data_out.build_patches();
 
     DataOutBase::VtkFlags flags;
-    flags.compression_level = DataOutBase::VtkFlags::best_speed;
+    flags.compression_level = DataOutBase::CompressionLevel::best_speed;
     data_out.set_flags(flags);
     data_out.write_vtu_with_pvtu_record(
       "./", "solution", cycle, mpi_communicator, 2);

diff --git a/examples/step-66/step-66.cc b/examples/step-66/step-66.cc
index dff2f9374bb40432700063e46136138da4baac60..8815f97bf62ff208dcae8421cce788c9e67e2d23 100644 (file)
--- a/examples/step-66/step-66.cc
+++ b/examples/step-66/step-66.cc
@@ -1036,7 +1036,7 @@ namespace Step66
                            DataOut<dim>::curved_inner_cells);
 
     DataOutBase::VtkFlags flags;
-    flags.compression_level = DataOutBase::VtkFlags::best_speed;
+    flags.compression_level = DataOutBase::CompressionLevel::best_speed;
     data_out.set_flags(flags);
     data_out.write_vtu_with_pvtu_record(
       "./", "solution_" + std::to_string(dim) + "d", cycle, MPI_COMM_WORLD, 3);

diff --git a/examples/step-69/step-69.cc b/examples/step-69/step-69.cc
index 70d96ca1368e8e27dfefa5e14c42be68673f112e..9f745281a76ee851c35f56b106c67d9aef477ae8 100644 (file)
--- a/examples/step-69/step-69.cc
+++ b/examples/step-69/step-69.cc
@@ -2773,7 +2773,7 @@ namespace Step69
       DataOutBase::VtkFlags flags(t,
                                   cycle,
                                   true,
-                                  DataOutBase::VtkFlags::best_speed);
+                                  DataOutBase::CompressionLevel::best_speed);
       data_out->set_flags(flags);
 
       data_out->write_vtu_with_pvtu_record(

diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
index 5cbe8695660574e5715432acf2f70829fef5a3f0..a1c23ca2b244959dc909d151c8dd14fa59a7853e 100644 (file)
--- a/source/base/data_out_base.cc
+++ b/source/base/data_out_base.cc
@@ -90,8 +90,8 @@ namespace
 {
 #ifdef DEAL_II_WITH_ZLIB
   /**
-   * Convert between the enum specified inside VtkFlags and the preprocessor
-   * constant defined by zlib.
+   * Convert between the CompressionLevel enum (used inside VtkFlags
+   * for example) and the preprocessor constant defined by zlib.
    */
   int
   get_zlib_compression_level(const DataOutBase::CompressionLevel level)
@@ -114,7 +114,7 @@ namespace
 
 #  ifdef DEAL_II_WITH_MPI
   /**
-   * Convert between the enum specified inside VtkFlags and the preprocessor
+   * Convert between the CompressionLevel enum and the preprocessor
    * constant defined by boost::iostreams::zlib.
    */
   int

diff --git a/tests/data_out/data_out_base_vtu_compression_levels.cc b/tests/data_out/data_out_base_vtu_compression_levels.cc
index 2efa465d2409e3302219bd77ee7391ae9e7dd224..94dc6dcaebca956671031082ac05913fa8c850cc 100644 (file)
--- a/tests/data_out/data_out_base_vtu_compression_levels.cc
+++ b/tests/data_out/data_out_base_vtu_compression_levels.cc
@@ -62,23 +62,25 @@ check_all(std::ostream &log)
       switch (i)
         {
           case (0):
-            flags.compression_level = DataOutBase::VtkFlags::no_compression;
+            flags.compression_level =
+              DataOutBase::CompressionLevel::no_compression;
             break;
           case (1):
-            flags.compression_level = DataOutBase::VtkFlags::best_speed;
+            flags.compression_level = DataOutBase::CompressionLevel::best_speed;
             break;
           case (2):
-            flags.compression_level = DataOutBase::VtkFlags::best_compression;
+            flags.compression_level =
+              DataOutBase::CompressionLevel::best_compression;
             break;
           case (3):
             flags.compression_level =
-              DataOutBase::VtkFlags::default_compression;
+              DataOutBase::CompressionLevel::default_compression;
             break;
           default:
             Assert(false, ExcInternalError());
         }
       log << "==============================\n"
-          << dim << spacedim << '-' << flags.compression_level << ".vtu"
+          << dim << spacedim << '-' << i << ".vtu"
           << "\n==============================\n";
       check<dim, spacedim>(flags, log);
     }

diff --git a/tests/data_out/data_out_intermediate_parallel_01.cc b/tests/data_out/data_out_intermediate_parallel_01.cc
index da66e311bb48137bb59f2cd71d7fbe5c037d4c55..b83c0d866cda75c4082ec0cae360be0f09e9c2bd 100644 (file)
--- a/tests/data_out/data_out_intermediate_parallel_01.cc
+++ b/tests/data_out/data_out_intermediate_parallel_01.cc
@@ -64,7 +64,7 @@ check()
   data_out.build_patches();
 
   data_out.write_deal_II_intermediate_in_parallel(
-    "test.pd2", MPI_COMM_WORLD, DataOutBase::VtkFlags::no_compression);
+    "test.pd2", MPI_COMM_WORLD, DataOutBase::CompressionLevel::no_compression);
 
   const unsigned int my_rank =
     dealii::Utilities::MPI::this_mpi_process(MPI_COMM_WORLD);

diff --git a/tests/data_out/data_out_intermediate_parallel_02.cc b/tests/data_out/data_out_intermediate_parallel_02.cc
index 1b67a6ca1ce7c95174e0ca293024dcf6829ca68d..018fa694c3a0c186e597cfcfb2e31c132c96fd1a 100644 (file)
--- a/tests/data_out/data_out_intermediate_parallel_02.cc
+++ b/tests/data_out/data_out_intermediate_parallel_02.cc
@@ -64,7 +64,9 @@ check()
   data_out.build_patches();
 
   data_out.write_deal_II_intermediate_in_parallel(
-    "test.pd2", MPI_COMM_WORLD, DataOutBase::VtkFlags::best_compression);
+    "test.pd2",
+    MPI_COMM_WORLD,
+    DataOutBase::CompressionLevel::best_compression);
 
   const unsigned int my_rank =
     dealii::Utilities::MPI::this_mpi_process(MPI_COMM_WORLD);

diff --git a/tests/grid/grid_in_abaqus_02.cc b/tests/grid/grid_in_abaqus_02.cc
index e3acd8ca6798e5191a6b1a11620557ae96c4e66b..be38fb9cba9c67c34b29598b89c277d6366a68bd 100644 (file)
--- a/tests/grid/grid_in_abaqus_02.cc
+++ b/tests/grid/grid_in_abaqus_02.cc
@@ -60,7 +60,8 @@ abaqus_grid(const std::string path_and_name,
       // that the last coordinate of all nodes is non-zero.
       std::ofstream     fout_vtk(gridout_name + ".vtk");
       GridOutFlags::Vtk flags_vtk;
-      flags_vtk.compression_level = DataOutBase::VtkFlags::no_compression;
+      flags_vtk.compression_level =
+        DataOutBase::CompressionLevel::no_compression;
       GridOut gridout;
       gridout.set_flags(flags_vtk);
       gridout.write_vtk(tria, fout_vtk);