]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Tests: Remove unused solver_control_lin
authorMatthias Maier <tamiko@43-1.org>
Sun, 2 Jul 2017 21:08:27 +0000 (16:08 -0500)
committerMatthias Maier <tamiko@43-1.org>
Mon, 3 Jul 2017 10:15:15 +0000 (05:15 -0500)
tests/arpack/parpack_advection_diffusion_trilinos.cc
tests/arpack/step-36_parpack_mf.cc
tests/arpack/step-36_parpack_trilinos.cc

index 84bd8c998f0cc8d52aa097135a91143ebe408dbd..4d11c58187cd0e6838b3712fae665265cbf64f3f 100644 (file)
@@ -286,8 +286,6 @@ void test ()
     for (unsigned int i=0; i < eigenvalues.size(); i++)
       eigenfunctions[i] = 0.;
 
-    SolverControl solver_control     (dof_handler.n_dofs(), 1e-9,/*log_history*/false,/*log_results*/false);
-    SolverControl solver_control_lin (dof_handler.n_dofs(), 1e-10,/*log_history*/false,/*log_results*/false);
 
     static ReductionControl inner_control_c(/*maxiter*/stiffness_matrix.m(),
                                                        /*tolerance (global)*/ 0.0,
@@ -311,6 +309,9 @@ void test ()
                     PArpackSolver<TrilinosWrappers::MPI::Vector>::largest_real_part,
                     false);
 
+    SolverControl solver_control(
+      dof_handler.n_dofs(), 1e-9, /*log_history*/ false, /*log_results*/ false);
+
     PArpackSolver<TrilinosWrappers::MPI::Vector> eigensolver (solver_control,
                                                               mpi_communicator,
                                                               additional_data);
index 031cdca388def3179bf7096caa48d86b88ac6d24..5d3c467695f0b806bd4a5fcd6567e60c8a335e41 100644 (file)
@@ -118,9 +118,6 @@ void test ()
   {
     std::vector<std::complex<double> > lambda(number_of_eigenvalues);
 
-    SolverControl solver_control     (dof_handler.n_dofs(), 1e-9,/*log_history*/false,/*log_results*/false);
-    SolverControl solver_control_lin (dof_handler.n_dofs(), 1e-10,/*log_history*/false,/*log_results*/false);
-
     // set up iterative inverse
     static ReductionControl inner_control_c(dof_handler.n_dofs(), 0.0, 1.e-13);
 
@@ -138,6 +135,9 @@ void test ()
                     PArpackSolver<LinearAlgebra::distributed::Vector<double> >::largest_magnitude,
                     true);
 
+    SolverControl solver_control(
+      dof_handler.n_dofs(), 1e-9, /*log_history*/ false, /*log_results*/ false);
+
     PArpackSolver<LinearAlgebra::distributed::Vector<double>> eigensolver(
       solver_control, mpi_communicator, additional_data);
 
index 47dce5574354d2994d1564c8a7305b91936a26c5..530d5c9a5e0a60d44385aa43cda69d1b8ed436e4 100644 (file)
@@ -276,9 +276,6 @@ void test ()
     for (unsigned int i=0; i < eigenvalues.size(); i++)
       eigenfunctions[i] = 0.;
 
-    SolverControl solver_control     (dof_handler.n_dofs(), 1e-9,/*log_history*/false,/*log_results*/false);
-    SolverControl solver_control_lin (dof_handler.n_dofs(), 1e-10,/*log_history*/false,/*log_results*/false);
-
     static ReductionControl inner_control_c(/*maxiter*/stiffness_matrix.m(),
                                                        /*tolerance (global)*/ 0.0,
                                                        /*reduce (w.r.t. initial)*/ 1.e-13);
@@ -301,6 +298,9 @@ void test ()
                     PArpackSolver<TrilinosWrappers::MPI::Vector>::largest_magnitude,
                     true);
 
+    SolverControl solver_control(
+      dof_handler.n_dofs(), 1e-9, /*log_history*/ false, /*log_results*/ false);
+
     PArpackSolver<TrilinosWrappers::MPI::Vector> eigensolver (solver_control,
                                                               mpi_communicator,
                                                               additional_data);

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.