]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove MPI_COMM_WORLD as default arguemtn in write_vtu_with_pvtu_record 9514/head
authorPeter Munch <peterrmuench@gmail.com>
Tue, 11 Feb 2020 17:59:51 +0000 (18:59 +0100)
committerPeter Munch <peterrmuench@gmail.com>
Tue, 11 Feb 2020 18:54:37 +0000 (19:54 +0100)
12 files changed:
examples/step-18/step-18.cc
examples/step-32/step-32.cc
examples/step-37/step-37.cc
examples/step-40/step-40.cc
examples/step-42/step-42.cc
examples/step-45/step-45.cc
examples/step-48/step-48.cc
examples/step-50/step-50.cc
examples/step-55/step-55.cc
examples/step-64/step-64.cu
include/deal.II/base/data_out_base.h
source/base/data_out_base.cc

index 13016de6557988ce59046e6a091e50fc01bb0a5a..f78ad03017c7c43fb9d249bc269910769e1ee5fa 100644 (file)
@@ -1279,7 +1279,7 @@ namespace Step18
     // this single time step:
     const std::string pvtu_master_filename =
       data_out.write_vtu_with_pvtu_record(
-        "./", "solution", timestep_no, 4, mpi_communicator);
+        "./", "solution", timestep_no, mpi_communicator, 4);
 
     // The record files must be written only once and not by each processor,
     // so we do this on processor 0:
index fe04f1040f7f72ab4fb30ae58e37a5cf70ca6f31..9da66f29890147078fedc645a8a162a3aaa85644 100644 (file)
@@ -3243,7 +3243,7 @@ namespace Step32
 
     static int out_index = 0;
     data_out.write_vtu_with_pvtu_record(
-      "./", "solution", out_index, 5, MPI_COMM_WORLD);
+      "./", "solution", out_index, MPI_COMM_WORLD, 5);
 
     out_index++;
   }
index a5b818031a4053831ad0fd7e53efe36fe5b55ec8..f1a910d2057deedf4698bc9a8c74e36b82520980 100644 (file)
@@ -1132,7 +1132,7 @@ namespace Step37
     flags.compression_level = DataOutBase::VtkFlags::best_speed;
     data_out.set_flags(flags);
     data_out.write_vtu_with_pvtu_record(
-      "./", "solution", cycle, 3, MPI_COMM_WORLD);
+      "./", "solution", cycle, MPI_COMM_WORLD, 3);
 
     time_details << "Time write output          (CPU/wall) " << time.cpu_time()
                  << "s/" << time.wall_time() << "s\n";
index 6ff3380667b7f41828326b60b63e3dff0bdb53b6..d650a8b101fbf3bd9d8f1880d78bec90e4b74977 100644 (file)
@@ -576,7 +576,7 @@ namespace Step40
     // in parallel with the help of MPI-IO. Additionally a PVTU record is
     // generated, which groups the written VTU files.
     data_out.write_vtu_with_pvtu_record(
-      "./", "solution", cycle, 2, mpi_communicator, 8);
+      "./", "solution", cycle, mpi_communicator, 2, 8);
   }
 
 
index 044b125f13647175fd1a412bc6f4e69276c09387..7a67669a3a35e6f62fb0e283dc953716fc2ec4c7 100644 (file)
@@ -2036,7 +2036,7 @@ namespace Step42
     // Paraview, the Visit visualization program, by creating a matching
     // <code>.visit</code> file.
     const std::string master_name = data_out.write_vtu_with_pvtu_record(
-      output_dir, "solution", current_refinement_cycle, 2, mpi_communicator);
+      output_dir, "solution", current_refinement_cycle, mpi_communicator, 2);
     pcout << master_name << std::endl;
 
     TrilinosWrappers::MPI::Vector tmp(solution);
index 31374787141189780a2b65d60180a374f8f22dea..856949396ff3507a03349d3ab703c88658b02e33 100644 (file)
@@ -737,7 +737,7 @@ namespace Step45
     data_out.build_patches(mapping, degree + 1);
 
     data_out.write_vtu_with_pvtu_record(
-      "./", "solution", refinement_cycle, 2, MPI_COMM_WORLD);
+      "./", "solution", refinement_cycle, MPI_COMM_WORLD, 2);
   }
 
 
