Skip to content

Commit

Permalink
update diffs
Browse files Browse the repository at this point in the history
  • Loading branch information
tjhei committed Jun 10, 2024
1 parent 84a4bcc commit 9905e5e
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 48 deletions.
6 changes: 3 additions & 3 deletions tests/examples/step-10.diff
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
272,273c272,273
271,272c271,272
< table.evaluate_all_convergence_rates(
< ConvergenceTable::reduction_rate_log2);
---
> //table.evaluate_all_convergence_rates(
> // ConvergenceTable::reduction_rate_log2);
357,358c357,358
356,357c356,357
< table.evaluate_all_convergence_rates(
< ConvergenceTable::reduction_rate_log2);
---
> //table.evaluate_all_convergence_rates(
> // ConvergenceTable::reduction_rate_log2);
360c360
359c359
< table.set_precision("eval.pi", 16);
---
> table.set_precision("eval.pi", 14);
4 changes: 2 additions & 2 deletions tests/examples/step-12.diff
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
20a21
> #include "../example_test.h"
495c496,500
494c495,499
< solver.solve(system_matrix, solution, right_hand_side, preconditioner);
---
> check_solver_within_range(std::cout,
> solver.solve(system_matrix, solution, right_hand_side, preconditioner),
> solver_control.last_step(),
> 3,
> 100);
497,498c502,503
496,497c501,502
< std::cout << " Solver converged in " << solver_control.last_step()
< << " iterations." << std::endl;
---
Expand Down
2 changes: 1 addition & 1 deletion tests/examples/step-13.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1317c1317
1315c1315
< if (solver.n_dofs() < 20000)
---
> if (solver.n_dofs() < 5000)
2 changes: 1 addition & 1 deletion tests/examples/step-15.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
684c684
586c586
< while (last_residual_norm > 1e-2);
---
> while (last_residual_norm > 1e-1);
2 changes: 1 addition & 1 deletion tests/examples/step-16.diff
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
21a22
> #include "../example_test.h"
589c590,595
587c588,593
< solver.solve(system_matrix, solution, system_rhs, preconditioner);
---
> check_solver_within_range(std::cout,
Expand Down
2 changes: 1 addition & 1 deletion tests/examples/step-39.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
991c991
1061c1061
< test1.run(12);
---
> test1.run(3);
24 changes: 12 additions & 12 deletions tests/examples/step-48.diff
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
59c59
58c58
< // it is passed as a template argument to the implementation of the
---
> // it is passed as a template argument to the implementation of the
352c352
351c351
< , n_global_refinements(10 - 2 * dim)
---
> , n_global_refinements(9 - 2 * dim)
355c355
354c354
< , final_time(10.)
---
> , final_time(-5.)
522,534d521
521,533d520
< {
< pcout << "Number of MPI ranks: "
< << Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD) << std::endl;
Expand All @@ -24,28 +24,28 @@
< << std::endl
< << std::endl;
< }
596,597d582
595,596d581
< double wtime = 0;
< double output_time = 0;
605d589
604d588
< wtime += timer.wall_time();
607d590
606d589
< timer.restart();
610,611d592
609,610d591
<
< output_time += timer.wall_time();
613d593
612d592
< timer.restart();
615d594
614d593
< output_time += timer.wall_time();
619,624d597
618,623d596
<
< pcout << " Average wallclock time per time step: "
< << wtime / timestep_number << 's' << std::endl;
<
< pcout << " Spent " << output_time << "s on output and " << wtime
< << "s on computations." << std::endl;
645c618
644c617
< argc, argv, numbers::invalid_unsigned_int);
---
> argc, argv, 2);
10 changes: 5 additions & 5 deletions tests/examples/step-56.diff
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
1064c1064
1061c1061
< triangulation.refine_global(6 - dim);
---
> triangulation.refine_global(2);
1104c1104
1101c1101
< std::cout << " VM Peak: " << mem.VmPeak << std::endl;
---
> // std::cout << " VM Peak: " << mem.VmPeak << std::endl;
1106c1106
1103c1103
< computing_timer.print_summary();
---
> // computing_timer.print_summary();
1120c1120
1117c1117
< const int dim = 3;
---
> const int dim = 2;
1122,1124c1122,1129
1119,1121c1119,1126
< StokesProblem<dim> flow_problem(degree, SolverType::FGMRES_GMG);
<
< flow_problem.run();
Expand Down
14 changes: 7 additions & 7 deletions tests/examples/step-59.diff
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
74c74
73c73
< const unsigned int degree_finite_element = 8;
---
> const unsigned int degree_finite_element = 5;
1232c1232
1231c1231
< smoother_data[level].eig_cg_n_iterations = 10;
---
> smoother_data[level].eig_cg_n_iterations = 15;
1236,1237c1236,1238
1235,1236c1235,1237
< smoother_data[0].smoothing_range = 2e-2;
< smoother_data[0].degree = numbers::invalid_unsigned_int;
---
> smoother_data[0].smoothing_range = 100;
> smoother_data[0].degree = 15;
> smoother_data[0].max_eigenvalue = 4;
1239a1241,1242
1238a1240,1241
> smoother_data[level].eigenvalue_algorithm =
> internal::EigenvalueAlgorithm::power_iteration;
1266d1268
1265d1267
< pcout << "Total setup time " << setup_time << " s\n";
1272,1273c1274,1275
1271,1272c1273,1274
< pcout << "Time solve (" << solver_control.last_step() << " iterations) "
< << time.wall_time() << " s" << std::endl;
---
> pcout << "Time solve (" << solver_control.last_step() << " iterations) "
> << std::endl;
1320c1322
1319c1321
< for (unsigned int cycle = 0; cycle < 9 - dim; ++cycle)
---
> for (unsigned int cycle = 0; cycle < 3; ++cycle)
2 changes: 1 addition & 1 deletion tests/examples/step-6.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
524c524
521c521
< for (unsigned int cycle = 0; cycle < 8; ++cycle)
---
> for (unsigned int cycle = 0; cycle < 6; ++cycle)
12 changes: 6 additions & 6 deletions tests/examples/step-67.diff
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
75c75
74c74
< constexpr unsigned int n_global_refinements = 3;
---
> constexpr unsigned int n_global_refinements = 2;
82c82
81c81
< constexpr double final_time = testcase == 0 ? 10 : 2.0;
---
> constexpr double final_time = testcase == 0 ? 5 : 2.0;
2171,2173c2171
2169,2171c2169
< const std::string filename =
< "solution_" + Utilities::int_to_string(result_number, 3) + ".vtu";
< data_out.write_vtu_in_parallel(filename, MPI_COMM_WORLD);
---
> (void)result_number;
2196,2198d2193
2194,2196d2191
< const unsigned int n_vect_number = VectorizedArray<Number>::size();
< const unsigned int n_vect_bits = 8 * sizeof(Number) * n_vect_number;
<
2202,2206d2196
2200,2204d2194
< pcout << "Vectorization over " << n_vect_number << ' '
< << (std::is_same_v<Number, double> ? "doubles" : "floats") << " = "
< << n_vect_bits << " bits ("
< << Utilities::System::get_current_vectorization_level() << ')'
< << std::endl;
2284d2273
2282d2271
< timer.print_wall_time_statistics(MPI_COMM_WORLD);
2 changes: 1 addition & 1 deletion tests/examples/step-7.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
958c958
957c957
< (refinement_mode == global_refinement) ? 5 : 9;
---
> (refinement_mode == global_refinement) ? 3 : 6;
12 changes: 6 additions & 6 deletions tests/examples/step-76.diff
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
66,67c66,67
65,66c65,66
< constexpr unsigned int n_global_refinements = 2;
< constexpr unsigned int fe_degree = 5;
---
> constexpr unsigned int n_global_refinements = 1;
> constexpr unsigned int fe_degree = 3;
89c89
88c88
< constexpr double final_time = testcase == 0 ? 10 : 2.0;
---
> constexpr double final_time = testcase == 0 ? 10 : 0.5;
1507,1509c1507
1506,1508c1506
< const std::string filename =
< "solution_" + Utilities::int_to_string(result_number, 3) + ".vtu";
< data_out.write_vtu_in_parallel(filename, MPI_COMM_WORLD);
---
> (void)result_number;
1519,1521d1516
1518,1520d1515
< const unsigned int n_vect_number = VectorizedArrayType::size();
< const unsigned int n_vect_bits = 8 * sizeof(Number) * n_vect_number;
<
1525,1529d1519
1524,1528d1518
< pcout << "Vectorization over " << n_vect_number << ' '
< << (std::is_same_v<Number, double> ? "doubles" : "floats") << " = "
< << n_vect_bits << " bits ("
< << Utilities::System::get_current_vectorization_level() << ')'
< << std::endl;
1593d1582
1592d1581
< timer.print_wall_time_statistics(MPI_COMM_WORLD);
2 changes: 1 addition & 1 deletion tests/examples/step-8.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
589c589
602c602
< for (unsigned int cycle = 0; cycle < 8; ++cycle)
---
> for (unsigned int cycle = 0; cycle < 5; ++cycle)

0 comments on commit 9905e5e

Please sign in to comment.