From: Wolfgang Bangerth Date: Sat, 5 Feb 2022 23:34:30 +0000 (-0700) Subject: More changes of single-character things. X-Git-Tag: v9.4.0-rc1~520^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f394930a68d169312177a16dc3a235518bb3c25;p=dealii.git More changes of single-character things. --- diff --git a/examples/step-11/step-11.cc b/examples/step-11/step-11.cc index 4333dcf50f..bec34be767 100644 --- a/examples/step-11/step-11.cc +++ b/examples/step-11/step-11.cc @@ -111,7 +111,7 @@ namespace Step11 , dof_handler(triangulation) , mapping(mapping_degree) { - std::cout << "Using mapping with degree " << mapping_degree << ":" + std::cout << "Using mapping with degree " << mapping_degree << ':' << std::endl << "============================" << std::endl; } diff --git a/examples/step-12/step-12.cc b/examples/step-12/step-12.cc index a2ab5750bf..62712d43fd 100644 --- a/examples/step-12/step-12.cc +++ b/examples/step-12/step-12.cc @@ -543,7 +543,7 @@ namespace Step12 void AdvectionProblem::output_results(const unsigned int cycle) const { const std::string filename = "solution-" + std::to_string(cycle) + ".vtk"; - std::cout << " Writing solution to <" << filename << ">" << std::endl; + std::cout << " Writing solution to <" << filename << '>' << std::endl; std::ofstream output(filename); DataOut data_out; diff --git a/examples/step-12b/step-12b.cc b/examples/step-12b/step-12b.cc index aa717e06d9..ded1a32cd3 100644 --- a/examples/step-12b/step-12b.cc +++ b/examples/step-12b/step-12b.cc @@ -575,7 +575,7 @@ namespace Step12 // First write the grid in eps format. { const std::string filename = "grid-" + std::to_string(cycle) + ".eps"; - deallog << "Writing grid to <" << filename << ">" << std::endl; + deallog << "Writing grid to <" << filename << '>' << std::endl; std::ofstream eps_output(filename); GridOut grid_out; @@ -585,7 +585,7 @@ namespace Step12 // Then output the solution in gnuplot format. { const std::string filename = "sol-" + std::to_string(cycle) + ".gnuplot"; - deallog << "Writing solution to <" << filename << ">" << std::endl; + deallog << "Writing solution to <" << filename << '>' << std::endl; std::ofstream gnuplot_output(filename); DataOut data_out; diff --git a/examples/step-13/step-13.cc b/examples/step-13/step-13.cc index 9b1617ff23..61cb734d51 100644 --- a/examples/step-13/step-13.cc +++ b/examples/step-13/step-13.cc @@ -1299,7 +1299,7 @@ namespace Step13 // iteration. Note that the std::flush is needed to have // the text actually appear on the screen, rather than only in some // buffer that is only flushed the next time we issue an end-line. - std::cout << step << " " << std::flush; + std::cout << step << ' ' << std::flush; // Now solve the problem on the present grid, and run the evaluators // on it. The long type name of iterators into the list is a little diff --git a/examples/step-17/step-17.cc b/examples/step-17/step-17.cc index 838013b723..8ed50612fa 100644 --- a/examples/step-17/step-17.cc +++ b/examples/step-17/step-17.cc @@ -979,7 +979,7 @@ namespace Step17 pcout << (p == 0 ? ' ' : '+') << (DoFTools::count_dofs_with_subdomain_association(dof_handler, p)); - pcout << ")" << std::endl; + pcout << ')' << std::endl; assemble_system(); const unsigned int n_iterations = solve(); diff --git a/examples/step-18/step-18.cc b/examples/step-18/step-18.cc index 1b491be1be..ba907366d1 100644 --- a/examples/step-18/step-18.cc +++ b/examples/step-18/step-18.cc @@ -1314,7 +1314,7 @@ namespace Step18 pcout << (p == 0 ? ' ' : '+') << (GridTools::count_cells_with_subdomain_association( triangulation, p)); - pcout << ")" << std::endl; + pcout << ')' << std::endl; setup_system(); @@ -1324,7 +1324,7 @@ namespace Step18 pcout << (p == 0 ? ' ' : '+') << (DoFTools::count_dofs_with_subdomain_association(dof_handler, p)); - pcout << ")" << std::endl; + pcout << ')' << std::endl; solve_timestep(); } diff --git a/examples/step-24/step-24.cc b/examples/step-24/step-24.cc index 891551ff15..b9d15add26 100644 --- a/examples/step-24/step-24.cc +++ b/examples/step-24/step-24.cc @@ -509,11 +509,11 @@ namespace Step24 detector_data << time; for (unsigned int i = 0; i < detector_locations.size(); ++i) - detector_data << " " + detector_data << ' ' << VectorTools::point_value(dof_handler, solution_p, detector_locations[i]) - << " "; + << ' '; detector_data << std::endl; old_solution_p = solution_p; diff --git a/examples/step-28/step-28.cc b/examples/step-28/step-28.cc index 1fa4205d50..205579d352 100644 --- a/examples/step-28/step-28.cc +++ b/examples/step-28/step-28.cc @@ -1663,9 +1663,9 @@ namespace Step28 ++iteration; } while ((error > parameters.convergence_tolerance) && (iteration < 500)); - convergence_table_stream << cycle << " " << energy_groups[0]->n_dofs() - << " " << energy_groups[1]->n_dofs() << " " - << k_eff << " " + convergence_table_stream << cycle << ' ' << energy_groups[0]->n_dofs() + << ' ' << energy_groups[1]->n_dofs() << ' ' + << k_eff << ' ' << energy_groups[0]->solution.linfty_norm() / energy_groups[1]->solution.linfty_norm() << '\n'; diff --git a/examples/step-35/step-35.cc b/examples/step-35/step-35.cc index bee2871a98..d4fa04c223 100644 --- a/examples/step-35/step-35.cc +++ b/examples/step-35/step-35.cc @@ -492,7 +492,7 @@ namespace Step35 double, << " The time step " << arg1 << " is out of range." << std::endl - << " The permitted range is (0," << arg2 << "]"); + << " The permitted range is (0," << arg2 << ']'); void create_triangulation_and_dofs(const unsigned int n_refines); diff --git a/examples/step-36/step-36.cc b/examples/step-36/step-36.cc index 8c488d1a35..9a0c780514 100644 --- a/examples/step-36/step-36.cc +++ b/examples/step-36/step-36.cc @@ -324,9 +324,9 @@ namespace Step36 max_spurious_eigenvalue = std::max(max_spurious_eigenvalue, ev); } - std::cout << " Spurious eigenvalues are all in the interval " - << "[" << min_spurious_eigenvalue << "," - << max_spurious_eigenvalue << "]" << std::endl; + std::cout << " Spurious eigenvalues are all in the interval " << '[' + << min_spurious_eigenvalue << ',' << max_spurious_eigenvalue + << ']' << std::endl; } diff --git a/examples/step-37/step-37.cc b/examples/step-37/step-37.cc index 96564bd950..134fca1880 100644 --- a/examples/step-37/step-37.cc +++ b/examples/step-37/step-37.cc @@ -803,7 +803,7 @@ namespace Step37 constraints.close(); setup_time += time.wall_time(); time_details << "Distribute DoFs & B.C. (CPU/wall) " << time.cpu_time() - << "s/" << time.wall_time() << "s" << std::endl; + << "s/" << time.wall_time() << 's' << std::endl; time.restart(); { @@ -829,7 +829,7 @@ namespace Step37 setup_time += time.wall_time(); time_details << "Setup matrix-free system (CPU/wall) " << time.cpu_time() - << "s/" << time.wall_time() << "s" << std::endl; + << "s/" << time.wall_time() << 's' << std::endl; time.restart(); // Next, initialize the matrices for the multigrid method on all the @@ -883,7 +883,7 @@ namespace Step37 } setup_time += time.wall_time(); time_details << "Setup matrix-free levels (CPU/wall) " << time.cpu_time() - << "s/" << time.wall_time() << "s" << std::endl; + << "s/" << time.wall_time() << 's' << std::endl; } @@ -920,7 +920,7 @@ namespace Step37 setup_time += time.wall_time(); time_details << "Assemble right hand side (CPU/wall) " << time.cpu_time() - << "s/" << time.wall_time() << "s" << std::endl; + << "s/" << time.wall_time() << 's' << std::endl; } @@ -1159,7 +1159,7 @@ namespace Step37 pcout << "Vectorization over " << n_vect_doubles << " doubles = " << n_vect_bits << " bits (" - << Utilities::System::get_current_vectorization_level() << ")" + << Utilities::System::get_current_vectorization_level() << ')' << std::endl; } diff --git a/examples/step-42/step-42.cc b/examples/step-42/step-42.cc index 3e9fdeaea0..5db3a410ba 100644 --- a/examples/step-42/step-42.cc +++ b/examples/step-42/step-42.cc @@ -469,7 +469,7 @@ namespace Step42 hy = 1.0 / (ny - 1); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) - std::cout << "Read obstacle from file <" << name << ">" << std::endl + std::cout << "Read obstacle from file <" << name << '>' << std::endl << "Resolution of the scanned obstacle picture: " << nx << " x " << ny << std::endl; } @@ -1716,7 +1716,7 @@ namespace Step42 !transfer_solution) constitutive_law.set_sigma_0(correct_sigma); - pcout << " " << std::endl; + pcout << ' ' << std::endl; pcout << " Newton iteration " << newton_step << std::endl; pcout << " Updating active set..." << std::endl; @@ -2154,7 +2154,7 @@ namespace Step42 Utilities::System::MemoryStats stats; Utilities::System::get_memory_stats(stats); pcout << "Peak virtual memory used, resident in kB: " << stats.VmSize - << " " << stats.VmRSS << std::endl; + << ' ' << stats.VmRSS << std::endl; if (base_mesh == "box") output_contact_force(); diff --git a/examples/step-44/step-44.cc b/examples/step-44/step-44.cc index 082ddf6fed..40dd349253 100644 --- a/examples/step-44/step-44.cc +++ b/examples/step-44/step-44.cc @@ -1651,7 +1651,7 @@ namespace Step44 { std::cout << std::endl << "Timestep " << time.get_timestep() << " @ " << time.current() - << "s" << std::endl; + << 's' << std::endl; BlockVector newton_update(dofs_per_block); @@ -1687,7 +1687,7 @@ namespace Step44 unsigned int newton_iteration = 0; for (; newton_iteration < parameters.max_iterations_NR; ++newton_iteration) { - std::cout << " " << std::setw(2) << newton_iteration << " " + std::cout << ' ' << std::setw(2) << newton_iteration << ' ' << std::flush; // We construct the linear system, but hold off on solving it @@ -1767,7 +1767,7 @@ namespace Step44 static const unsigned int l_width = 150; for (unsigned int i = 0; i < l_width; ++i) - std::cout << "_"; + std::cout << '_'; std::cout << std::endl; std::cout << " SOLVER STEP " @@ -1776,7 +1776,7 @@ namespace Step44 << " NU_U NU_P NU_J " << std::endl; for (unsigned int i = 0; i < l_width; ++i) - std::cout << "_"; + std::cout << '_'; std::cout << std::endl; } @@ -1788,7 +1788,7 @@ namespace Step44 static const unsigned int l_width = 150; for (unsigned int i = 0; i < l_width; ++i) - std::cout << "_"; + std::cout << '_'; std::cout << std::endl; const std::pair error_dil = get_error_dilation(); diff --git a/examples/step-48/step-48.cc b/examples/step-48/step-48.cc index ad97c0b9b7..8daa6d4cc6 100644 --- a/examples/step-48/step-48.cc +++ b/examples/step-48/step-48.cc @@ -540,7 +540,7 @@ namespace Step48 const unsigned int n_vect_bits = 8 * sizeof(double) * n_vect_doubles; pcout << "Vectorization over " << n_vect_doubles << " doubles = " << n_vect_bits << " bits (" - << Utilities::System::get_current_vectorization_level() << ")" + << Utilities::System::get_current_vectorization_level() << ')' << std::endl << std::endl; } @@ -630,7 +630,7 @@ namespace Step48 << " Performed " << timestep_number << " time steps." << std::endl; pcout << " Average wallclock time per time step: " - << wtime / timestep_number << "s" << std::endl; + << wtime / timestep_number << 's' << std::endl; pcout << " Spent " << output_time << "s on output and " << wtime << "s on computations." << std::endl; diff --git a/examples/step-49/step-49.cc b/examples/step-49/step-49.cc index 0fff1d2139..3f926423cf 100644 --- a/examples/step-49/step-49.cc +++ b/examples/step-49/step-49.cc @@ -80,7 +80,7 @@ void print_mesh_info(const Triangulation &triangulation, for (const std::pair &pair : boundary_count) { - std::cout << pair.first << "(" << pair.second << " times) "; + std::cout << pair.first << '(' << pair.second << " times) "; } std::cout << std::endl; } diff --git a/examples/step-57/step-57.cc b/examples/step-57/step-57.cc index 2ffc4d98cd..2d67c9d9a9 100644 --- a/examples/step-57/step-57.cc +++ b/examples/step-57/step-57.cc @@ -787,7 +787,7 @@ namespace Step57 f << p(dim - 1); for (int j = 0; j < dim; ++j) - f << " " << tmp_vector(j); + f << ' ' << tmp_vector(j); f << std::endl; } } diff --git a/examples/step-66/step-66.cc b/examples/step-66/step-66.cc index 323be0ad0e..155f7253ca 100644 --- a/examples/step-66/step-66.cc +++ b/examples/step-66/step-66.cc @@ -1127,7 +1127,7 @@ namespace Step66 timer.stop(); - pcout << "Time for setup+solve (CPU/Wall) " << timer.cpu_time() << "/" + pcout << "Time for setup+solve (CPU/Wall) " << timer.cpu_time() << '/' << timer.wall_time() << " s" << std::endl; pcout << std::endl; diff --git a/examples/step-67/step-67.cc b/examples/step-67/step-67.cc index ed06de80d8..b80cd368fd 100644 --- a/examples/step-67/step-67.cc +++ b/examples/step-67/step-67.cc @@ -2194,10 +2194,10 @@ namespace Euler_DG pcout << "Running with " << Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD) << " MPI processes" << std::endl; - pcout << "Vectorization over " << n_vect_number << " " + pcout << "Vectorization over " << n_vect_number << ' ' << (std::is_same::value ? "doubles" : "floats") << " = " << n_vect_bits << " bits (" - << Utilities::System::get_current_vectorization_level() << ")" + << Utilities::System::get_current_vectorization_level() << ')' << std::endl; } diff --git a/examples/step-68/step-68.cc b/examples/step-68/step-68.cc index 2b9efafe70..1dd1d6d05a 100644 --- a/examples/step-68/step-68.cc +++ b/examples/step-68/step-68.cc @@ -634,7 +634,7 @@ namespace Step68 "interpolated-particles" : "analytical-particles"); - pcout << "Writing particle output file: " << file_name << "-" << it + pcout << "Writing particle output file: " << file_name << '-' << it << std::endl; particle_output.write_vtu_with_pvtu_record( @@ -669,7 +669,7 @@ namespace Step68 const std::string output_folder(par.output_directory); const std::string file_name("background"); - pcout << "Writing background field file: " << file_name << "-" << it + pcout << "Writing background field file: " << file_name << '-' << it << std::endl; data_out.write_vtu_with_pvtu_record( diff --git a/examples/step-69/step-69.cc b/examples/step-69/step-69.cc index 4a801f97ba..29683071bf 100644 --- a/examples/step-69/step-69.cc +++ b/examples/step-69/step-69.cc @@ -2618,7 +2618,7 @@ namespace Step69 typename MainLoop::vector_type MainLoop::interpolate_initial_values(const double t) { - pcout << "MainLoop::interpolate_initial_values(t = " << t << ")" + pcout << "MainLoop::interpolate_initial_values(t = " << t << ')' << std::endl; TimerOutput::Scope scope(computing_timer, "main_loop - setup scratch space"); @@ -2708,7 +2708,7 @@ namespace Step69 const double t, const unsigned int cycle) { - pcout << "MainLoop::output(t = " << t << ")" << std::endl; + pcout << "MainLoop::output(t = " << t << ')' << std::endl; // If the asynchronous writeback option is set we launch a background // thread performing all the slow IO to disc. In that case we have to diff --git a/examples/step-75/step-75.cc b/examples/step-75/step-75.cc index 7385bb6722..1ed9c2d60a 100644 --- a/examples/step-75/step-75.cc +++ b/examples/step-75/step-75.cc @@ -1209,7 +1209,7 @@ namespace Step75 pcout << " Frequencies of poly. degrees:"; for (unsigned int i = 0; i < fe_collection.size(); ++i) if (n_fe_indices[i] > 0) - pcout << ' ' << fe_collection[i].degree << ":" << n_fe_indices[i]; + pcout << ' ' << fe_collection[i].degree << ':' << n_fe_indices[i]; pcout << std::endl; } } diff --git a/examples/step-76/step-76.cc b/examples/step-76/step-76.cc index dd437c1867..161257e241 100644 --- a/examples/step-76/step-76.cc +++ b/examples/step-76/step-76.cc @@ -1522,10 +1522,10 @@ namespace Euler_DG pcout << "Running with " << Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD) << " MPI processes" << std::endl; - pcout << "Vectorization over " << n_vect_number << " " + pcout << "Vectorization over " << n_vect_number << ' ' << (std::is_same::value ? "doubles" : "floats") << " = " << n_vect_bits << " bits (" - << Utilities::System::get_current_vectorization_level() << ")" + << Utilities::System::get_current_vectorization_level() << ')' << std::endl; } diff --git a/examples/step-79/step-79.cc b/examples/step-79/step-79.cc index ec17414ef2..4c502426d6 100644 --- a/examples/step-79/step-79.cc +++ b/examples/step-79/step-79.cc @@ -1970,100 +1970,100 @@ namespace SAND if (is_right_handed_cell) { /* Write one side at z = 0. */ - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << -1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << -1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(0)[0] << " " - << cell->vertex(0)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(0)[0] << ' ' + << cell->vertex(0)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << -1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << -1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(3)[0] << " " - << cell->vertex(3)[1] << " " << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(3)[0] << ' ' + << cell->vertex(3)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; /* Write one side at z = height. */ - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << 1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << 1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(0)[0] << " " - << cell->vertex(0)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << height << '\n'; + stlfile << " vertex " << cell->vertex(0)[0] << ' ' + << cell->vertex(0)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << height << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << 1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << 1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(3)[0] << " " - << cell->vertex(3)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << height << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(3)[0] << ' ' + << cell->vertex(3)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << height << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; } else /* The cell has a left-handed set up */ { /* Write one side at z = 0. */ - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << -1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << -1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(0)[0] << " " - << cell->vertex(0)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(0)[0] << ' ' + << cell->vertex(0)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << -1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << -1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(3)[0] << " " - << cell->vertex(3)[1] << " " << 0.000000e+00 << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(3)[0] << ' ' + << cell->vertex(3)[1] << ' ' << 0.000000e+00 << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; /* Write one side at z = height. */ - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << 1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << 1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(0)[0] << " " - << cell->vertex(0)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << height << '\n'; + stlfile << " vertex " << cell->vertex(0)[0] << ' ' + << cell->vertex(0)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << height << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; - stlfile << " facet normal " << 0.000000e+00 << " " - << 0.000000e+00 << " " << 1.000000e+00 << '\n'; + stlfile << " facet normal " << 0.000000e+00 << ' ' + << 0.000000e+00 << ' ' << 1.000000e+00 << '\n'; stlfile << " outer loop\n"; - stlfile << " vertex " << cell->vertex(1)[0] << " " - << cell->vertex(1)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(2)[0] << " " - << cell->vertex(2)[1] << " " << height << '\n'; - stlfile << " vertex " << cell->vertex(3)[0] << " " - << cell->vertex(3)[1] << " " << height << '\n'; + stlfile << " vertex " << cell->vertex(1)[0] << ' ' + << cell->vertex(1)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(2)[0] << ' ' + << cell->vertex(2)[1] << ' ' << height << '\n'; + stlfile << " vertex " << cell->vertex(3)[0] << ' ' + << cell->vertex(3)[1] << ' ' << height << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; } @@ -2108,34 +2108,34 @@ namespace SAND 0) { stlfile << " facet normal " - << normal_vector[0] / normal_norm << " " - << normal_vector[1] / normal_norm << " " + << normal_vector[0] / normal_norm << ' ' + << normal_vector[1] / normal_norm << ' ' << 0.000000e+00 << '\n'; stlfile << " outer loop\n"; stlfile << " vertex " << face->vertex(0)[0] - << " " << face->vertex(0)[1] << " " + << ' ' << face->vertex(0)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " vertex " << face->vertex(0)[0] - << " " << face->vertex(0)[1] << " " << height + << ' ' << face->vertex(0)[1] << ' ' << height << '\n'; stlfile << " vertex " << face->vertex(1)[0] - << " " << face->vertex(1)[1] << " " + << ' ' << face->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; stlfile << " facet normal " - << normal_vector[0] / normal_norm << " " - << normal_vector[1] / normal_norm << " " + << normal_vector[0] / normal_norm << ' ' + << normal_vector[1] / normal_norm << ' ' << 0.000000e+00 << '\n'; stlfile << " outer loop\n"; stlfile << " vertex " << face->vertex(0)[0] - << " " << face->vertex(0)[1] << " " << height + << ' ' << face->vertex(0)[1] << ' ' << height << '\n'; stlfile << " vertex " << face->vertex(1)[0] - << " " << face->vertex(1)[1] << " " << height + << ' ' << face->vertex(1)[1] << ' ' << height << '\n'; stlfile << " vertex " << face->vertex(1)[0] - << " " << face->vertex(1)[1] << " " + << ' ' << face->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; @@ -2143,34 +2143,34 @@ namespace SAND else { stlfile << " facet normal " - << normal_vector[0] / normal_norm << " " - << normal_vector[1] / normal_norm << " " + << normal_vector[0] / normal_norm << ' ' + << normal_vector[1] / normal_norm << ' ' << 0.000000e+00 << '\n'; stlfile << " outer loop\n"; stlfile << " vertex " << face->vertex(0)[0] - << " " << face->vertex(0)[1] << " " + << ' ' << face->vertex(0)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " vertex " << face->vertex(1)[0] - << " " << face->vertex(1)[1] << " " + << ' ' << face->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " vertex " << face->vertex(0)[0] - << " " << face->vertex(0)[1] << " " << height + << ' ' << face->vertex(0)[1] << ' ' << height << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; stlfile << " facet normal " - << normal_vector[0] / normal_norm << " " - << normal_vector[1] / normal_norm << " " + << normal_vector[0] / normal_norm << ' ' + << normal_vector[1] / normal_norm << ' ' << 0.000000e+00 << '\n'; stlfile << " outer loop\n"; stlfile << " vertex " << face->vertex(0)[0] - << " " << face->vertex(0)[1] << " " << height + << ' ' << face->vertex(0)[1] << ' ' << height << '\n'; stlfile << " vertex " << face->vertex(1)[0] - << " " << face->vertex(1)[1] << " " + << ' ' << face->vertex(1)[1] << ' ' << 0.000000e+00 << '\n'; stlfile << " vertex " << face->vertex(1)[0] - << " " << face->vertex(1)[1] << " " << height + << ' ' << face->vertex(1)[1] << ' ' << height << '\n'; stlfile << " endloop\n"; stlfile << " endfacet\n"; diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h index 60eab6d9bd..7e1256db1c 100644 --- a/include/deal.II/base/exceptions.h +++ b/include/deal.II/base/exceptions.h @@ -884,7 +884,7 @@ namespace StandardExceptions int, int, << "You are trying to execute functionality that is " - << "impossible in dimensions <" << arg1 << "," << arg2 + << "impossible in dimensions <" << arg1 << ',' << arg2 << "> or simply does not make any sense."); @@ -947,7 +947,7 @@ namespace StandardExceptions std::size_t, std::size_t, std::size_t, - << "Index " << arg1 << " is not in the half-open range [" << arg2 << "," + << "Index " << arg1 << " is not in the half-open range [" << arg2 << ',' << arg3 << ")." << (arg2 == arg3 ? " In the current case, this half-open range is in fact empty, " @@ -977,7 +977,7 @@ namespace StandardExceptions T, T, T, - << "Index " << arg1 << " is not in the half-open range [" << arg2 << "," + << "Index " << arg1 << " is not in the half-open range [" << arg2 << ',' << arg3 << ")." << (arg2 == arg3 ? " In the current case, this half-open range is in fact empty, " diff --git a/include/deal.II/base/function_cspline.h b/include/deal.II/base/function_cspline.h index b518456162..766dfa7ef1 100644 --- a/include/deal.II/base/function_cspline.h +++ b/include/deal.II/base/function_cspline.h @@ -60,7 +60,7 @@ namespace Functions double, << "Spline function can not be evaluated outside of the interpolation range: " << std::endl - << arg1 << " is not in [" << arg2 << ";" << arg3 << "]."); + << arg1 << " is not in [" << arg2 << ';' << arg3 << "]."); /** * The cubic spline function using GNU Scientific Library. diff --git a/include/deal.II/base/function_parser.h b/include/deal.II/base/function_parser.h index 1bd70f3c2a..3e1e28f328 100644 --- a/include/deal.II/base/function_parser.h +++ b/include/deal.II/base/function_parser.h @@ -146,7 +146,7 @@ class Vector; * const double c = vector_function.value(point, 1); * * // Output the evaluated function - * deallog << "Function '" << expressions[0] << "," << expressions[1] << "'" + * deallog << "Function '" << expressions[0] << ',' << expressions[1] << "'" * << " at " << point * << " is " << result << std::endl; * @endcode diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h index 4cb5d98560..782ded80df 100644 --- a/include/deal.II/base/index_set.h +++ b/include/deal.II/base/index_set.h @@ -2020,19 +2020,19 @@ inline void IndexSet::print(StreamType &out) const { compress(); - out << "{"; + out << '{'; std::vector::const_iterator p; for (p = ranges.begin(); p != ranges.end(); ++p) { if (p->end - p->begin == 1) out << p->begin; else - out << "[" << p->begin << "," << p->end - 1 << "]"; + out << '[' << p->begin << ',' << p->end - 1 << ']'; if (p != --ranges.end()) out << ", "; } - out << "}" << std::endl; + out << '}' << std::endl; } diff --git a/include/deal.II/base/polynomial_space.h b/include/deal.II/base/polynomial_space.h index dad3fdf62d..dc1ac3dc81 100644 --- a/include/deal.II/base/polynomial_space.h +++ b/include/deal.II/base/polynomial_space.h @@ -322,7 +322,7 @@ PolynomialSpace::output_indices(StreamType &out) const const std::array ix = compute_index(i); out << i << "\t"; for (unsigned int d = 0; d < dim; ++d) - out << ix[d] << " "; + out << ix[d] << ' '; out << std::endl; } } diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h index b5ada3e8e8..286304f4f3 100644 --- a/include/deal.II/base/table.h +++ b/include/deal.II/base/table.h @@ -201,7 +201,7 @@ namespace internal size_type, size_type, << "Index " << N - P + 1 << "has a value of " << arg1 - << " but needs to be in the range [" << arg2 << "," << arg3 + << " but needs to be in the range [" << arg2 << ',' << arg3 << "[."); private: diff --git a/include/deal.II/base/table_handler.h b/include/deal.II/base/table_handler.h index 30a828a04c..3b1c65d6d6 100644 --- a/include/deal.II/base/table_handler.h +++ b/include/deal.II/base/table_handler.h @@ -617,7 +617,7 @@ public: */ DeclException1(ExcUndefinedTexFormat, std::string, - << "<" << arg1 << "> is not a tex column format. Use " + << '<' << arg1 << "> is not a tex column format. Use " << "'l', 'c', or 'r' to indicate left, centered, or " << "right aligned text."); //@} diff --git a/include/deal.II/base/tensor_function_parser.h b/include/deal.II/base/tensor_function_parser.h index 0632e3e946..2a33e24aee 100644 --- a/include/deal.II/base/tensor_function_parser.h +++ b/include/deal.II/base/tensor_function_parser.h @@ -82,8 +82,8 @@ class Vector; * << " @ " << point * << " is: " * << std::endl - * << result[0][0] << " " << result[0][1] << std::endl - * << result[1][0] << " " << result[1][1] + * << result[0][0] << ' ' << result[0][1] << std::endl + * << result[1][0] << ' ' << result[1][1] * << std::endl; * @endcode * diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h index 5ddc42c47d..ac7fd4621b 100644 --- a/include/deal.II/dofs/dof_tools.h +++ b/include/deal.II/dofs/dof_tools.h @@ -2400,7 +2400,7 @@ namespace DoFTools * << "'-' with labels point pt 2 offset 1,1" * << std::endl; * GridOut().write_gnuplot (triangulation, out); - * out << "e" << std::endl; + * out << 'e' << std::endl; * * std::map > support_points; * DoFTools::map_dofs_to_support_points (MappingQ1(), @@ -2408,7 +2408,7 @@ namespace DoFTools * support_points); * DoFTools::write_gnuplot_dof_support_point_info(out, * support_points); - * out << "e" << std::endl; + * out << 'e' << std::endl; * @endcode * and from within gnuplot execute the following command: * @code @@ -2432,7 +2432,7 @@ namespace DoFTools * << "'-' with labels point pt 2 offset 1,1 notitle" * << std::endl; * GridOut().write_gnuplot (triangulation, out); - * out << "e" << std::endl; + * out << 'e' << std::endl; * * std::map > support_points; * DoFTools::map_dofs_to_support_points (MappingQ1(), @@ -2440,7 +2440,7 @@ namespace DoFTools * support_points); * DoFTools::write_gnuplot_dof_support_point_info(out, * support_points); - * out << "e" << std::endl; + * out << 'e' << std::endl; * @endcode */ template diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index e6bd24c129..624b7a244f 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -2369,7 +2369,7 @@ public: DeclException2(ExcWrongInterfaceMatrixSize, int, int, - << "The interface matrix has a size of " << arg1 << "x" << arg2 + << "The interface matrix has a size of " << arg1 << 'x' << arg2 << ", which is not reasonable for the current element " "in the present dimension."); /** diff --git a/include/deal.II/fe/fe_dg_vector.templates.h b/include/deal.II/fe/fe_dg_vector.templates.h index 6f6b08e4b8..d61b90c8ea 100644 --- a/include/deal.II/fe/fe_dg_vector.templates.h +++ b/include/deal.II/fe/fe_dg_vector.templates.h @@ -70,8 +70,8 @@ std::string FE_DGVector::get_name() const { std::ostringstream namebuf; - namebuf << "FE_DGVector_" << this->poly_space->name() << "<" << dim << ">(" - << this->degree - 1 << ")"; + namebuf << "FE_DGVector_" << this->poly_space->name() << '<' << dim << ">(" + << this->degree - 1 << ')'; return namebuf.str(); } diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index 93140fd40b..280949112d 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -1364,8 +1364,8 @@ namespace FETools int, int, int, - << "This is a " << arg1 << "x" << arg2 << " matrix, " - << "but should be a " << arg3 << "x" << arg4 << " matrix."); + << "This is a " << arg1 << 'x' << arg2 << " matrix, " + << "but should be a " << arg3 << 'x' << arg4 << " matrix."); /** * Exception thrown if an embedding matrix was computed inaccurately. diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h index 4917603997..53beb6fb7b 100644 --- a/include/deal.II/grid/reference_cell.h +++ b/include/deal.II/grid/reference_cell.h @@ -2063,7 +2063,7 @@ namespace internal virtual void print_info(std::ostream &out) const override { - out << "["; + out << '['; const unsigned int n_vertices = entity_type.n_vertices(); @@ -2071,7 +2071,7 @@ namespace internal { out << vertices_0[i]; if (i + 1 != n_vertices) - out << ","; + out << ','; } out << "] is not a permutation of ["; @@ -2080,7 +2080,7 @@ namespace internal { out << vertices_1[i]; if (i + 1 != n_vertices) - out << ","; + out << ','; } out << "]." << std::endl; diff --git a/include/deal.II/lac/affine_constraints.templates.h b/include/deal.II/lac/affine_constraints.templates.h index fdcadc83c9..e12b30cc99 100644 --- a/include/deal.II/lac/affine_constraints.templates.h +++ b/include/deal.II/lac/affine_constraints.templates.h @@ -1241,7 +1241,7 @@ AffineConstraints::print(std::ostream &out) const if (line.entries.size() > 0) { for (const std::pair &entry : line.entries) - out << " " << line.index << " " << entry.first << ": " + out << " " << line.index << ' ' << entry.first << ": " << entry.second << '\n'; // print out inhomogeneity. @@ -1280,7 +1280,7 @@ AffineConstraints::write_dot(std::ostream &out) const else out << " " << lines[i].index << '\n'; } - out << "}" << std::endl; + out << '}' << std::endl; } diff --git a/include/deal.II/lac/block_matrix_base.h b/include/deal.II/lac/block_matrix_base.h index 4b97046f8b..7561c8447d 100644 --- a/include/deal.II/lac/block_matrix_base.h +++ b/include/deal.II/lac/block_matrix_base.h @@ -2510,7 +2510,7 @@ BlockMatrixBase::print(std::ostream &out, for (unsigned int col = 0; col < n_block_cols(); ++col) { if (!alternative_output) - out << "Block (" << row << ", " << col << ")" << std::endl; + out << "Block (" << row << ", " << col << ')' << std::endl; block(row, col).print(out, alternative_output); } diff --git a/include/deal.II/lac/block_sparse_matrix.templates.h b/include/deal.II/lac/block_sparse_matrix.templates.h index abc833a2f3..5826a30857 100644 --- a/include/deal.II/lac/block_sparse_matrix.templates.h +++ b/include/deal.II/lac/block_sparse_matrix.templates.h @@ -183,7 +183,7 @@ BlockSparseMatrix::print_formatted(std::ostream & out, for (size_type r = 0; r < this->n_block_rows(); ++r) for (size_type c = 0; c < this->n_block_cols(); ++c) { - out << "Component (" << r << "," << c << ")" << std::endl; + out << "Component (" << r << ',' << c << ')' << std::endl; this->block(r, c).print_formatted( out, precision, scientific, width, zero_string, denominator); } diff --git a/include/deal.II/lac/cuda_sparse_matrix.h b/include/deal.II/lac/cuda_sparse_matrix.h index 54244dd937..f1598c54ff 100644 --- a/include/deal.II/lac/cuda_sparse_matrix.h +++ b/include/deal.II/lac/cuda_sparse_matrix.h @@ -451,7 +451,7 @@ namespace CUDAWrappers if (across) out << ' ' << i << ',' << cols[j] << ':' << val[j]; else - out << "(" << i << "," << cols[j] << ") " << val[j] << std::endl; + out << '(' << i << ',' << cols[j] << ") " << val[j] << std::endl; } } if (across) diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index 15988bdc09..45b0d6cffa 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -1258,7 +1258,7 @@ namespace LinearAlgebra << "You tried to access element " << arg1 << " of a distributed vector, but this element is not " << "stored on the current processor. Note: The range of " - << "locally owned elements is [" << arg2 << "," << arg3 + << "locally owned elements is [" << arg2 << ',' << arg3 << "], and there are " << arg4 << " ghost elements " << "that this vector can access." << "\n\n" diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h index 3854487284..b9c8b290af 100644 --- a/include/deal.II/lac/la_parallel_vector.templates.h +++ b/include/deal.II/lac/la_parallel_vector.templates.h @@ -2164,7 +2164,7 @@ namespace LinearAlgebra out << '(' << partitioner->ghost_indices().nth_index_in_set(i) << '/' << stored_elements[partitioner->locally_owned_size() + i] - << ")" << std::endl; + << ')' << std::endl; out << std::endl; } out << std::flush; diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index b628221681..cdc19ab169 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -180,7 +180,7 @@ namespace PETScWrappers int, << "You tried to access element " << arg1 << " of a distributed vector, but only elements in range [" << arg2 - << "," << arg3 << "] are stored locally and can be accessed." + << ',' << arg3 << "] are stored locally and can be accessed." << "\n\n" << "A common source for this kind of problem is that you " << "are passing a 'fully distributed' vector into a function " diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h index e4ab936834..ddd422fa9d 100644 --- a/include/deal.II/lac/read_write_vector.templates.h +++ b/include/deal.II/lac/read_write_vector.templates.h @@ -1027,7 +1027,7 @@ namespace LinearAlgebra out << std::endl; unsigned int i = 0; for (const auto idx : this->stored_elements) - out << "[" << idx << "]: " << values[i++] << '\n'; + out << '[' << idx << "]: " << values[i++] << '\n'; out << std::flush; AssertThrow(out, ExcIO()); diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h index d2c5f619b0..b01eaa60f3 100644 --- a/include/deal.II/lac/sparse_matrix.h +++ b/include/deal.II/lac/sparse_matrix.h @@ -2543,7 +2543,7 @@ SparseMatrix::print(StreamType &out, if (across) out << ' ' << i << ',' << cols->colnums[j] << ':' << val[j]; else - out << "(" << i << "," << cols->colnums[j] << ") " << val[j] + out << '(' << i << ',' << cols->colnums[j] << ") " << val[j] << std::endl; } } diff --git a/include/deal.II/lac/sparse_mic.h b/include/deal.II/lac/sparse_mic.h index 6043b7c738..46eff79568 100644 --- a/include/deal.II/lac/sparse_mic.h +++ b/include/deal.II/lac/sparse_mic.h @@ -147,7 +147,7 @@ public: DeclException2(ExcDecompositionNotStable, int, double, - << "The diagonal element (" << arg1 << "," << arg1 << ") is " + << "The diagonal element (" << arg1 << ',' << arg1 << ") is " << arg2 << ", but must be positive"); //@} diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index 68bcac534b..8eec00f32d 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -1885,10 +1885,10 @@ namespace TrilinosWrappers size_type, size_type, size_type, - << "You tried to access element (" << arg1 << "/" << arg2 - << ")" + << "You tried to access element (" << arg1 << '/' << arg2 + << ')' << " of a distributed matrix, but only rows in range [" - << arg3 << "," << arg4 + << arg3 << ',' << arg4 << "] are stored locally and can be accessed."); /** @@ -1897,9 +1897,8 @@ namespace TrilinosWrappers DeclException2(ExcAccessToNonPresentElement, size_type, size_type, - << "You tried to access element (" << arg1 << "/" << arg2 - << ")" - << " of a sparse matrix, but it appears to not" + << "You tried to access element (" << arg1 << '/' << arg2 + << ')' << " of a sparse matrix, but it appears to not" << " exist in the Trilinos sparsity pattern."); //@} diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h index 80c733e1bc..eebc438d45 100644 --- a/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -965,10 +965,10 @@ namespace TrilinosWrappers size_type, size_type, size_type, - << "You tried to access element (" << arg1 << "/" << arg2 - << ")" + << "You tried to access element (" << arg1 << '/' << arg2 + << ')' << " of a distributed matrix, but only rows in range [" - << arg3 << "," << arg4 + << arg3 << ',' << arg4 << "] are stored locally and can be accessed."); /** @@ -977,9 +977,8 @@ namespace TrilinosWrappers DeclException2(ExcAccessToNonPresentElement, size_type, size_type, - << "You tried to access element (" << arg1 << "/" << arg2 - << ")" - << " of a sparse matrix, but it appears to not" + << "You tried to access element (" << arg1 << '/' << arg2 + << ')' << " of a sparse matrix, but it appears to not" << " exist in the Trilinos sparsity pattern."); //@} private: diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index b65e50c1e6..2b07272748 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -1287,7 +1287,7 @@ namespace TrilinosWrappers << " of a distributed vector, but this element is not stored " << "on the current processor. Note: There are " << arg2 << " elements stored " - << "on the current processor from within the range [" << arg3 << "," + << "on the current processor from within the range [" << arg3 << ',' << arg4 << "] but Trilinos vectors need not store contiguous " << "ranges on each processor, and not every element in " << "this range may in fact be stored locally." diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h index 814988d4d7..63ff5f22a3 100644 --- a/include/deal.II/matrix_free/dof_info.templates.h +++ b/include/deal.II/matrix_free/dof_info.templates.h @@ -708,7 +708,7 @@ namespace internal for (unsigned int j = 0; j < con_it->first; ++j, ++index) { Assert(glob_indices + index != end_row, ExcInternalError()); - out << glob_indices[index] << " "; + out << glob_indices[index] << ' '; } out << "[ "; @@ -717,14 +717,14 @@ namespace internal k++, index++) { Assert(glob_indices + index != end_row, ExcInternalError()); - out << glob_indices[index] << "/" << constraint_pool_data[k] - << " "; + out << glob_indices[index] << '/' << constraint_pool_data[k] + << ' '; } out << "] "; } glob_indices += index; for (; glob_indices != end_row; ++glob_indices) - out << *glob_indices << " "; + out << *glob_indices << ' '; out << std::endl; } } diff --git a/include/deal.II/meshworker/local_results.h b/include/deal.II/meshworker/local_results.h index c9587fdfe3..61a0135170 100644 --- a/include/deal.II/meshworker/local_results.h +++ b/include/deal.II/meshworker/local_results.h @@ -675,10 +675,10 @@ namespace MeshWorker os << "M: " << M1.size() << " face " << M2.size() << std::endl; for (unsigned int i = 0; i < M1.size(); ++i) { - os << " " << M1[i].row << "," << M1[i].column << " " + os << " " << M1[i].row << ',' << M1[i].column << ' ' << M1[i].matrix.m() << 'x' << M1[i].matrix.n(); if (i < M2.size()) - os << " face " << M2[i].row << "," << M2[i].column << " " + os << " face " << M2[i].row << ',' << M2[i].column << ' ' << M2[i].matrix.m() << 'x' << M2[i].matrix.n(); os << std::endl; } diff --git a/include/deal.II/multigrid/mg_transfer.templates.h b/include/deal.II/multigrid/mg_transfer.templates.h index 2b8c186bf4..2ca27ee055 100644 --- a/include/deal.II/multigrid/mg_transfer.templates.h +++ b/include/deal.II/multigrid/mg_transfer.templates.h @@ -260,7 +260,7 @@ MGLevelGlobalTransfer::copy_to_mg( #ifdef DEBUG_OUTPUT ierr = MPI_Barrier(MPI_COMM_WORLD); AssertThrowMPI(ierr); - std::cout << "copy_to_mg dst " << level << " " << dst_level.l2_norm() + std::cout << "copy_to_mg dst " << level << ' ' << dst_level.l2_norm() << std::endl; #endif } @@ -298,7 +298,7 @@ MGLevelGlobalTransfer::copy_from_mg( #ifdef DEBUG_OUTPUT int ierr = MPI_Barrier(MPI_COMM_WORLD); AssertThrowMPI(ierr); - std::cout << "copy_from_mg src " << level << " " << src[level].l2_norm() + std::cout << "copy_from_mg src " << level << ' ' << src[level].l2_norm() << std::endl; ierr = MPI_Barrier(MPI_COMM_WORLD); AssertThrowMPI(ierr); @@ -323,7 +323,7 @@ MGLevelGlobalTransfer::copy_from_mg( dst.compress(VectorOperation::insert); ierr = MPI_Barrier(MPI_COMM_WORLD); AssertThrowMPI(ierr); - std::cout << "copy_from_mg level=" << level << " " << dst.l2_norm() + std::cout << "copy_from_mg level=" << level << ' ' << dst.l2_norm() << std::endl; } #endif diff --git a/include/deal.II/optimization/line_minimization.h b/include/deal.II/optimization/line_minimization.h index 408697fa45..5ae4cf4f36 100644 --- a/include/deal.II/optimization/line_minimization.h +++ b/include/deal.II/optimization/line_minimization.h @@ -595,8 +595,8 @@ namespace LineMinimization if (debug_output) deallog << "Bracketing phase: " << i << std::endl - << ai << " " << fi << " " << gi << " " << w1(ai, fi) << " " - << w2(gi) << " " << f_min << std::endl; + << ai << ' ' << fi << ' ' << gi << ' ' << w1(ai, fi) << ' ' + << w2(gi) << ' ' << f_min << std::endl; // first check if we can stop bracketing or the whole line search: if (fi <= f_min || ai == a_max) @@ -703,11 +703,11 @@ namespace LineMinimization if (debug_output) deallog << "Sectioning phase: " << i << std::endl - << a_lo << " " << f_lo << " " << g_lo << " " << w1(a_lo, f_lo) - << " " << w2(g_lo) << std::endl - << a_hi << " " << f_hi << " " << g_hi << " " << w1(a_hi, f_hi) - << " " << w2(g_hi) << std::endl - << ai << " " << fi << " " << gi << " " << w1(ai, fi) << " " + << a_lo << ' ' << f_lo << ' ' << g_lo << ' ' << w1(a_lo, f_lo) + << ' ' << w2(g_lo) << std::endl + << a_hi << ' ' << f_hi << ' ' << g_hi << ' ' << w1(a_hi, f_hi) + << ' ' << w2(g_hi) << std::endl + << ai << ' ' << fi << ' ' << gi << ' ' << w1(ai, fi) << ' ' << w2(gi) << std::endl; if (!w1(ai, fi) || fi >= f_lo) diff --git a/include/deal.II/physics/notation.h b/include/deal.II/physics/notation.h index 0410b0ad8e..1163e202db 100644 --- a/include/deal.II/physics/notation.h +++ b/include/deal.II/physics/notation.h @@ -305,7 +305,7 @@ namespace Physics int, int, << "The number of rows in the input matrix is " << arg1 - << ", but needs to be either " << arg2 << "," << arg3 + << ", but needs to be either " << arg2 << ',' << arg3 << ", or " << arg4 << '.'); @@ -330,7 +330,7 @@ namespace Physics int, int, << "The number of columns in the input matrix is " << arg1 - << ", but needs to be either " << arg2 << "," << arg3 + << ", but needs to be either " << arg2 << ',' << arg3 << ", or " << arg4 << '.'); diff --git a/tests/adolc/step-44.cc b/tests/adolc/step-44.cc index 5f2f2e9cc3..3790385964 100644 --- a/tests/adolc/step-44.cc +++ b/tests/adolc/step-44.cc @@ -1242,7 +1242,7 @@ namespace Step44 { std::cout << std::endl << "Timestep " << time.get_timestep() << " @ " << time.current() - << "s" << std::endl; + << 's' << std::endl; BlockVector newton_update(dofs_per_block); error_residual.reset(); error_residual_0.reset(); @@ -1254,7 +1254,7 @@ namespace Step44 unsigned int newton_iteration = 0; for (; newton_iteration < parameters.max_iterations_NR; ++newton_iteration) { - std::cout << " " << std::setw(2) << newton_iteration << " " + std::cout << ' ' << std::setw(2) << newton_iteration << ' ' << std::flush; tangent_matrix = 0.0; system_rhs = 0.0; @@ -1301,14 +1301,14 @@ namespace Step44 { static const unsigned int l_width = 155; for (unsigned int i = 0; i < l_width; ++i) - std::cout << "_"; + std::cout << '_'; std::cout << std::endl; std::cout << " SOLVER STEP " << " | LIN_IT LIN_RES RES_NORM " << " RES_U RES_P RES_J NU_NORM " << " NU_U NU_P NU_J " << std::endl; for (unsigned int i = 0; i < l_width; ++i) - std::cout << "_"; + std::cout << '_'; std::cout << std::endl; } template @@ -1317,7 +1317,7 @@ namespace Step44 { static const unsigned int l_width = 155; for (unsigned int i = 0; i < l_width; ++i) - std::cout << "_"; + std::cout << '_'; std::cout << std::endl; const std::pair error_dil = get_error_dilation(); std::cout << "Relative errors:" << std::endl diff --git a/tests/aniso/fe_tools.cc b/tests/aniso/fe_tools.cc index 567d26c7ae..15b4ef57c2 100644 --- a/tests/aniso/fe_tools.cc +++ b/tests/aniso/fe_tools.cc @@ -44,7 +44,7 @@ print_formatted(const FullMatrix &A, deallog << std::setw(width) << std::setprecision(precision) << A(i, j); else - deallog << std::setw(width) << std::setprecision(precision) << "~"; + deallog << std::setw(width) << std::setprecision(precision) << '~'; deallog << ' '; }; deallog << std::endl; diff --git a/tests/aniso/refine_and_coarsen_anisotropic.cc b/tests/aniso/refine_and_coarsen_anisotropic.cc index eae698e6fc..5061f3d0ef 100644 --- a/tests/aniso/refine_and_coarsen_anisotropic.cc +++ b/tests/aniso/refine_and_coarsen_anisotropic.cc @@ -105,7 +105,7 @@ test_isotropic(int type, std::ostream &logfile) GridOutFlags::EpsFlagsBase::width, 300, .01, false, 5, false); grid_out.set_flags(eps2); std::ostringstream filename; - filename << "grid_" << type << "_" << cycle << ".eps"; + filename << "grid_" << type << '_' << cycle << ".eps"; std::ofstream outfile(filename.str().c_str()); grid_out.write_eps(tria, outfile); } diff --git a/tests/base/aligned_vector_01.cc b/tests/base/aligned_vector_01.cc index 5f85221629..068f52acde 100644 --- a/tests/base/aligned_vector_01.cc +++ b/tests/base/aligned_vector_01.cc @@ -29,7 +29,7 @@ test() VEC a(4); deallog << "Constructor: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a[2] = 1; @@ -42,25 +42,25 @@ test() deallog << "Insertion: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a.resize(4); deallog << "Shrinking: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a.reserve(100); deallog << "Reserve: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a = b; deallog << "Assignment: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; // check setting elements for large vectors diff --git a/tests/base/aligned_vector_02.cc b/tests/base/aligned_vector_02.cc index a489ecc79a..2d82660f30 100644 --- a/tests/base/aligned_vector_02.cc +++ b/tests/base/aligned_vector_02.cc @@ -28,10 +28,10 @@ print_vec(VECVEC &v) { for (unsigned int i = 0; i < v.size(); ++i) { - deallog << "["; + deallog << '['; for (unsigned int j = 0; j < v[i].size(); ++j) - deallog << v[i][j] << " "; - deallog << "]"; + deallog << v[i][j] << ' '; + deallog << ']'; } deallog << std::endl; } diff --git a/tests/base/aligned_vector_03.cc b/tests/base/aligned_vector_03.cc index 830ac97ff0..f48461e9e5 100644 --- a/tests/base/aligned_vector_03.cc +++ b/tests/base/aligned_vector_03.cc @@ -28,7 +28,7 @@ test() VEC a(4); deallog << "Constructor: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a[2] = true; @@ -41,25 +41,25 @@ test() deallog << "Insertion: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a.resize(4); deallog << "Shrinking: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a.reserve(100); deallog << "Reserve: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a = b; deallog << "Assignment: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; // check setting elements for large vectors diff --git a/tests/base/aligned_vector_05.cc b/tests/base/aligned_vector_05.cc index 9b9047f4fb..b0864fec3e 100644 --- a/tests/base/aligned_vector_05.cc +++ b/tests/base/aligned_vector_05.cc @@ -53,11 +53,11 @@ test() AlignedVector vec; vec.push_back(foo(3)); vec.resize(2, foo(6)); - deallog << vec[0].element() << " " << vec[1].element() << std::endl; + deallog << vec[0].element() << ' ' << vec[1].element() << std::endl; vec[1] = foo(13); - deallog << vec[0].element() << " " << vec[1].element() << std::endl; + deallog << vec[0].element() << ' ' << vec[1].element() << std::endl; vec.reserve(3); - deallog << vec[0].element() << " " << vec[1].element() << std::endl; + deallog << vec[0].element() << ' ' << vec[1].element() << std::endl; } diff --git a/tests/base/aligned_vector_move.cc b/tests/base/aligned_vector_move.cc index ec662e4c2e..b0b55cebe3 100644 --- a/tests/base/aligned_vector_move.cc +++ b/tests/base/aligned_vector_move.cc @@ -37,7 +37,7 @@ test() deallog << "Contents of new VEC: "; for (unsigned int i = 0; i < b.size(); ++i) - deallog << b[i] << " "; + deallog << b[i] << ' '; deallog << std::endl; a.resize(6, 42); @@ -46,7 +46,7 @@ test() deallog << "Contents of new VEC: "; for (unsigned int i = 0; i < a.size(); ++i) - deallog << a[i] << " "; + deallog << a[i] << ' '; deallog << std::endl; a = std::move(b); diff --git a/tests/base/anisotropic_2.cc b/tests/base/anisotropic_2.cc index 605e56de74..a4e278d45a 100644 --- a/tests/base/anisotropic_2.cc +++ b/tests/base/anisotropic_2.cc @@ -37,14 +37,14 @@ print_2d(const AnisotropicPolynomials<2> &aniso) deallog << std::endl; for (unsigned int j = 0; j <= M; ++j) { - deallog << 1. * i / N << " " << 1. * j / M << " "; + deallog << 1. * i / N << ' ' << 1. * j / M << ' '; for (unsigned int k = 0; k < aniso.n(); ++k) deallog << aniso.compute_value(k, Point<2>(1. * i / N, 1. * j / M)) - << " "; + << ' '; deallog << std::endl; for (unsigned int k = 0; k < aniso.n(); ++k) deallog << aniso.compute_grad(k, Point<2>(1. * i / N, 1. * j / M)) - << " "; + << ' '; deallog << std::endl; } } @@ -88,16 +88,16 @@ print_3d(const AnisotropicPolynomials<3> &aniso) deallog << std::endl; for (unsigned int k = 0; k <= P; ++k) { - deallog << 1. * i / N << " " << 1. * j / M << " " << 1. * k / P; + deallog << 1. * i / N << ' ' << 1. * j / M << ' ' << 1. * k / P; for (unsigned int k = 0; k < aniso.n(); ++k) deallog << aniso.compute_value( k, Point<3>(1. * i / N, 1. * j / M, 1. * k / P)) - << " "; + << ' '; deallog << std::endl; for (unsigned int k = 0; k < aniso.n(); ++k) deallog << aniso.compute_grad( k, Point<3>(1. * i / N, 1. * j / M, 1. * k / P)) - << " "; + << ' '; deallog << std::endl; } } diff --git a/tests/base/bounding_box_1.cc b/tests/base/bounding_box_1.cc index 8daaf493e7..6d59ef03e3 100644 --- a/tests/base/bounding_box_1.cc +++ b/tests/base/bounding_box_1.cc @@ -45,7 +45,7 @@ test_bounding_box() deallog << b.get_boundary_points().second << std::endl; deallog << "Boundary points are inside: " << b.point_inside(boundaries.first) - << " " << b.point_inside(boundaries.second) << std::endl; + << ' ' << b.point_inside(boundaries.second) << std::endl; std::vector> test_points; @@ -126,12 +126,12 @@ test_unitary() Point<3> p3(0, 0, 1.0); deallog << "Checking if all vertices are inside: " - << b.point_inside(boundaries.first) << " " + << b.point_inside(boundaries.first) << ' ' << b.point_inside(boundaries.second) << std::endl; - deallog << b.point_inside(p1) << " " << b.point_inside(p2) << " " - << b.point_inside(p3) << " " << b.point_inside(p1 + p2) << " " - << b.point_inside(p2 + p3) << " " << b.point_inside(p1 + p3) << " " + deallog << b.point_inside(p1) << ' ' << b.point_inside(p2) << ' ' + << b.point_inside(p3) << ' ' << b.point_inside(p1 + p2) << ' ' + << b.point_inside(p2 + p3) << ' ' << b.point_inside(p1 + p3) << ' ' << std::endl; double eps = std::numeric_limits::epsilon(); diff --git a/tests/base/bounding_box_6.cc b/tests/base/bounding_box_6.cc index 059298b3c8..67e933436b 100644 --- a/tests/base/bounding_box_6.cc +++ b/tests/base/bounding_box_6.cc @@ -38,8 +38,8 @@ print_box(const BoundingBox &box) for (unsigned int d = 0; d < dim; ++d) { if (d > 0) - deallog << "x"; - deallog << "[" << box.lower_bound(d) << ", " << box.upper_bound(d) << "]"; + deallog << 'x'; + deallog << '[' << box.lower_bound(d) << ", " << box.upper_bound(d) << ']'; } deallog << std::endl; } @@ -112,7 +112,7 @@ test_side_length() const BoundingBox box(lower_upper_corners); for (unsigned int d = 0; d < dim; ++d) - deallog << box.side_length(d) << " "; + deallog << box.side_length(d) << ' '; deallog << std::endl; } diff --git a/tests/base/consensus_algorithm_01.cc b/tests/base/consensus_algorithm_01.cc index 0cdb1d35e4..af64ddd2b0 100644 --- a/tests/base/consensus_algorithm_01.cc +++ b/tests/base/consensus_algorithm_01.cc @@ -57,7 +57,7 @@ test(const MPI_Comm &comm) .run(); for (const auto &i : sources) - deallog << i << " "; + deallog << i << ' '; deallog << std::endl; } diff --git a/tests/base/derivative_forms_04.cc b/tests/base/derivative_forms_04.cc index 86e8072352..28422e48f0 100644 --- a/tests/base/derivative_forms_04.cc +++ b/tests/base/derivative_forms_04.cc @@ -33,7 +33,7 @@ test() } // output the determinants of these objects - deallog << "det(dF): " << dF.determinant().real() << " " + deallog << "det(dF): " << dF.determinant().real() << ' ' << dF.determinant().imag() << std::endl; } diff --git a/tests/base/function_from_function_objects_01.cc b/tests/base/function_from_function_objects_01.cc index 5fb967433a..31a14c431b 100644 --- a/tests/base/function_from_function_objects_01.cc +++ b/tests/base/function_from_function_objects_01.cc @@ -56,7 +56,7 @@ main() Vector v(2); fun2.vector_value(p, v); - deallog << v(0) << " " << v(1) << std::endl; + deallog << v(0) << ' ' << v(1) << std::endl; deallog << fun3.gradient(p) << std::endl; diff --git a/tests/base/function_parser_02.cc b/tests/base/function_parser_02.cc index 6a8931c1d5..90658ea6fc 100644 --- a/tests/base/function_parser_02.cc +++ b/tests/base/function_parser_02.cc @@ -54,12 +54,9 @@ main() function, constants); - deallog << "Function " - << "[" << function[0] << "]" - << " @point " - << "[" << point << "]" - << " is " - << "[" << fp.value(point) << "]" << std::endl; + deallog << "Function " << '[' << function[0] << ']' << " @point " << '[' + << point << ']' << " is " << '[' << fp.value(point) << ']' + << std::endl; // now initialize with a function // that's a string, not vector of @@ -69,12 +66,9 @@ main() function[0], constants); - deallog << "Function " - << "[" << function[0] << "]" - << " @point " - << "[" << point << "]" - << " is " - << "[" << fp4.value(point) << "]" << std::endl; + deallog << "Function " << '[' << function[0] << ']' << " @point " << '[' + << point << ']' << " is " << '[' << fp4.value(point) << ']' + << std::endl; // now initialize a function without // units to check backwards @@ -84,12 +78,9 @@ main() fp2.initialize(FunctionParser<2>::default_variable_names(), function, constants); - deallog << "Function " - << "[" << function[0] << "]" - << " @point " - << "[" << point << "]" - << " is " - << "[" << fp2.value(point) << "]" << std::endl; + deallog << "Function " << '[' << function[0] << ']' << " @point " << '[' + << point << ']' << " is " << '[' << fp2.value(point) << ']' + << std::endl; @@ -100,10 +91,7 @@ main() function[0], constants); - deallog << "Function " - << "[" << function[0] << "]" - << " @point " - << "[" << point << "]" - << " is " - << "[" << fp3.value(point) << "]" << std::endl; + deallog << "Function " << '[' << function[0] << ']' << " @point " << '[' + << point << ']' << " is " << '[' << fp3.value(point) << ']' + << std::endl; } diff --git a/tests/base/function_parser_05.cc b/tests/base/function_parser_05.cc index 1a3dcd57ec..6b6d33143e 100644 --- a/tests/base/function_parser_05.cc +++ b/tests/base/function_parser_05.cc @@ -84,7 +84,7 @@ test2() double c = vector_function.value(point, 1); // Output the evaluated function - deallog << "Function '" << expressions[0] << "," << expressions[1] << "'" + deallog << "Function '" << expressions[0] << ',' << expressions[1] << "'" << " @ " << point << " is " << std::flush; result.print(deallog.get_file_stream(), 4, false); deallog.get_file_stream() << "DEAL::" << std::endl; diff --git a/tests/base/function_parser_08.cc b/tests/base/function_parser_08.cc index 0f11e5fb5c..110b15c0c9 100644 --- a/tests/base/function_parser_08.cc +++ b/tests/base/function_parser_08.cc @@ -85,7 +85,7 @@ test2() Assert(c == result[1], ExcInternalError()); // Output the evaluated function - deallog << "Function '" << expressions[0] << "," << expressions[1] << "'" + deallog << "Function '" << expressions[0] << ',' << expressions[1] << "'" << " @ " << point << " is " << result << std::endl; } diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc index 87ee67901d..3bd6ed1eaa 100644 --- a/tests/base/functions_04.cc +++ b/tests/base/functions_04.cc @@ -145,10 +145,10 @@ check_function(const Functions::FlowFunction &f, << " )" << " comp " << k - // << " norms " << d1.norm() << " " << d2.norm() + // << " norms " << d1.norm() << ' ' << d2.norm() << std::endl; for (unsigned int d = 0; d < dim; ++d) - deallog << " " << gradients[k][i][d] << " " + deallog << ' ' << gradients[k][i][d] << ' ' << gradients1[i][k][d] << std::endl; } } @@ -164,7 +164,7 @@ check_function(const Functions::FlowFunction &f, for (unsigned int d = 0; d < dim; ++d) div += gradients[d][k][d]; if (std::fabs(div) > 1.e-13) - deallog << "Divergence " << k << " " << div << std::endl; + deallog << "Divergence " << k << ' ' << div << std::endl; } deallog << "tested" << std::endl; diff --git a/tests/base/functions_09.cc b/tests/base/functions_09.cc index b892762016..9969d83c8e 100644 --- a/tests/base/functions_09.cc +++ b/tests/base/functions_09.cc @@ -57,7 +57,7 @@ struct PrintTensor for (int i = 0; i < dim; ++i) { PrintTensor::print_tensor(tensor[i]); - deallog << " "; + deallog << ' '; } } }; @@ -69,7 +69,7 @@ struct PrintTensor<1, dim> print_tensor(const Tensor<1, dim> &tensor) { for (int i = 0; i < dim; ++i) - deallog << tensor[i] << " "; + deallog << tensor[i] << ' '; } }; diff --git a/tests/base/functions_12.cc b/tests/base/functions_12.cc index 3a3c7d3d70..4c64684dbe 100644 --- a/tests/base/functions_12.cc +++ b/tests/base/functions_12.cc @@ -48,14 +48,14 @@ check() { deallog << coeffs[i]; for (unsigned int d = 0; d < dim; ++d) - deallog << " x" << d << "^" << exponents[i][d]; + deallog << " x" << d << '^' << exponents[i][d]; if (i < n_mon - 1) deallog << " + "; } deallog << std::endl; deallog << "Point: "; for (unsigned int d = 0; d < dim; ++d) - deallog << p[d] << " "; + deallog << p[d] << ' '; deallog << std::endl; deallog << "Value: " << poly.value(p) << std::endl; diff --git a/tests/base/functions_cspline.cc b/tests/base/functions_cspline.cc index e0ddef91e3..3a291677e3 100644 --- a/tests/base/functions_cspline.cc +++ b/tests/base/functions_cspline.cc @@ -46,7 +46,7 @@ check() for (double xi = x[0]; xi <= x.back(); xi += 0.01) { const double yi = gsl_spline_eval(spline, xi, acc); - // deallog << xi << " " << yi << std::endl; + // deallog << xi << ' ' << yi << std::endl; y_native.push_back(yi); } gsl_spline_free(spline); @@ -59,7 +59,7 @@ check() for (double xi = x[0]; xi <= x.back(); xi += 0.01) { const double yi = cspline.value(Point(xi)); - // deallog << xi << " " << yi << std::endl; + // deallog << xi << ' ' << yi << std::endl; y_dealii.push_back(yi); } } diff --git a/tests/base/functions_incremental_01.cc b/tests/base/functions_incremental_01.cc index 36264db4c7..1d1d37eaf8 100644 --- a/tests/base/functions_incremental_01.cc +++ b/tests/base/functions_incremental_01.cc @@ -76,12 +76,12 @@ check() func.set_time(el.first); func.vector_value(point, v1); v1.print(deallog.get_file_stream()); - deallog << "-" << std::endl; + deallog << '-' << std::endl; func.set_time(el.first - el.second); func.vector_value(point, v2); v2.print(deallog.get_file_stream()); - deallog << "=" << std::endl; + deallog << '=' << std::endl; inc.set_time(el.first); inc.set_decrement(el.second); diff --git a/tests/base/functions_incremental_02.cc b/tests/base/functions_incremental_02.cc index 8f274860c2..b808f6c1bd 100644 --- a/tests/base/functions_incremental_02.cc +++ b/tests/base/functions_incremental_02.cc @@ -79,12 +79,12 @@ check() func.set_time(el.first); func.vector_value(point, v1); v1.print(deallog.get_file_stream()); - deallog << "-" << std::endl; + deallog << '-' << std::endl; func.set_time(el.first - el.second); func.vector_value(point, v2); v2.print(deallog.get_file_stream()); - deallog << "=" << std::endl; + deallog << '=' << std::endl; inc.set_time(el.first); inc.set_decrement(el.second); diff --git a/tests/base/functions_singularity.cc b/tests/base/functions_singularity.cc index 3788e86969..b7488390a6 100644 --- a/tests/base/functions_singularity.cc +++ b/tests/base/functions_singularity.cc @@ -184,10 +184,10 @@ check_function_derivative(const Functions::FlowFunction &f, << " )" << " comp " << k - // << " norms " << d1.norm() << " " << d2.norm() + // << " norms " << d1.norm() << ' ' << d2.norm() << std::endl; for (unsigned int d = 0; d < dim; ++d) - deallog << " " << gradients[k][i][d] << " " + deallog << ' ' << gradients[k][i][d] << ' ' << gradients1[i][k][d] << std::endl; } } @@ -203,7 +203,7 @@ check_function_derivative(const Functions::FlowFunction &f, for (unsigned int d = 0; d < dim; ++d) div += gradients[d][k][d]; if (std::fabs(div) > 1.e-13) - deallog << "Divergence " << k << " " << div << std::endl; + deallog << "Divergence " << k << ' ' << div << std::endl; } deallog << "tested" << std::endl; diff --git a/tests/base/gauss_lobatto.cc b/tests/base/gauss_lobatto.cc index c522118337..b0d3c5d9de 100644 --- a/tests/base/gauss_lobatto.cc +++ b/tests/base/gauss_lobatto.cc @@ -28,7 +28,7 @@ main() for (unsigned int n = 2; n < 20; ++n) { - deallog << "QGaussLobatto(" << n << ")" << std::endl; + deallog << "QGaussLobatto(" << n << ')' << std::endl; QGaussLobatto<1> q(n); for (unsigned int i = 0; i < q.size(); ++i) diff --git a/tests/base/geometric_utilities_01.cc b/tests/base/geometric_utilities_01.cc index 8c52cc3fa2..d505ce181e 100644 --- a/tests/base/geometric_utilities_01.cc +++ b/tests/base/geometric_utilities_01.cc @@ -31,11 +31,11 @@ print(T point1, T point2) { deallog << std::endl << "Point 1: "; for (unsigned int i = 0; i < dim; ++i) - deallog << point1[i] << " "; + deallog << point1[i] << ' '; deallog << std::endl << "Point 2: "; for (unsigned int i = 0; i < dim; ++i) - deallog << point2[i] << " "; + deallog << point2[i] << ' '; deallog << std::endl; } diff --git a/tests/base/geometry_info_2.cc b/tests/base/geometry_info_2.cc index ef2a4af0ab..7a16bd41cc 100644 --- a/tests/base/geometry_info_2.cc +++ b/tests/base/geometry_info_2.cc @@ -51,7 +51,7 @@ test() for (const unsigned int f : GeometryInfo::face_indices()) deallog << "face normal" << f << ' ' << (GeometryInfo::unit_normal_orientation[f] > 0. ? '+' : '-') - << "x" << GeometryInfo::unit_normal_direction[f] << std::endl; + << 'x' << GeometryInfo::unit_normal_direction[f] << std::endl; for (const unsigned int f : GeometryInfo::face_indices()) { diff --git a/tests/base/geometry_info_3.cc b/tests/base/geometry_info_3.cc index bf7105ee4c..7bc712ac7c 100644 --- a/tests/base/geometry_info_3.cc +++ b/tests/base/geometry_info_3.cc @@ -27,7 +27,7 @@ template void test() { - deallog << "Checking in " << dim << "d" << std::endl; + deallog << "Checking in " << dim << 'd' << std::endl; for (const unsigned int f : GeometryInfo::face_indices()) for (unsigned int v = 0; v < GeometryInfo::vertices_per_face; ++v) diff --git a/tests/base/geometry_info_4.cc b/tests/base/geometry_info_4.cc index d635fedbb2..06382b0091 100644 --- a/tests/base/geometry_info_4.cc +++ b/tests/base/geometry_info_4.cc @@ -27,7 +27,7 @@ template void test() { - deallog << "Checking in " << dim << "d" << std::endl; + deallog << "Checking in " << dim << 'd' << std::endl; // check phi_i(v_j) = delta_{ij} for (const unsigned int i : GeometryInfo::vertex_indices()) diff --git a/tests/base/geometry_info_5.cc b/tests/base/geometry_info_5.cc index a308d618da..e12b6cbe17 100644 --- a/tests/base/geometry_info_5.cc +++ b/tests/base/geometry_info_5.cc @@ -27,7 +27,7 @@ template void test() { - deallog << "Checking in " << dim << "d" << std::endl; + deallog << "Checking in " << dim << 'd' << std::endl; // check phi_i(v_j) = delta_{ij} for (const unsigned int i : GeometryInfo::vertex_indices()) diff --git a/tests/base/geometry_info_6.cc b/tests/base/geometry_info_6.cc index 5ecd3bf107..9c97f78a01 100644 --- a/tests/base/geometry_info_6.cc +++ b/tests/base/geometry_info_6.cc @@ -27,7 +27,7 @@ template void test() { - deallog << "Checking in " << dim << "d" << std::endl; + deallog << "Checking in " << dim << 'd' << std::endl; // check the determinant of the // transformation for the reference diff --git a/tests/base/geometry_info_7.cc b/tests/base/geometry_info_7.cc index e9ab9b7734..84cb534deb 100644 --- a/tests/base/geometry_info_7.cc +++ b/tests/base/geometry_info_7.cc @@ -27,7 +27,7 @@ template void test() { - deallog << "Checking in " << dim << "d" << std::endl; + deallog << "Checking in " << dim << 'd' << std::endl; // check the determinant of the // transformation for the reference diff --git a/tests/base/geometry_info_8.cc b/tests/base/geometry_info_8.cc index 0739671f85..2029ebe08c 100644 --- a/tests/base/geometry_info_8.cc +++ b/tests/base/geometry_info_8.cc @@ -34,14 +34,14 @@ test_vertices() for (const unsigned int i : GeometryInfo::face_indices()) { - deallog << "face " << i << ":" << std::endl; + deallog << "face " << i << ':' << std::endl; for (unsigned int o = 0; o < 8; ++o) { const std::bitset<3> orientation = o; deallog << "orientation " << orientation[0] << ", flip " - << orientation[1] << ", rotation " << orientation[2] << ":" + << orientation[1] << ", rotation " << orientation[2] << ':' << std::endl << " "; @@ -67,14 +67,14 @@ test_lines() for (const unsigned int i : GeometryInfo::face_indices()) { - deallog << "face " << i << ":" << std::endl; + deallog << "face " << i << ':' << std::endl; for (unsigned int o = 0; o < 8; ++o) { const std::bitset<3> orientation = o; deallog << "orientation " << orientation[0] << ", flip " - << orientation[1] << ", rotation " << orientation[2] << ":" + << orientation[1] << ", rotation " << orientation[2] << ':' << std::endl << " "; diff --git a/tests/base/graph_coloring_01.cc b/tests/base/graph_coloring_01.cc index 3f19211f3a..7dbc8ee5c0 100644 --- a/tests/base/graph_coloring_01.cc +++ b/tests/base/graph_coloring_01.cc @@ -76,7 +76,7 @@ check() deallog << "Color: " << color << std::endl; for (unsigned int i = 0; i < coloring[color].size(); ++i) for (unsigned int j = 0; j < dim; ++j) - deallog << coloring[color][i]->center()[j] << " "; + deallog << coloring[color][i]->center()[j] << ' '; deallog << std::endl; } } diff --git a/tests/base/graph_coloring_02.cc b/tests/base/graph_coloring_02.cc index febdbd044c..c6095c7527 100644 --- a/tests/base/graph_coloring_02.cc +++ b/tests/base/graph_coloring_02.cc @@ -85,7 +85,7 @@ check() deallog << "Color: " << color << std::endl; for (unsigned int i = 0; i < coloring[color].size(); ++i) for (unsigned int j = 0; j < dim; ++j) - deallog << coloring[color][i]->center()[j] << " "; + deallog << coloring[color][i]->center()[j] << ' '; deallog << std::endl; } } diff --git a/tests/base/graph_coloring_03.cc b/tests/base/graph_coloring_03.cc index bce5e83ed1..a499b16b6b 100644 --- a/tests/base/graph_coloring_03.cc +++ b/tests/base/graph_coloring_03.cc @@ -88,7 +88,7 @@ check() deallog << "Color: " << color << std::endl; for (unsigned int i = 0; i < coloring[color].size(); ++i) for (unsigned int j = 0; j < dim; ++j) - deallog << coloring[color][i]->center()[j] << " "; + deallog << coloring[color][i]->center()[j] << ' '; deallog << std::endl; } } diff --git a/tests/base/hdf5_03.cc b/tests/base/hdf5_03.cc index 6bebeb512d..816b06c814 100644 --- a/tests/base/hdf5_03.cc +++ b/tests/base/hdf5_03.cc @@ -197,7 +197,7 @@ write_test(HDF5::Group & root_group, type_name = std::string("unsigned int"); } - deallog << "Write tests for " << container_name << "<" << type_name << ">" + deallog << "Write tests for " << container_name << '<' << type_name << '>' << " datasets" << std::endl; auto group = root_group.create_group(container_name + "<" + type_name + ">"); @@ -207,15 +207,15 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0) @@ -226,18 +226,18 @@ write_test(HDF5::Group & root_group, { dataset.template write_none(); } - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << container_sum(data) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -247,15 +247,15 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; std::vector coordinates_a = {0, 0, // first point @@ -305,21 +305,20 @@ write_test(HDF5::Group & root_group, { dataset.template write_none(); } - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data_a) + container_sum(data_b) + container_sum(data_c) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -333,15 +332,15 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0) @@ -352,9 +351,9 @@ write_test(HDF5::Group & root_group, { dataset.template write_none(); } - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << container_sum(data) << std::endl; + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data) + << std::endl; } else if (std::is_same::value) { @@ -372,18 +371,18 @@ write_test(HDF5::Group & root_group, { dataset.template write_none(); } - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << container_sum(data) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -394,15 +393,15 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; const std::vector hyperslab_dimensions_a = {2, 5}; const std::vector hyperslab_offset_a = {0, 0}; auto hyperslab_data_a = @@ -454,28 +453,27 @@ write_test(HDF5::Group & root_group, dataset.template write_none(); } - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(hyperslab_data_a) + container_sum(hyperslab_data_b) + container_sum(hyperslab_data_c) << std::endl; - deallog << "Hyperslab_a sum " + dataset_name << " " << container_name << "<" - << type_name << ">" + deallog << "Hyperslab_a sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(hyperslab_data_a) << std::endl; - deallog << "Hyperslab_b sum " + dataset_name << " " << container_name << "<" - << type_name << ">" + deallog << "Hyperslab_b sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(hyperslab_data_b) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -527,7 +525,7 @@ read_test(HDF5::Group root_group, type_name = std::string("unsigned int"); } - deallog << "Read tests for " << container_name << "<" << type_name << ">" + deallog << "Read tests for " << container_name << '<' << type_name << '>' << " datasets" << std::endl; auto group = root_group.open_group(container_name + "<" + type_name + ">"); @@ -536,28 +534,28 @@ read_test(HDF5::Group root_group, std::string dataset_name("dataset_1"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -566,29 +564,29 @@ read_test(HDF5::Group root_group, std::string dataset_name("dataset_2"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; { Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -604,19 +602,19 @@ read_test(HDF5::Group root_group, 12}; // fourth point auto data_a = dataset.template read_selection>(coordinates_a); - deallog << "Selection " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << data_a[0] << ", " << data_a[1] << ", " - << data_a[2] << ", " << data_a[3] << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Selection " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << data_a[0] << ", " + << data_a[1] << ", " << data_a[2] << ", " << data_a[3] + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -631,28 +629,28 @@ read_test(HDF5::Group root_group, std::string dataset_name("dataset_3"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -662,29 +660,29 @@ read_test(HDF5::Group root_group, std::string dataset_name("dataset_4"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; { Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -695,18 +693,18 @@ read_test(HDF5::Group root_group, auto data_a = dataset.read_hyperslab>(hyperslab_offset_a, hyperslab_count_a); - deallog << "Hyperslab_a sum " + dataset_name << " " << container_name - << "<" << type_name << ">" - << " (Read): " << container_sum(data_a) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Hyperslab_a sum " + dataset_name << ' ' << container_name + << '<' << type_name << '>' << " (Read): " << container_sum(data_a) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -732,18 +730,18 @@ read_test(HDF5::Group root_group, dataset.read_none(); } } - deallog << "Hyperslab_b sum " + dataset_name << " " << container_name - << "<" << type_name << ">" - << " (Read): " << container_sum(data_b) << std::endl; - pcout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Hyperslab_b sum " + dataset_name << ' ' << container_name + << '<' << type_name << '>' << " (Read): " << container_sum(data_b) + << std::endl; + pcout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + pcout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + pcout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } diff --git a/tests/base/hdf5_04.cc b/tests/base/hdf5_04.cc index 1807ccc428..2389ed8662 100644 --- a/tests/base/hdf5_04.cc +++ b/tests/base/hdf5_04.cc @@ -194,7 +194,7 @@ write_test(HDF5::Group & root_group, type_name = std::string("unsigned int"); } - deallog << "Write tests for " << container_name << "<" << type_name << ">" + deallog << "Write tests for " << container_name << '<' << type_name << '>' << " datasets" << std::endl; auto group = root_group.create_group(container_name + "<" + type_name + ">"); @@ -204,30 +204,30 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); dataset.write(data); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << container_sum(data) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -237,15 +237,15 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; std::vector coordinates_a = {0, 0, // first point @@ -282,21 +282,20 @@ write_test(HDF5::Group & root_group, dataset.write_selection(data_a, coordinates_a); dataset.write_selection(data_b, coordinates_b); dataset.write_selection(data_c, coordinates_c); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data_a) + container_sum(data_b) + container_sum(data_c) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -310,21 +309,21 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); dataset.write(data); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << container_sum(data) << std::endl; + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data) + << std::endl; } else if (std::is_same::value) { @@ -335,18 +334,18 @@ write_test(HDF5::Group & root_group, auto data = initialize_container(dataset_dimensions); assign_data(data); dataset.write(data); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << container_sum(data) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -357,15 +356,15 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_rank() + << std::endl; const std::vector hyperslab_dimensions_a = {2, 5}; const std::vector hyperslab_offset_a = {0, 0}; auto hyperslab_data_a = @@ -400,28 +399,27 @@ write_test(HDF5::Group & root_group, hyperslab_count_c, hyperslab_block_c); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(hyperslab_data_a) + container_sum(hyperslab_data_b) + container_sum(hyperslab_data_c) << std::endl; - deallog << "Hyperslab_a sum " + dataset_name << " " << container_name << "<" - << type_name << ">" + deallog << "Hyperslab_a sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(hyperslab_data_a) << std::endl; - deallog << "Hyperslab_b sum " + dataset_name << " " << container_name << "<" - << type_name << ">" + deallog << "Hyperslab_b sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(hyperslab_data_b) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -431,9 +429,9 @@ write_test(HDF5::Group & root_group, auto data = initialize_container(dataset_dimensions); assign_data(data); group.write_dataset(dataset_name, data); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Write): " << container_sum(data) << std::endl; + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Write): " << container_sum(data) + << std::endl; } } @@ -481,7 +479,7 @@ read_test(HDF5::Group root_group) type_name = std::string("unsigned int"); } - deallog << "Read tests for " << container_name << "<" << type_name << ">" + deallog << "Read tests for " << container_name << '<' << type_name << '>' << " datasets" << std::endl; auto group = root_group.open_group(container_name + "<" + type_name + ">"); @@ -490,28 +488,28 @@ read_test(HDF5::Group root_group) std::string dataset_name("dataset_1"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -520,29 +518,29 @@ read_test(HDF5::Group root_group) std::string dataset_name("dataset_2"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; { Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -558,19 +556,19 @@ read_test(HDF5::Group root_group) 12}; // fourth point auto data_a = dataset.template read_selection>(coordinates_a); - deallog << "Selection " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << data_a[0] << ", " << data_a[1] << ", " - << data_a[2] << ", " << data_a[3] << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Selection " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << data_a[0] << ", " + << data_a[1] << ", " << data_a[2] << ", " << data_a[3] + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -585,28 +583,28 @@ read_test(HDF5::Group root_group) std::string dataset_name("dataset_3"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -616,29 +614,29 @@ read_test(HDF5::Group root_group) std::string dataset_name("dataset_4"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; { Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -649,18 +647,18 @@ read_test(HDF5::Group root_group) auto data_a = dataset.read_hyperslab>(hyperslab_offset_a, hyperslab_count_a); - deallog << "Hyperslab_a sum " + dataset_name << " " << container_name - << "<" << type_name << ">" - << " (Read): " << container_sum(data_a) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Hyperslab_a sum " + dataset_name << ' ' << container_name + << '<' << type_name << '>' << " (Read): " << container_sum(data_a) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -671,18 +669,18 @@ read_test(HDF5::Group root_group) Container data_b; data_b = dataset.read_hyperslab>(hyperslab_offset_b, hyperslab_count_b); - deallog << "Hyperslab_b sum " + dataset_name << " " << container_name - << "<" << type_name << ">" - << " (Read): " << container_sum(data_b) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Hyperslab_b sum " + dataset_name << ' ' << container_name + << '<' << type_name << '>' << " (Read): " << container_sum(data_b) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -692,28 +690,28 @@ read_test(HDF5::Group root_group) std::string dataset_name("dataset_5"); auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_rank() << std::endl; + deallog << "Dimensions " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_dimensions() + << std::endl; + deallog << "Size " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_size() + << std::endl; + deallog << "Rank " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_rank() + << std::endl; Container data = dataset.read>(); - deallog << "Sum " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << container_sum(data) << std::endl; - std::cout << "IO mode " + dataset_name << " " << container_name << "<" - << type_name << ">" - << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + deallog << "Sum " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << container_sum(data) + << std::endl; + std::cout << "IO mode " + dataset_name << ' ' << container_name << '<' + << type_name << '>' << " (Read): " << dataset.get_io_mode() + << std::endl; + std::cout << "Local no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << " " - << container_name << "<" << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << ' ' + << container_name << '<' << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; } diff --git a/tests/base/hdf5_05.cc b/tests/base/hdf5_05.cc index 94fdb47088..d40de2ccef 100644 --- a/tests/base/hdf5_05.cc +++ b/tests/base/hdf5_05.cc @@ -239,11 +239,11 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); @@ -255,17 +255,15 @@ write_test(HDF5::Group & root_group, { dataset.template write_none(); } - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Write): " << container_to_string(data) << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -284,11 +282,11 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); @@ -300,17 +298,15 @@ write_test(HDF5::Group & root_group, { dataset.template write_none(); } - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Write): " << container_to_string(data) << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -329,11 +325,11 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0) @@ -345,14 +341,13 @@ write_test(HDF5::Group & root_group, const std::vector hyperslab_count = {1, 5, 3}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -367,28 +362,26 @@ write_test(HDF5::Group & root_group, const std::vector hyperslab_count = {1, 5, 3}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } else { dataset.template write_none(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -410,11 +403,11 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0) @@ -426,14 +419,13 @@ write_test(HDF5::Group & root_group, const std::vector hyperslab_count = {3, 1, 4}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -448,28 +440,26 @@ write_test(HDF5::Group & root_group, const std::vector hyperslab_count = {3, 1, 4}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } else { dataset.template write_none(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -492,11 +482,11 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0) @@ -517,14 +507,13 @@ write_test(HDF5::Group & root_group, dataset.write_selection(data, coordinates); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -546,14 +535,13 @@ write_test(HDF5::Group & root_group, dataset.write_selection(data, coordinates); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -578,28 +566,26 @@ write_test(HDF5::Group & root_group, dataset.write_selection(data, coordinates); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } else { dataset.template write_none(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -622,11 +608,11 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0) @@ -642,14 +628,13 @@ write_test(HDF5::Group & root_group, dataset.write_hyperslab( data, data_dimensions, offset, stride, count, block); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -667,28 +652,26 @@ write_test(HDF5::Group & root_group, dataset.write_hyperslab( data, data_dimensions, offset, stride, count, block); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } else { dataset.template write_none(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -711,11 +694,11 @@ write_test(HDF5::Group & root_group, auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0) @@ -740,14 +723,13 @@ write_test(HDF5::Group & root_group, dataset.write_selection(data, coordinates); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -773,14 +755,13 @@ write_test(HDF5::Group & root_group, dataset.write_selection(data, coordinates); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -810,28 +791,26 @@ write_test(HDF5::Group & root_group, dataset.write_selection(data, coordinates); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } else { dataset.template write_none(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + pcout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -866,27 +845,25 @@ read_test(HDF5::Group root_group, auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -898,18 +875,16 @@ read_test(HDF5::Group root_group, hyperslab_count); pcout << "Column vector" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Column vector " + dataset_name << "<" << type_name << ">" + deallog << "Column vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -921,18 +896,16 @@ read_test(HDF5::Group root_group, hyperslab_count); pcout << "Row vector" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Row vector " + dataset_name << "<" << type_name << ">" + deallog << "Row vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -944,18 +917,16 @@ read_test(HDF5::Group root_group, hyperslab_count); pcout << "Sub-matrix" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -973,27 +944,25 @@ read_test(HDF5::Group root_group, auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1005,18 +974,16 @@ read_test(HDF5::Group root_group, hyperslab_count); pcout << "Column vector" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Column vector " + dataset_name << "<" << type_name << ">" + deallog << "Column vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1028,18 +995,16 @@ read_test(HDF5::Group root_group, hyperslab_count); pcout << "Row vector" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Row vector " + dataset_name << "<" << type_name << ">" + deallog << "Row vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1051,18 +1016,16 @@ read_test(HDF5::Group root_group, hyperslab_count); pcout << "Sub-matrix" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1074,18 +1037,16 @@ read_test(HDF5::Group root_group, hyperslab_count); pcout << "Sub-matrix" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1102,18 +1063,16 @@ read_test(HDF5::Group root_group, data_dimensions, offset, stride, count, block); pcout << "Sub-matrix" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1138,20 +1097,17 @@ read_test(HDF5::Group root_group, auto data = dataset.read_selection>(coordinates); pcout << "Sub-matrix" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Selection std::vector " + dataset_name << "<" << type_name - << ">" - << " (Read): " << container_to_string(data) << std::endl; + deallog << "Selection std::vector " + dataset_name << '<' << type_name + << '>' << " (Read): " << container_to_string(data) << std::endl; } { @@ -1175,18 +1131,16 @@ read_test(HDF5::Group root_group, auto data = dataset.read_selection>(coordinates); pcout << "Sub-matrix" << std::endl; - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Selection Vector " + dataset_name << "<" << type_name << ">" + deallog << "Selection Vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1204,27 +1158,25 @@ read_test(HDF5::Group root_group, auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1243,27 +1195,25 @@ read_test(HDF5::Group root_group, auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1283,27 +1233,25 @@ read_test(HDF5::Group root_group, auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1324,27 +1272,25 @@ read_test(HDF5::Group root_group, auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1364,27 +1310,25 @@ read_test(HDF5::Group root_group, auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - pcout << "IO mode " + dataset_name << "<" << type_name << ">" + pcout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - pcout << "Local no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_local_no_collective_cause() + pcout << "Local no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - pcout << "Global no collective cause " << dataset_name << "<" << type_name - << ">" - << " (Read): " << dataset.get_global_no_collective_cause() + pcout << "Global no collective cause " << dataset_name << '<' << type_name + << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } diff --git a/tests/base/hdf5_06.cc b/tests/base/hdf5_06.cc index eb4ddb4028..2034c75d60 100644 --- a/tests/base/hdf5_06.cc +++ b/tests/base/hdf5_06.cc @@ -237,27 +237,26 @@ write_test(HDF5::Group &root_group) auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); dataset.write(data); - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Write): " << container_to_string(data) << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + std::cout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -277,27 +276,26 @@ write_test(HDF5::Group &root_group) auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; auto data = initialize_container(dataset_dimensions); assign_data(data); dataset.write(data); - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Write): " << container_to_string(data) << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" << type_name - << ">" - << " (Write): " << dataset.get_local_no_collective_cause() + std::cout << "Local no collective cause " + dataset_name << '<' << type_name + << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -317,11 +315,11 @@ write_test(HDF5::Group &root_group) auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; { @@ -332,14 +330,14 @@ write_test(HDF5::Group &root_group) const std::vector hyperslab_count = {1, 5, 3}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -354,14 +352,14 @@ write_test(HDF5::Group &root_group) const std::vector hyperslab_count = {1, 5, 3}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -383,11 +381,11 @@ write_test(HDF5::Group &root_group) auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; { @@ -398,14 +396,14 @@ write_test(HDF5::Group &root_group) const std::vector hyperslab_count = {3, 1, 4}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -420,14 +418,14 @@ write_test(HDF5::Group &root_group) const std::vector hyperslab_count = {3, 1, 4}; dataset.write_hyperslab(data, hyperslab_offset, hyperslab_count); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -450,11 +448,11 @@ write_test(HDF5::Group &root_group) auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; { @@ -474,14 +472,14 @@ write_test(HDF5::Group &root_group) dataset.write_selection(data, coordinates); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -503,14 +501,14 @@ write_test(HDF5::Group &root_group) dataset.write_selection(data, coordinates); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -535,14 +533,14 @@ write_test(HDF5::Group &root_group) dataset.write_selection(data, coordinates); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -565,11 +563,11 @@ write_test(HDF5::Group &root_group) auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; { @@ -584,14 +582,14 @@ write_test(HDF5::Group &root_group) dataset.write_hyperslab( data, data_dimensions, offset, stride, count, block); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -609,14 +607,14 @@ write_test(HDF5::Group &root_group) dataset.write_hyperslab( data, data_dimensions, offset, stride, count, block); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -639,11 +637,11 @@ write_test(HDF5::Group &root_group) auto dataset = group.create_dataset(dataset_name, dataset_dimensions); dataset.set_query_io_mode(true); - deallog << "Dimensions " << dataset_name << "<" << type_name << ">" + deallog << "Dimensions " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_dimensions() << std::endl; - deallog << "Size " << dataset_name << "<" << type_name << ">" + deallog << "Size " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_size() << std::endl; - deallog << "Rank " << dataset_name << "<" << type_name << ">" + deallog << "Rank " << dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_rank() << std::endl; { @@ -667,14 +665,14 @@ write_test(HDF5::Group &root_group) dataset.write_selection(data, coordinates); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -700,14 +698,14 @@ write_test(HDF5::Group &root_group) dataset.write_selection(data, coordinates); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -737,14 +735,14 @@ write_test(HDF5::Group &root_group) dataset.write_selection(data, coordinates); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Write): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " + dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " + dataset_name << '<' + << type_name << '>' << " (Write): " << dataset.get_global_no_collective_cause() << std::endl; } @@ -777,27 +775,27 @@ read_test(HDF5::Group root_group) auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -809,18 +807,18 @@ read_test(HDF5::Group root_group) hyperslab_count); std::cout << "Column vector" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Column vector " + dataset_name << "<" << type_name << ">" + deallog << "Column vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -832,18 +830,18 @@ read_test(HDF5::Group root_group) hyperslab_count); std::cout << "Row vector" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Row vector " + dataset_name << "<" << type_name << ">" + deallog << "Row vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -855,18 +853,18 @@ read_test(HDF5::Group root_group) hyperslab_count); std::cout << "Sub-matrix" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -884,27 +882,27 @@ read_test(HDF5::Group root_group) auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -916,18 +914,18 @@ read_test(HDF5::Group root_group) hyperslab_count); std::cout << "Column vector" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Column vector " + dataset_name << "<" << type_name << ">" + deallog << "Column vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -939,18 +937,18 @@ read_test(HDF5::Group root_group) hyperslab_count); std::cout << "Row vector" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Row vector " + dataset_name << "<" << type_name << ">" + deallog << "Row vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -962,18 +960,18 @@ read_test(HDF5::Group root_group) hyperslab_count); std::cout << "Sub-matrix" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -985,18 +983,18 @@ read_test(HDF5::Group root_group) hyperslab_count); std::cout << "Sub-matrix" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1013,18 +1011,18 @@ read_test(HDF5::Group root_group) data_dimensions, offset, stride, count, block); std::cout << "Sub-matrix" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Sub-matrix " + dataset_name << "<" << type_name << ">" + deallog << "Sub-matrix " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } @@ -1049,20 +1047,19 @@ read_test(HDF5::Group root_group) auto data = dataset.read_selection>(coordinates); std::cout << "Sub-matrix" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Selection std::vector " + dataset_name << "<" << type_name - << ">" - << " (Read): " << container_to_string(data) << std::endl; + deallog << "Selection std::vector " + dataset_name << '<' << type_name + << '>' << " (Read): " << container_to_string(data) << std::endl; } { @@ -1086,18 +1083,18 @@ read_test(HDF5::Group root_group) auto data = dataset.read_selection>(coordinates); std::cout << "Sub-matrix" << std::endl; - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Selection Vector " + dataset_name << "<" << type_name << ">" + deallog << "Selection Vector " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1115,27 +1112,27 @@ read_test(HDF5::Group root_group) auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1154,27 +1151,27 @@ read_test(HDF5::Group root_group) auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1194,27 +1191,27 @@ read_test(HDF5::Group root_group) auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1235,27 +1232,27 @@ read_test(HDF5::Group root_group) auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } @@ -1275,27 +1272,27 @@ read_test(HDF5::Group root_group) auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); - deallog << "Dimensions " + dataset_name << "<" << type_name << ">" + deallog << "Dimensions " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_dimensions() << std::endl; - deallog << "Size " + dataset_name << "<" << type_name << ">" + deallog << "Size " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_size() << std::endl; - deallog << "Rank " + dataset_name << "<" << type_name << ">" + deallog << "Rank " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_rank() << std::endl; { auto data = dataset.read>(); - std::cout << "IO mode " + dataset_name << "<" << type_name << ">" + std::cout << "IO mode " + dataset_name << '<' << type_name << '>' << " (Read): " << dataset.get_io_mode() << std::endl; - std::cout << "Local no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Local no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_local_no_collective_cause() << std::endl; - std::cout << "Global no collective cause " << dataset_name << "<" - << type_name << ">" + std::cout << "Global no collective cause " << dataset_name << '<' + << type_name << '>' << " (Read): " << dataset.get_global_no_collective_cause() << std::endl; - deallog << "Data " + dataset_name << "<" << type_name << ">" + deallog << "Data " + dataset_name << '<' << type_name << '>' << " (Read): " << container_to_string(data) << std::endl; } } diff --git a/tests/base/hierarchical.cc b/tests/base/hierarchical.cc index d6cbaa1ec0..144d839506 100644 --- a/tests/base/hierarchical.cc +++ b/tests/base/hierarchical.cc @@ -39,9 +39,9 @@ main() for (unsigned int i = 0; i <= div; ++i) { const double x = 1. * i / div; - deallog << x << " "; + deallog << x << ' '; for (unsigned int j = 0; j < p.size(); ++j) - deallog << p[j].value(x) << " "; + deallog << p[j].value(x) << ' '; deallog << std::endl; } } diff --git a/tests/base/index_set_iterate_01.cc b/tests/base/index_set_iterate_01.cc index e0cb2473f6..43e66847ba 100644 --- a/tests/base/index_set_iterate_01.cc +++ b/tests/base/index_set_iterate_01.cc @@ -37,9 +37,9 @@ test(IndexSet &index_set) ++it) { if (it->n_elements() == 1) - deallog << *(it->begin()) << " "; + deallog << *(it->begin()) << ' '; else - deallog << "[" << *(it->begin()) << "," << it->last() << "] "; + deallog << '[' << *(it->begin()) << ',' << it->last() << "] "; } deallog << std::endl; @@ -48,7 +48,7 @@ test(IndexSet &index_set) for (IndexSet::ElementIterator it = index_set.begin(); it != index_set.end(); ++it) - deallog << *it << " "; + deallog << *it << ' '; deallog << std::endl; } diff --git a/tests/base/index_set_readwrite_03.cc b/tests/base/index_set_readwrite_03.cc index 442839e746..43c868b519 100644 --- a/tests/base/index_set_readwrite_03.cc +++ b/tests/base/index_set_readwrite_03.cc @@ -42,7 +42,7 @@ test() Assert(is1 == is2, ExcInternalError()); - deallog << is1.is_element(4) << " " << is2.is_element(4) << std::endl; + deallog << is1.is_element(4) << ' ' << is2.is_element(4) << std::endl; deallog << "OK" << std::endl; diff --git a/tests/base/mpi_create_partitioning_01.cc b/tests/base/mpi_create_partitioning_01.cc index b727a4682c..f213252d10 100644 --- a/tests/base/mpi_create_partitioning_01.cc +++ b/tests/base/mpi_create_partitioning_01.cc @@ -63,7 +63,7 @@ test() deallog << "Total size=" << size << std::endl; for (unsigned int p = 0; p < vec.size(); ++p) { - deallog << "p=" << p << ":" << std::endl; + deallog << "p=" << p << ':' << std::endl; vec[p].print(deallog.get_file_stream()); } } diff --git a/tests/base/mpi_evenly_distributed_partitioning_01.cc b/tests/base/mpi_evenly_distributed_partitioning_01.cc index b64ace6ceb..cc8f8f471f 100644 --- a/tests/base/mpi_evenly_distributed_partitioning_01.cc +++ b/tests/base/mpi_evenly_distributed_partitioning_01.cc @@ -80,7 +80,7 @@ test() deallog << "Total size=" << size << std::endl; for (unsigned int p = 0; p < vec.size(); ++p) { - deallog << "p=" << p << ":" << std::endl; + deallog << "p=" << p << ':' << std::endl; vec[p].print(deallog.get_file_stream()); } } diff --git a/tests/base/mpi_noncontiguous_partitioner_01.cc b/tests/base/mpi_noncontiguous_partitioner_01.cc index 914944e68b..3ffe496775 100644 --- a/tests/base/mpi_noncontiguous_partitioner_01.cc +++ b/tests/base/mpi_noncontiguous_partitioner_01.cc @@ -54,10 +54,10 @@ test(const MPI_Comm comm) ArrayView(dst.data(), dst.size())); for (size_t i = 0; i < src.size(); ++i) - deallog << static_cast(src[i]) << " "; + deallog << static_cast(src[i]) << ' '; deallog << std::endl; for (size_t i = 0; i < dst.size(); ++i) - deallog << static_cast(dst[i]) << " "; + deallog << static_cast(dst[i]) << ' '; deallog << std::endl; } diff --git a/tests/base/mpi_noncontiguous_partitioner_02.cc b/tests/base/mpi_noncontiguous_partitioner_02.cc index 3d82e53e58..a0a0f62a16 100644 --- a/tests/base/mpi_noncontiguous_partitioner_02.cc +++ b/tests/base/mpi_noncontiguous_partitioner_02.cc @@ -130,10 +130,10 @@ test(const MPI_Comm &comm, const bool do_revert, const unsigned int dir) ArrayView(dst.data(), dst.size())); for (size_t i = 0; i < src.size(); ++i) - deallog << static_cast(src[i]) << " "; + deallog << static_cast(src[i]) << ' '; deallog << std::endl; for (size_t i = 0; i < dst.size(); ++i) - deallog << static_cast(dst[i]) << " "; + deallog << static_cast(dst[i]) << ' '; deallog << std::endl << std::endl; diff --git a/tests/base/mpi_noncontiguous_partitioner_03.cc b/tests/base/mpi_noncontiguous_partitioner_03.cc index b456fb2316..e5774f70c9 100644 --- a/tests/base/mpi_noncontiguous_partitioner_03.cc +++ b/tests/base/mpi_noncontiguous_partitioner_03.cc @@ -41,10 +41,10 @@ test(const MPI_Comm comm, ArrayView(dst.data(), dst.size())); for (size_t i = 0; i < src.size(); ++i) - deallog << static_cast(src[i]) << " "; + deallog << static_cast(src[i]) << ' '; deallog << std::endl; for (size_t i = 0; i < dst.size(); ++i) - deallog << static_cast(dst[i]) << " "; + deallog << static_cast(dst[i]) << ' '; deallog << std::endl; } diff --git a/tests/base/mpi_some_to_some_02.cc b/tests/base/mpi_some_to_some_02.cc index c98c059ae5..cf10223424 100644 --- a/tests/base/mpi_some_to_some_02.cc +++ b/tests/base/mpi_some_to_some_02.cc @@ -86,7 +86,7 @@ test(const unsigned int max_particles, std::vector shared_procs(shared_procs_set.begin(), shared_procs_set.end()); - deallog << "Proc " << my_proc << "/" << n_procs << ": sharing with " + deallog << "Proc " << my_proc << '/' << n_procs << ": sharing with " << Patterns::Tools::to_string(shared_procs_set) << std::endl; for (unsigned int i = 0; i < n_local_particles * shared_fraction; ++i) shared_particles[shared_procs[random_index(shared_procs.size())]] diff --git a/tests/base/polynomial1d.cc b/tests/base/polynomial1d.cc index 3546228802..fa24dfb85e 100644 --- a/tests/base/polynomial1d.cc +++ b/tests/base/polynomial1d.cc @@ -169,14 +169,12 @@ main() for (unsigned int i = 0; i < p.size(); ++i) { - deallog << "N0(P" << i << ")" - << " = " << p[i].value(0.) << std::endl; + deallog << "N0(P" << i << ')' << " = " << p[i].value(0.) << std::endl; } for (unsigned int i = 0; i < p.size(); ++i) { - deallog << "N1(P" << i << ")" - << " = " << p[i].value(1.) << std::endl; + deallog << "N1(P" << i << ')' << " = " << p[i].value(1.) << std::endl; } std::vector values(p.size()); @@ -190,8 +188,8 @@ main() for (unsigned int i = 0; i < p.size(); ++i) { p[i].value(.5, values); - deallog << "N" << j << "(P" << i << ")" - << " = " << values[j] * factor << std::endl; + deallog << 'N' << j << "(P" << i << ')' << " = " << values[j] * factor + << std::endl; } } } diff --git a/tests/base/polynomial_jacobi.cc b/tests/base/polynomial_jacobi.cc index dee86d583e..27b9d9a934 100644 --- a/tests/base/polynomial_jacobi.cc +++ b/tests/base/polynomial_jacobi.cc @@ -32,7 +32,7 @@ main() for (int beta = 0; beta < 3; ++beta) for (unsigned int degree = 0; degree < 40; ++degree) { - deallog << "Jacobi_" << degree << "^(" << alpha << "," << beta + deallog << "Jacobi_" << degree << "^(" << alpha << ',' << beta << ") at 0.3: " << jacobi_polynomial_value(degree, alpha, beta, 0.3) << std::endl; @@ -48,7 +48,7 @@ main() Assert(roots.size() == 0 || roots.back() < 1., ExcInternalError()); for (unsigned int i = 0; i < roots.size(); ++i) - deallog << roots[i] << " "; + deallog << roots[i] << ' '; deallog << std::endl << std::endl; } } diff --git a/tests/base/polynomial_jacobi_roots.cc b/tests/base/polynomial_jacobi_roots.cc index 7169c9a046..a044177606 100644 --- a/tests/base/polynomial_jacobi_roots.cc +++ b/tests/base/polynomial_jacobi_roots.cc @@ -35,7 +35,7 @@ main() for (unsigned int degree = 1; degree < 40; degree += 3) { const int beta = alpha; - deallog << "Jacobi_" << degree << "^(" << alpha << "," << beta << ")" + deallog << "Jacobi_" << degree << "^(" << alpha << ',' << beta << ')' << std::endl; std::vector roots = diff --git a/tests/base/polynomial_jacobi_roots_ld.cc b/tests/base/polynomial_jacobi_roots_ld.cc index e0045bfded..5b9d109ab0 100644 --- a/tests/base/polynomial_jacobi_roots_ld.cc +++ b/tests/base/polynomial_jacobi_roots_ld.cc @@ -35,7 +35,7 @@ main() for (unsigned int degree = 1; degree < 40; degree += 3) { const int beta = alpha; - deallog << "Jacobi_" << degree << "^(" << alpha << "," << beta << ")" + deallog << "Jacobi_" << degree << "^(" << alpha << ',' << beta << ')' << std::endl; std::vector roots = diff --git a/tests/base/polynomials_adini_01.cc b/tests/base/polynomials_adini_01.cc index ef7b6cef57..d74b89ce1d 100644 --- a/tests/base/polynomials_adini_01.cc +++ b/tests/base/polynomials_adini_01.cc @@ -62,7 +62,7 @@ check_poly_q(const PolynomialsAdini &poly) deallog << "Adini<" << dim << "> point " << i << " (" << points[i][0]; for (unsigned int d = 1; d < dim; ++d) deallog << ", " << points[i][d]; - deallog << ")" << std::endl; + deallog << ')' << std::endl; poly.evaluate(points[i], values, grads, grads2, thirds, fourths); diff --git a/tests/base/polynomials_br.cc b/tests/base/polynomials_br.cc index b56697a966..4ff74422ed 100644 --- a/tests/base/polynomials_br.cc +++ b/tests/base/polynomials_br.cc @@ -86,7 +86,7 @@ check_poly_q(const PolynomialsBernardiRaugel &poly) deallog << "BR1<" << dim << "> point " << i << " (" << points[i][0]; for (unsigned int d = 1; d < dim; ++d) deallog << ", " << points[i][d]; - deallog << ")" << std::endl; + deallog << ')' << std::endl; poly.evaluate(points[i], values, grads, grads2, thirds, fourths); @@ -146,7 +146,7 @@ check_poly_bubble(const PolynomialsBernardiRaugel &poly) << points[i][0]; for (unsigned int d = 1; d < dim; ++d) deallog << ", " << points[i][d]; - deallog << ")" << std::endl; + deallog << ')' << std::endl; poly.evaluate(points[i], values, grads, grads2, thirds, fourths); diff --git a/tests/base/quadrature_check_tensor_product.cc b/tests/base/quadrature_check_tensor_product.cc index e0d59356a8..5b7b56b841 100644 --- a/tests/base/quadrature_check_tensor_product.cc +++ b/tests/base/quadrature_check_tensor_product.cc @@ -49,7 +49,7 @@ check_tensor_product(const std::vector> &quadratures, AssertThrow(q_basis[0].size() == q_points.size(), ExcInternalError()); for (unsigned int q = 0; q < quadrature.size(); ++q) { - std::cout << q_points[q] << " " << q_basis[0].get_points()[q] + std::cout << q_points[q] << ' ' << q_basis[0].get_points()[q] << std::endl; AssertThrow(std::abs( (q_points[q] - q_basis[0].get_points()[q]).norm()) < diff --git a/tests/base/quadrature_move_01.cc b/tests/base/quadrature_move_01.cc index aea3d5a5c2..f2f5101a8d 100644 --- a/tests/base/quadrature_move_01.cc +++ b/tests/base/quadrature_move_01.cc @@ -48,8 +48,8 @@ template