From 18d14b420ad6d9fc870ac9381b602478474d92a7 Mon Sep 17 00:00:00 2001 From: Vladimir Yushutin Date: Fri, 5 Jul 2024 14:47:22 -0400 Subject: [PATCH] the vtk's are output now --- tests/examples/step-40.diff | 4 ---- tests/examples/step-41.diff | 4 ---- .../step-41.mpirun=1.with_trilinos=true.output | 8 +++++++- tests/examples/step-42.diff | 4 ---- ...n=2.with_p4est=true.with_trilinos=true.output | 1 + tests/examples/step-43.diff | 6 ------ tests/examples/step-44.diff | 12 ------------ tests/examples/step-44.output | 1 + tests/examples/step-45.diff | 4 ---- tests/examples/step-46.diff | 6 ------ tests/examples/step-47.diff | 4 ---- tests/examples/step-47.output | 4 ++++ tests/examples/step-48.diff | 6 +----- tests/examples/step-49.diff | 7 +------ tests/examples/step-49.output | 16 +++++++++++++++- 15 files changed, 30 insertions(+), 57 deletions(-) diff --git a/tests/examples/step-40.diff b/tests/examples/step-40.diff index db441af4f5..d624c35b74 100644 --- a/tests/examples/step-40.diff +++ b/tests/examples/step-40.diff @@ -21,10 +21,6 @@ < const unsigned int n_cycles = 8; --- > const unsigned int n_cycles = 3; -659c661 -< output_results(cycle); ---- -> // output_results(cycle); 661c663 < computing_timer.print_summary(); --- diff --git a/tests/examples/step-41.diff b/tests/examples/step-41.diff index 474999c523..9cd99737c4 100644 --- a/tests/examples/step-41.diff +++ b/tests/examples/step-41.diff @@ -24,7 +24,3 @@ < for (unsigned int iteration = 0; iteration <= solution.size(); ++iteration) --- > for (unsigned int iteration = 0; iteration <= 5; ++iteration) -602c606 -< output_results(iteration); ---- -> // output_results(iteration); diff --git a/tests/examples/step-41.mpirun=1.with_trilinos=true.output b/tests/examples/step-41.mpirun=1.with_trilinos=true.output index d2b6af72a6..5afe3c3c14 100644 --- a/tests/examples/step-41.mpirun=1.with_trilinos=true.output +++ b/tests/examples/step-41.mpirun=1.with_trilinos=true.output @@ -9,6 +9,7 @@ Solver stopped within 3 - 7 iterations Updating active set... Size of active set: 13164 Residual of the non-contact part of the system: 9.42452e-05 + Writing graphical output... Newton iteration 1 Assembling system... @@ -17,6 +18,7 @@ Solver stopped within 3 - 7 iterations Updating active set... Size of active set: 12363 Residual of the non-contact part of the system: 3.9373 + Writing graphical output... Newton iteration 2 Assembling system... @@ -25,6 +27,7 @@ Solver stopped within 3 - 7 iterations Updating active set... Size of active set: 11584 Residual of the non-contact part of the system: 2.11652 + Writing graphical output... Newton iteration 3 Assembling system... @@ -33,6 +36,7 @@ Solver stopped within 3 - 7 iterations Updating active set... Size of active set: 10827 Residual of the non-contact part of the system: 1.46846 + Writing graphical output... Newton iteration 4 Assembling system... @@ -41,6 +45,7 @@ Solver stopped within 3 - 7 iterations Updating active set... Size of active set: 10092 Residual of the non-contact part of the system: 1.11513 + Writing graphical output... Newton iteration 5 Assembling system... @@ -49,4 +54,5 @@ Solver stopped within 3 - 7 iterations Updating active set... Size of active set: 9381 Residual of the non-contact part of the system: 0.885955 - + Writing graphical output... + diff --git a/tests/examples/step-42.diff b/tests/examples/step-42.diff index 0586e6f798..118630d785 100644 --- a/tests/examples/step-42.diff +++ b/tests/examples/step-42.diff @@ -32,10 +32,6 @@ < for (; current_refinement_cycle < n_refinement_cycles; --- > for (; current_refinement_cycle < 1; -2149c2155 -< output_results(current_refinement_cycle); ---- -> // output_results(current_refinement_cycle); 2151,2152c2157,2158 < computing_timer.print_summary(); < computing_timer.reset(); diff --git a/tests/examples/step-42.mpirun=2.with_p4est=true.with_trilinos=true.output b/tests/examples/step-42.mpirun=2.with_p4est=true.with_trilinos=true.output index 5199a4933f..bd3c041896 100644 --- a/tests/examples/step-42.mpirun=2.with_p4est=true.with_trilinos=true.output +++ b/tests/examples/step-42.mpirun=2.with_p4est=true.with_trilinos=true.output @@ -62,4 +62,5 @@ Solver stopped within 6 - 8 iterations Residual of the non-contact part of the system: 8.20097e-14 with a damping parameter alpha = 1 Active set did not change! + Writing graphical output... solution_00.pvtu Contact force = 37.3058 diff --git a/tests/examples/step-43.diff b/tests/examples/step-43.diff index a65d452d40..b9ab9ecca3 100644 --- a/tests/examples/step-43.diff +++ b/tests/examples/step-43.diff @@ -41,12 +41,6 @@ --- > // std::cout << " ..." << solver_control.last_step() > // << " CG iterations." << std::endl; -2161,2162c2170,2171 -< if (timestep_number % 200 == 0) -< output_results(); ---- -> // if (timestep_number % 200 == 0) -> // output_results(); 2164c2173,2174 < if (timestep_number % 25 == 0) --- diff --git a/tests/examples/step-44.diff b/tests/examples/step-44.diff index 22a8cb6a25..12e0ae0801 100644 --- a/tests/examples/step-44.diff +++ b/tests/examples/step-44.diff @@ -6,22 +6,10 @@ < , timer(std::cout, TimerOutput::summary, TimerOutput::wall_times) --- > , timer(std::cout, TimerOutput::never, TimerOutput::wall_times) -1105c1105 -< output_results(); ---- -> // output_results(); 1114c1114 < while (time.current() < time.end()) --- > while (time.current() < 0.3) -1126c1126 -< output_results(); ---- -> // output_results(); -1543c1543 -< std::cout << " Setting up quadrature point data..." << std::endl; ---- -> // std::cout << " Setting up quadrature point data..." << std::endl; 1660c1660 < print_conv_header(); --- diff --git a/tests/examples/step-44.output b/tests/examples/step-44.output index 0ebcee5784..fcbf96e21f 100644 --- a/tests/examples/step-44.output +++ b/tests/examples/step-44.output @@ -3,6 +3,7 @@ Grid: Triangulation: Number of active cells: 64 Number of degrees of freedom: 2699 + Setting up quadrature point data... Timestep 1 @ 0.1s CST ASM_SYS ------ SLV PP UQPH CST ASM_SYS ------ SLV PP UQPH --- ASM_SYS ------ SLV PP UQPH --- ASM_SYS ------ SLV PP UQPH --- ASM_SYS CONVERGED! diff --git a/tests/examples/step-45.diff b/tests/examples/step-45.diff index 9be1f406c0..e69de29bb2 100644 --- a/tests/examples/step-45.diff +++ b/tests/examples/step-45.diff @@ -1,4 +0,0 @@ -768c768 -< output_results(refinement_cycle); ---- -> // output_results(refinement_cycle); diff --git a/tests/examples/step-46.diff b/tests/examples/step-46.diff index 93db6e1068..e69de29bb2 100644 --- a/tests/examples/step-46.diff +++ b/tests/examples/step-46.diff @@ -1,6 +0,0 @@ -1011,1012c1011,1012 -< std::cout << " Writing output..." << std::endl; -< output_results(refinement_cycle); ---- -> std::cout << " Writing output..." << std::endl; -> // output_results(refinement_cycle); diff --git a/tests/examples/step-47.diff b/tests/examples/step-47.diff index 0cf2fc4686..e69de29bb2 100644 --- a/tests/examples/step-47.diff +++ b/tests/examples/step-47.diff @@ -1,4 +0,0 @@ -905c905 -< output_results(cycle); ---- -> // output_results(cycle); diff --git a/tests/examples/step-47.output b/tests/examples/step-47.output index 902b289e45..849bc64ded 100644 --- a/tests/examples/step-47.output +++ b/tests/examples/step-47.output @@ -3,6 +3,7 @@ Total number of cells: 5 Cycle 0 of 4 Number of degrees of freedom: 81 Solving system... + Writing graphical output... Error in the L2 norm : 0.00878095 Error in the H1 seminorm : 0.0709546 Error in the broken H2 seminorm: 1.64542 @@ -10,6 +11,7 @@ Cycle 0 of 4 Cycle 1 of 4 Number of degrees of freedom: 289 Solving system... + Writing graphical output... Error in the L2 norm : 0.003515 Error in the H1 seminorm : 0.0217418 Error in the broken H2 seminorm: 0.81215 @@ -17,6 +19,7 @@ Cycle 1 of 4 Cycle 2 of 4 Number of degrees of freedom: 1089 Solving system... + Writing graphical output... Error in the L2 norm : 0.00110394 Error in the H1 seminorm : 0.00610667 Error in the broken H2 seminorm: 0.401517 @@ -24,6 +27,7 @@ Cycle 2 of 4 Cycle 3 of 4 Number of degrees of freedom: 4225 Solving system... + Writing graphical output... Error in the L2 norm : 0.000308433 Error in the H1 seminorm : 0.00162277 Error in the broken H2 seminorm: 0.199356 diff --git a/tests/examples/step-48.diff b/tests/examples/step-48.diff index 7f4be41eb2..e3ca3b6f21 100644 --- a/tests/examples/step-48.diff +++ b/tests/examples/step-48.diff @@ -6,13 +6,9 @@ < , final_time(10.) --- > , final_time(-5.) -495,497c495,497 -< data_out.write_vtu_with_pvtu_record( -< "./", "solution", timestep_number, MPI_COMM_WORLD, 3); +497c497 < --- -> // data_out.write_vtu_with_pvtu_record( -> // "./", "solution", timestep_number, MPI_COMM_WORLD, 3); > (void)timestep_number; 521,533d520 < { diff --git a/tests/examples/step-49.diff b/tests/examples/step-49.diff index 3de0233bea..008353c78a 100644 --- a/tests/examples/step-49.diff +++ b/tests/examples/step-49.diff @@ -1,9 +1,4 @@ -91,91c91,92 -< std::cout << " written to " << filename << std::endl << std::endl; ---- -> // std::cout << " written to " << filename << std::endl << std::endl; -> (void)filename; -131c132 +131c131 < std::ifstream f("example.msh"); --- > std::ifstream f("../../../source/step-49/example.msh"); diff --git a/tests/examples/step-49.output b/tests/examples/step-49.output index a3596f76a8..cc4b0d564e 100644 --- a/tests/examples/step-49.output +++ b/tests/examples/step-49.output @@ -2,27 +2,41 @@ Mesh info: dimension: 2 no. of cells: 11904 boundary indicators: 0(624 times) 1(48 times) 2(32 times) 3(32 times) + written to grid-1.vtu + Mesh info: dimension: 2 no. of cells: 14 boundary indicators: 0(22 times) + written to grid-2.vtu + Mesh info: dimension: 2 no. of cells: 128 boundary indicators: 0(32 times) 1(32 times) + written to grid-3.vtu + Mesh info: dimension: 3 no. of cells: 16 boundary indicators: 0(16 times) 1(16 times) 2(8 times) 3(8 times) + written to grid-4.vtu + Mesh info: dimension: 2 no. of cells: 28 boundary indicators: 0(32 times) + written to grid-5.vtu + Mesh info: dimension: 2 no. of cells: 1600 boundary indicators: 0(160 times) + written to grid-6.vtu + Mesh info: dimension: 2 no. of cells: 256 - boundary indicators: 0(64 times) + boundary indicators: 0(64 times) + written to grid-7.vtu + -- 2.39.5