update large IO test output

diff --git a/tests/distributed_grids/checkpointing_02.cc b/tests/distributed_grids/checkpointing_02.cc
index 56646b0c461e9515a027d49f6e991da281ec40ff..40bd84cc150b21b5df74a028ecd2b46b52ed3aa2 100644 (file)
--- a/tests/distributed_grids/checkpointing_02.cc
+++ b/tests/distributed_grids/checkpointing_02.cc
@@ -22,7 +22,7 @@
 // Run with 2 MPI ranks to test a single process above 2GB. Both cases were
 // broken before this test was made. Warning, you probably need in the
 // order of 32GB of RAM to run this.
-const bool big = false;
+const bool run_big = false;
 
 #include <deal.II/base/conditional_ostream.h>
 #include <deal.II/base/function.h>
@@ -161,7 +161,7 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
 
       setup_system();
 
-      const unsigned int n_vectors = (big) ? 70 : 2;
+      const unsigned int n_vectors = (run_big) ? 70 : 2;
       {
         deallog << "checkpointing..." << std::endl;
         std::vector<VectorType> vectors(n_vectors);
@@ -240,7 +240,7 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
 int
 main(int argc, char *argv[])
 {
-  unsigned int n_cycles_global   = (big) ? 3 : 1;
+  unsigned int n_cycles_global   = (run_big) ? 3 : 1;
   unsigned int n_cycles_adaptive = 1;
 
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);

diff --git a/tests/distributed_grids/checkpointing_02.with_trilinos=true.mpirun=2.output.big b/tests/distributed_grids/checkpointing_02.with_trilinos=true.mpirun=2.output.big
new file mode 100644 (file)
index 0000000..bfd6bec
--- /dev/null
+++ b/tests/distributed_grids/checkpointing_02.with_trilinos=true.mpirun=2.output.big
@@ -0,0 +1,155 @@
+
+DEAL:0::Cycle 1 / 1:
+DEAL:0::n_global_active_cells: 512000 n_global_levels: 4 ghost_owners.size: 1 level_ghost_owners.size: 1
+DEAL:0::checkpointing...
+DEAL:0::resume...
+DEAL:0::vec 0: 0.00000
+DEAL:0::vec 1: 1.00000
+DEAL:0::vec 2: 2.00000
+DEAL:0::vec 3: 3.00000
+DEAL:0::vec 4: 4.00000
+DEAL:0::vec 5: 5.00000
+DEAL:0::vec 6: 6.00000
+DEAL:0::vec 7: 7.00000
+DEAL:0::vec 8: 8.00000
+DEAL:0::vec 9: 9.00000
+DEAL:0::vec 10: 10.0000
+DEAL:0::vec 11: 11.0000
+DEAL:0::vec 12: 12.0000
+DEAL:0::vec 13: 13.0000
+DEAL:0::vec 14: 14.0000
+DEAL:0::vec 15: 15.0000
+DEAL:0::vec 16: 16.0000
+DEAL:0::vec 17: 17.0000
+DEAL:0::vec 18: 18.0000
+DEAL:0::vec 19: 19.0000
+DEAL:0::vec 20: 20.0000
+DEAL:0::vec 21: 21.0000
+DEAL:0::vec 22: 22.0000
+DEAL:0::vec 23: 23.0000
+DEAL:0::vec 24: 24.0000
+DEAL:0::vec 25: 25.0000
+DEAL:0::vec 26: 26.0000
+DEAL:0::vec 27: 27.0000
+DEAL:0::vec 28: 28.0000
+DEAL:0::vec 29: 29.0000
+DEAL:0::vec 30: 30.0000
+DEAL:0::vec 31: 31.0000
+DEAL:0::vec 32: 32.0000
+DEAL:0::vec 33: 33.0000
+DEAL:0::vec 34: 34.0000
+DEAL:0::vec 35: 35.0000
+DEAL:0::vec 36: 36.0000
+DEAL:0::vec 37: 37.0000
+DEAL:0::vec 38: 38.0000
+DEAL:0::vec 39: 39.0000
+DEAL:0::vec 40: 40.0000
+DEAL:0::vec 41: 41.0000
+DEAL:0::vec 42: 42.0000
+DEAL:0::vec 43: 43.0000
+DEAL:0::vec 44: 44.0000
+DEAL:0::vec 45: 45.0000
+DEAL:0::vec 46: 46.0000
+DEAL:0::vec 47: 47.0000
+DEAL:0::vec 48: 48.0000
+DEAL:0::vec 49: 49.0000
+DEAL:0::vec 50: 50.0000
+DEAL:0::vec 51: 51.0000
+DEAL:0::vec 52: 52.0000
+DEAL:0::vec 53: 53.0000
+DEAL:0::vec 54: 54.0000
+DEAL:0::vec 55: 55.0000
+DEAL:0::vec 56: 56.0000
+DEAL:0::vec 57: 57.0000
+DEAL:0::vec 58: 58.0000
+DEAL:0::vec 59: 59.0000
+DEAL:0::vec 60: 60.0000
+DEAL:0::vec 61: 61.0000
+DEAL:0::vec 62: 62.0000
+DEAL:0::vec 63: 63.0000
+DEAL:0::vec 64: 64.0000
+DEAL:0::vec 65: 65.0000
+DEAL:0::vec 66: 66.0000
+DEAL:0::vec 67: 67.0000
+DEAL:0::vec 68: 68.0000
+DEAL:0::vec 69: 69.0000
+DEAL:0::vec y: 70.0000
+DEAL:0::
+
+DEAL:1::Cycle 1 / 1:
+DEAL:1::n_global_active_cells: 512000 n_global_levels: 4 ghost_owners.size: 1 level_ghost_owners.size: 1
+DEAL:1::checkpointing...
+DEAL:1::resume...
+DEAL:1::vec 0: 0.00000
+DEAL:1::vec 1: 1.00000
+DEAL:1::vec 2: 2.00000
+DEAL:1::vec 3: 3.00000
+DEAL:1::vec 4: 4.00000
+DEAL:1::vec 5: 5.00000
+DEAL:1::vec 6: 6.00000
+DEAL:1::vec 7: 7.00000
+DEAL:1::vec 8: 8.00000
+DEAL:1::vec 9: 9.00000
+DEAL:1::vec 10: 10.0000
+DEAL:1::vec 11: 11.0000
+DEAL:1::vec 12: 12.0000
+DEAL:1::vec 13: 13.0000
+DEAL:1::vec 14: 14.0000
+DEAL:1::vec 15: 15.0000
+DEAL:1::vec 16: 16.0000
+DEAL:1::vec 17: 17.0000
+DEAL:1::vec 18: 18.0000
+DEAL:1::vec 19: 19.0000
+DEAL:1::vec 20: 20.0000
+DEAL:1::vec 21: 21.0000
+DEAL:1::vec 22: 22.0000
+DEAL:1::vec 23: 23.0000
+DEAL:1::vec 24: 24.0000
+DEAL:1::vec 25: 25.0000
+DEAL:1::vec 26: 26.0000
+DEAL:1::vec 27: 27.0000
+DEAL:1::vec 28: 28.0000
+DEAL:1::vec 29: 29.0000
+DEAL:1::vec 30: 30.0000
+DEAL:1::vec 31: 31.0000
+DEAL:1::vec 32: 32.0000
+DEAL:1::vec 33: 33.0000
+DEAL:1::vec 34: 34.0000
+DEAL:1::vec 35: 35.0000
+DEAL:1::vec 36: 36.0000
+DEAL:1::vec 37: 37.0000
+DEAL:1::vec 38: 38.0000
+DEAL:1::vec 39: 39.0000
+DEAL:1::vec 40: 40.0000
+DEAL:1::vec 41: 41.0000
+DEAL:1::vec 42: 42.0000
+DEAL:1::vec 43: 43.0000
+DEAL:1::vec 44: 44.0000
+DEAL:1::vec 45: 45.0000
+DEAL:1::vec 46: 46.0000
+DEAL:1::vec 47: 47.0000
+DEAL:1::vec 48: 48.0000
+DEAL:1::vec 49: 49.0000
+DEAL:1::vec 50: 50.0000
+DEAL:1::vec 51: 51.0000
+DEAL:1::vec 52: 52.0000
+DEAL:1::vec 53: 53.0000
+DEAL:1::vec 54: 54.0000
+DEAL:1::vec 55: 55.0000
+DEAL:1::vec 56: 56.0000
+DEAL:1::vec 57: 57.0000
+DEAL:1::vec 58: 58.0000
+DEAL:1::vec 59: 59.0000
+DEAL:1::vec 60: 60.0000
+DEAL:1::vec 61: 61.0000
+DEAL:1::vec 62: 62.0000
+DEAL:1::vec 63: 63.0000
+DEAL:1::vec 64: 64.0000
+DEAL:1::vec 65: 65.0000
+DEAL:1::vec 66: 66.0000
+DEAL:1::vec 67: 67.0000
+DEAL:1::vec 68: 68.0000
+DEAL:1::vec 69: 69.0000
+DEAL:1::vec y: 70.0000
+DEAL:1::
+

diff --git a/tests/distributed_grids/checkpointing_03.cc b/tests/distributed_grids/checkpointing_03.cc
index a6cbc9df530692e45984fca660620709d0d27534..29cea2a7d133aeb63425e3ec567912b1f12462aa 100644 (file)
--- a/tests/distributed_grids/checkpointing_03.cc
+++ b/tests/distributed_grids/checkpointing_03.cc
@@ -19,7 +19,7 @@
 // the hp (variable transfer) version of checkpointing_02.cc
 
 // set to true to run a test that generates a 5GB file:
-const bool big = false;
+const bool run_big = false;
 
 #include <deal.II/base/conditional_ostream.h>
 #include <deal.II/base/function.h>
@@ -160,7 +160,7 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
 
       setup_system();
 
-      const unsigned int n_vectors = (big) ? 50 : 2;
+      const unsigned int n_vectors = (run_big) ? 50 : 2;
       {
         deallog << "checkpointing..." << std::endl;
         std::vector<VectorType> vectors(n_vectors);
@@ -243,7 +243,7 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
 int
 main(int argc, char *argv[])
 {
-  unsigned int n_cycles_global   = (big) ? 3 : 1;
+  unsigned int n_cycles_global   = (run_big) ? 3 : 1;
   unsigned int n_cycles_adaptive = 1;
 
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);

diff --git a/tests/distributed_grids/checkpointing_03.with_trilinos=true.mpirun=2.output.big b/tests/distributed_grids/checkpointing_03.with_trilinos=true.mpirun=2.output.big
new file mode 100644 (file)
index 0000000..13f7011
--- /dev/null
+++ b/tests/distributed_grids/checkpointing_03.with_trilinos=true.mpirun=2.output.big
@@ -0,0 +1,115 @@
+
+DEAL:0::Cycle 1 / 1:
+DEAL:0::n_global_active_cells: 512000 n_global_levels: 4 ghost_owners.size: 1 level_ghost_owners.size: 1
+DEAL:0::checkpointing...
+DEAL:0::resume...
+DEAL:0::vec 0: 0.00000
+DEAL:0::vec 1: 1.00000
+DEAL:0::vec 2: 2.00000
+DEAL:0::vec 3: 3.00000
+DEAL:0::vec 4: 4.00000
+DEAL:0::vec 5: 5.00000
+DEAL:0::vec 6: 6.00000
+DEAL:0::vec 7: 7.00000
+DEAL:0::vec 8: 8.00000
+DEAL:0::vec 9: 9.00000
+DEAL:0::vec 10: 10.0000
+DEAL:0::vec 11: 11.0000
+DEAL:0::vec 12: 12.0000
+DEAL:0::vec 13: 13.0000
+DEAL:0::vec 14: 14.0000
+DEAL:0::vec 15: 15.0000
+DEAL:0::vec 16: 16.0000
+DEAL:0::vec 17: 17.0000
+DEAL:0::vec 18: 18.0000
+DEAL:0::vec 19: 19.0000
+DEAL:0::vec 20: 20.0000
+DEAL:0::vec 21: 21.0000
+DEAL:0::vec 22: 22.0000
+DEAL:0::vec 23: 23.0000
+DEAL:0::vec 24: 24.0000
+DEAL:0::vec 25: 25.0000
+DEAL:0::vec 26: 26.0000
+DEAL:0::vec 27: 27.0000
+DEAL:0::vec 28: 28.0000
+DEAL:0::vec 29: 29.0000
+DEAL:0::vec 30: 30.0000
+DEAL:0::vec 31: 31.0000
+DEAL:0::vec 32: 32.0000
+DEAL:0::vec 33: 33.0000
+DEAL:0::vec 34: 34.0000
+DEAL:0::vec 35: 35.0000
+DEAL:0::vec 36: 36.0000
+DEAL:0::vec 37: 37.0000
+DEAL:0::vec 38: 38.0000
+DEAL:0::vec 39: 39.0000
+DEAL:0::vec 40: 40.0000
+DEAL:0::vec 41: 41.0000
+DEAL:0::vec 42: 42.0000
+DEAL:0::vec 43: 43.0000
+DEAL:0::vec 44: 44.0000
+DEAL:0::vec 45: 45.0000
+DEAL:0::vec 46: 46.0000
+DEAL:0::vec 47: 47.0000
+DEAL:0::vec 48: 48.0000
+DEAL:0::vec 49: 49.0000
+DEAL:0::vec y: 50.0000
+DEAL:0::
+
+DEAL:1::Cycle 1 / 1:
+DEAL:1::n_global_active_cells: 512000 n_global_levels: 4 ghost_owners.size: 1 level_ghost_owners.size: 1
+DEAL:1::checkpointing...
+DEAL:1::resume...
+DEAL:1::vec 0: 0.00000
+DEAL:1::vec 1: 1.00000
+DEAL:1::vec 2: 2.00000
+DEAL:1::vec 3: 3.00000
+DEAL:1::vec 4: 4.00000
+DEAL:1::vec 5: 5.00000
+DEAL:1::vec 6: 6.00000
+DEAL:1::vec 7: 7.00000
+DEAL:1::vec 8: 8.00000
+DEAL:1::vec 9: 9.00000
+DEAL:1::vec 10: 10.0000
+DEAL:1::vec 11: 11.0000
+DEAL:1::vec 12: 12.0000
+DEAL:1::vec 13: 13.0000
+DEAL:1::vec 14: 14.0000
+DEAL:1::vec 15: 15.0000
+DEAL:1::vec 16: 16.0000
+DEAL:1::vec 17: 17.0000
+DEAL:1::vec 18: 18.0000
+DEAL:1::vec 19: 19.0000
+DEAL:1::vec 20: 20.0000
+DEAL:1::vec 21: 21.0000
+DEAL:1::vec 22: 22.0000
+DEAL:1::vec 23: 23.0000
+DEAL:1::vec 24: 24.0000
+DEAL:1::vec 25: 25.0000
+DEAL:1::vec 26: 26.0000
+DEAL:1::vec 27: 27.0000
+DEAL:1::vec 28: 28.0000
+DEAL:1::vec 29: 29.0000
+DEAL:1::vec 30: 30.0000
+DEAL:1::vec 31: 31.0000
+DEAL:1::vec 32: 32.0000
+DEAL:1::vec 33: 33.0000
+DEAL:1::vec 34: 34.0000
+DEAL:1::vec 35: 35.0000
+DEAL:1::vec 36: 36.0000
+DEAL:1::vec 37: 37.0000
+DEAL:1::vec 38: 38.0000
+DEAL:1::vec 39: 39.0000
+DEAL:1::vec 40: 40.0000
+DEAL:1::vec 41: 41.0000
+DEAL:1::vec 42: 42.0000
+DEAL:1::vec 43: 43.0000
+DEAL:1::vec 44: 44.0000
+DEAL:1::vec 45: 45.0000
+DEAL:1::vec 46: 46.0000
+DEAL:1::vec 47: 47.0000
+DEAL:1::vec 48: 48.0000
+DEAL:1::vec 49: 49.0000
+DEAL:1::vec y: 50.0000
+DEAL:1::
+