index 3d2f043a75e971ba3e039638129ae0830b9d5b22..155d345f01f7c65cf298ab92f5fcf3a34432f163 100644 (file)
@@ -501,7 +501,7 @@ namespace Step48
     data_out.build_patches();
 
     data_out.write_vtu_with_pvtu_record(
-      "./", "solution", timestep_number, 3, MPI_COMM_WORLD);
+      "./", "solution", timestep_number, MPI_COMM_WORLD, 3);
   }
 
 
index 304fce5e5d5f7de49211d8b074b9bc64289f2bea..4f379b177748e7d49f68804c3ed277ed3f24a8ba 100644 (file)
@@ -851,7 +851,7 @@ namespace Step50
     data_out.build_patches(0);
 
     const auto filename = data_out.write_vtu_with_pvtu_record(
-      "", "solution", cycle, 5, mpi_communicator, 8);
+      "", "solution", cycle, mpi_communicator, 5, 8);
     pcout << "    wrote " << filename << std::endl;
   }
 
index 4d6362626d950ba121c396fd38aa9a6123061a7e..7ac4be8833356fcc81cada623bf8cf21113e7f8c 100644 (file)
@@ -749,7 +749,7 @@ namespace Step55
     data_out.build_patches();
 
     data_out.write_vtu_with_pvtu_record(
-      "./", "solution", cycle, 2, mpi_communicator);
+      "./", "solution", cycle, mpi_communicator, 2);
   }
 
 
index 28f1cf2dc76a4ea7b357f069efd200fb5e758a34..862835d8a65c6344dc5fde2e4cbb3163537cf9c0 100644 (file)
@@ -548,7 +548,7 @@ namespace Step64
     flags.compression_level = DataOutBase::VtkFlags::best_speed;
     data_out.set_flags(flags);
     data_out.write_vtu_with_pvtu_record(
-      "./", "solution", cycle, 2, mpi_communicator);
+      "./", "solution", cycle, mpi_communicator, 2);
 
     Vector<float> cellwise_norm(triangulation.n_active_cells());
     VectorTools::integrate_difference(dof_handler,
index 238a54ab20650c539a166d7b9d00508c47d9ac11..a00822a6f2ba92090a65c4489bf1575edcff33e4 100644 (file)
@@ -2756,7 +2756,7 @@ public:
    * DataOutInterface::write_pvtu_record().
    *
    * For example, running
-   * <code> write_vtu_with_pvtu_record("output/", "solution", 3, 4, comm, 2)
+   * <code> write_vtu_with_pvtu_record("output/", "solution", 3, comm, 4, 2)
    * </code> on 10 processes generates the files
    * @code
    * output/solution_0003.0.vtu
@@ -2782,7 +2782,7 @@ public:
    * In a
    * parallel setting, several files are typically written per time step. The
    * number of files written in parallel depends on the number of MPI processes
-   * (see parameter @p mpi_communicator with default value MPI_COMM_WORLD), and a
+   * (see parameter @p mpi_communicator), and a
    * specified number of @p n_groups with default value 0. The background is that
    * VTU file output supports grouping files from several CPUs into a given
    * number of files using MPI I/O when writing on a parallel filesystem. The
@@ -2812,8 +2812,8 @@ public:
     const std::string &directory,
     const std::string &filename_without_extension,
     const unsigned int counter,
+    const MPI_Comm &   mpi_communicator,
     const unsigned int n_digits_for_counter = numbers::invalid_unsigned_int,
-    const MPI_Comm &   mpi_communicator     = MPI_COMM_WORLD,
     const unsigned int n_groups             = 0) const;
 
   /**
index c96dd5c902890d76b3fbac5ebdb658ff26f10936..a210f67e745b27ee4593eaae740fd336c6425bb4 100644 (file)
@@ -7149,8 +7149,8 @@ DataOutInterface<dim, spacedim>::write_vtu_with_pvtu_record(
   const std::string &directory,
   const std::string &filename_without_extension,
   const unsigned int counter,
-  const unsigned int n_digits_for_counter,
   const MPI_Comm &   mpi_communicator,
+  const unsigned int n_digits_for_counter,
   const unsigned int n_groups) const
 {
   const unsigned int rank = Utilities::MPI::this_mpi_process(mpi_communicator);

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.