]> https://gitweb.dealii.org/ - dealii.git/commitdiff
make mpi/step-40.mpirun=? more robust 1223/head
authorMatthias Maier <tamiko@43-1.org>
Thu, 30 Jul 2015 17:54:29 +0000 (12:54 -0500)
committerMatthias Maier <tamiko@43-1.org>
Thu, 30 Jul 2015 17:59:42 +0000 (12:59 -0500)
tests/mpi/step-40.cc
tests/mpi/step-40.with_petsc=true.mpirun=10.output
tests/mpi/step-40.with_petsc=true.mpirun=3.output
tests/mpi/step-40.with_petsc=true.mpirun=4.output

index fa166dfd4c79a62d435dd3e4e3a22fbb5579ff74..9acb5e9be4d32a9d999aeadb38fd886a176bb951 100644 (file)
@@ -252,8 +252,10 @@ namespace Step40
     preconditioner(system_matrix,
                    PETScWrappers::PreconditionBoomerAMG::AdditionalData(true));
 
-    solver.solve (system_matrix, completely_distributed_solution, system_rhs,
-                  preconditioner);
+    check_solver_within_range(
+      solver.solve (system_matrix, completely_distributed_solution, system_rhs,
+                    preconditioner),
+      solver_control.last_step(), 10, 10);
 
     pcout << "   Solved in " << solver_control.last_step()
           << " iterations." << std::endl;
index 95718500c000f46f313ae5acf7175a38c8869581..908c37c096949a0312834781ac24f2f4ed566c26 100644 (file)
@@ -4,8 +4,7 @@ Cycle 0:
       104+100+104+100+104+104+100+104+100+104+
    Number of degrees of freedom: 4225
       465+416+432+416+416+432+416+416+400+416+
-DEAL:mpi::Starting value 0.695309
-DEAL:mpi::Convergence step 10 value 0
+DEAL:mpi::Solver stopped within 10 - 10 iterations
    Solved in 10 iterations.
 
 Cycle 1:
@@ -13,7 +12,6 @@ Cycle 1:
       408+412+408+412+408+408+412+408+412+408+
    Number of degrees of freedom: 16641
       1729+1680+1664+1680+1632+1664+1680+1632+1648+1632+
-DEAL:mpi::Starting value 1.38018
-DEAL:mpi::Convergence step 10 value 0
+DEAL:mpi::Solver stopped within 10 - 10 iterations
    Solved in 10 iterations.
 
index b17197bcae2ee19389077dc9b43f2800230ef24f..bdd359899715130125142f906f29109aec11eb34 100644 (file)
@@ -4,8 +4,7 @@ Cycle 0:
       340+344+340+
    Number of degrees of freedom: 4225
       1453+1412+1360+
-DEAL:mpi::Starting value 0.694820
-DEAL:mpi::Convergence step 10 value 0
+DEAL:mpi::Solver stopped within 10 - 10 iterations
    Solved in 10 iterations.
 
 Cycle 1:
@@ -13,7 +12,6 @@ Cycle 1:
       1364+1368+1364+
    Number of degrees of freedom: 16641
       5645+5540+5456+
-DEAL:mpi::Starting value 1.38638
-DEAL:mpi::Convergence step 10 value 0
+DEAL:mpi::Solver stopped within 10 - 10 iterations
    Solved in 10 iterations.
 
index 7f462e74bec57b23729fdf0097fd99d6ee44dc52..776ec99ef47a2a30698ccb0e04a2a8aef8f2ba3c 100644 (file)
@@ -4,8 +4,7 @@ Cycle 0:
       256+256+256+256+
    Number of degrees of freedom: 4225
       1089+1056+1056+1024+
-DEAL:mpi::Starting value 0.694817
-DEAL:mpi::Convergence step 10 value 0
+DEAL:mpi::Solver stopped within 10 - 10 iterations
    Solved in 10 iterations.
 
 Cycle 1:
@@ -13,7 +12,6 @@ Cycle 1:
       1024+1024+1024+1024+
    Number of degrees of freedom: 16641
       4225+4160+4160+4096+
-DEAL:mpi::Starting value 1.39777
-DEAL:mpi::Convergence step 10 value 0
+DEAL:mpi::Solver stopped within 10 - 10 iterations
    Solved in 10 iterations.
 

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

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.