Fix hp_step-40_variable_01

diff --git a/tests/mpi/hp_step-40_variable_01.cc b/tests/mpi/hp_step-40_variable_01.cc
index 68909e613d6ee0308b5ed1935ad0a34141aa4415..ed3d11456ecce312223984fb0053113ec9eda9cf 100644 (file)
--- a/tests/mpi/hp_step-40_variable_01.cc
+++ b/tests/mpi/hp_step-40_variable_01.cc
@@ -97,7 +97,7 @@ namespace Step40
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    AffineConstraints<double> constraints;
+    AffineConstraints<PetscScalar> constraints;
 
     PETScWrappers::MPI::SparseMatrix system_matrix;
     PETScWrappers::MPI::Vector       locally_relevant_solution;
@@ -159,10 +159,8 @@ namespace Step40
     constraints.clear();
     constraints.reinit(locally_relevant_dofs);
     DoFTools::make_hanging_node_constraints(dof_handler, constraints);
-    VectorTools::interpolate_boundary_values(dof_handler,
-                                             0,
-                                             Functions::ZeroFunction<dim>(),
-                                             constraints);
+    VectorTools::interpolate_boundary_values(
+      dof_handler, 0, Functions::ZeroFunction<dim, PetscScalar>(), constraints);
     constraints.close();
 
     DynamicSparsityPattern csp(dof_handler.n_dofs(),
@@ -282,8 +280,8 @@ namespace Step40
                                            system_rhs,
                                            preconditioner),
                               solver_control.last_step(),
-                              10,
-                              10);
+                              8,
+                              12);
 #else
     check_solver_within_range(solver.solve(system_matrix,
                                            completely_distributed_solution,
@@ -295,9 +293,6 @@ namespace Step40
                               260);
 #endif
 
-    pcout << "   Solved in " << solver_control.last_step() << " iterations."
-          << std::endl;
-
     constraints.distribute(completely_distributed_solution);
 
     locally_relevant_solution = completely_distributed_solution;

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=1.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=1.output
similarity index 58%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=1.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=1.output
index 3c45af8ce2aca830d4f922777ee4f182b41af290..d33ec058306d7041f79b6f18f63aa04eee1eedfd 100644 (file)
--- a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=1.output
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=1.output
@@ -4,14 +4,12 @@ Cycle 0:
       1024+
    Number of degrees of freedom: 4225
       4225+
-DEAL:mpi::Solver stopped within 10 - 10 iterations
-   Solved in 10 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 
 Cycle 1:
    Number of active cells:       4096
       4096+
    Number of degrees of freedom: 16641
       16641+
-DEAL:mpi::Solver stopped within 10 - 10 iterations
-   Solved in 10 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=10.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=10.output
similarity index 70%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=10.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=10.output
index d0d35dd90c3de1c127ca09a9d43cf38fab7d059c..6a0ee6a3d6a35b383d484025f474b3c876710599 100644 (file)
--- a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=10.output
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=10.output
@@ -4,14 +4,12 @@ Cycle 0:
       104+100+104+100+104+104+100+104+100+104+
    Number of degrees of freedom: 4225
       457+412+433+416+417+429+417+418+404+422+
-DEAL:mpi::Solver stopped within 10 - 10 iterations
-   Solved in 10 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 
 Cycle 1:
    Number of active cells:       4096
       408+412+408+412+408+408+412+408+412+408+
    Number of degrees of freedom: 16649
       1721+1669+1670+1677+1626+1662+1676+1640+1658+1650+
-DEAL:mpi::Solver stopped within 10 - 10 iterations
-   Solved in 10 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=3.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=3.output
similarity index 62%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=3.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=3.output
index 3da8cd787b0bd3ff37dab01209ee784ac632a9e4..f55c3bc1d4d6538a38fdb5fe4a2cbc42bbea7762 100644 (file)
--- a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=3.output
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=3.output
@@ -4,14 +4,12 @@ Cycle 0:
       340+344+340+
    Number of degrees of freedom: 4225
       1446+1410+1369+
-DEAL:mpi::Solver stopped within 10 - 10 iterations
-   Solved in 10 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 
 Cycle 1:
    Number of active cells:       4096
       1364+1368+1364+
    Number of degrees of freedom: 16641
       5622+5538+5481+
-DEAL:mpi::Solver stopped within 10 - 10 iterations
-   Solved in 10 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=4.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=4.output
similarity index 64%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=4.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=4.output
index b59d1f66a089a2c7f6ebe1a4590753156508dcae..9e90da0655fab879c95a9c622b3d6581f8544c7e 100644 (file)
--- a/tests/mpi/hp_step-40_variable_01.with_petsc=true.mpirun=4.output
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=4.output
@@ -4,14 +4,12 @@ Cycle 0:
       256+256+256+256+
    Number of degrees of freedom: 4225
       1077+1056+1058+1034+
-DEAL:mpi::Solver stopped within 10 - 10 iterations
-   Solved in 10 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 
 Cycle 1:
    Number of active cells:       4096
       1024+1024+1024+1024+
    Number of degrees of freedom: 16641
       4201+4163+4155+4122+
-DEAL:mpi::Solver stopped after 11 iterations
-   Solved in 11 iterations.
+DEAL:mpi::Solver stopped within 8 - 12 iterations
 

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=1.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=1.output
new file mode 100644 (file)
index 0000000..ed4863e
--- /dev/null
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=1.output
@@ -0,0 +1,15 @@
+
+Cycle 0:
+   Number of active cells:       1024
+      1024+
+   Number of degrees of freedom: 4225
+      4225+
+DEAL:mpi::Solver stopped within 120 - 260 iterations
+
+Cycle 1:
+   Number of active cells:       4096
+      4096+
+   Number of degrees of freedom: 16641
+      16641+
+DEAL:mpi::Solver stopped within 120 - 260 iterations
+

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=10.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=10.output
new file mode 100644 (file)
index 0000000..e08a2fe
--- /dev/null
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=10.output
@@ -0,0 +1,15 @@
+
+Cycle 0:
+   Number of active cells:       1024
+      104+100+104+100+104+104+100+104+100+104+
+   Number of degrees of freedom: 4225
+      457+412+433+416+417+429+417+418+404+422+
+DEAL:mpi::Solver stopped within 120 - 260 iterations
+
+Cycle 1:
+   Number of active cells:       4096
+      408+412+408+412+408+408+412+408+412+408+
+   Number of degrees of freedom: 16649
+      1721+1669+1670+1677+1626+1662+1676+1640+1658+1650+
+DEAL:mpi::Solver stopped after 340 iterations
+

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=3.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=3.output
new file mode 100644 (file)
index 0000000..6643742
--- /dev/null
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=3.output
@@ -0,0 +1,15 @@
+
+Cycle 0:
+   Number of active cells:       1024
+      340+344+340+
+   Number of degrees of freedom: 4225
+      1446+1410+1369+
+DEAL:mpi::Solver stopped within 120 - 260 iterations
+
+Cycle 1:
+   Number of active cells:       4096
+      1364+1368+1364+
+   Number of degrees of freedom: 16641
+      5622+5538+5481+
+DEAL:mpi::Solver stopped within 120 - 260 iterations
+

diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=4.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=4.output
new file mode 100644 (file)
index 0000000..e646bc9
--- /dev/null
+++ b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=4.output
@@ -0,0 +1,15 @@
+
+Cycle 0:
+   Number of active cells:       1024
+      256+256+256+256+
+   Number of degrees of freedom: 4225
+      1077+1056+1058+1034+
+DEAL:mpi::Solver stopped within 120 - 260 iterations
+
+Cycle 1:
+   Number of active cells:       4096
+      1024+1024+1024+1024+
+   Number of degrees of freedom: 16641
+      4201+4163+4155+4122+
+DEAL:mpi::Solver stopped within 120 - 260 iterations
+