From: Ryan Grove Date: Fri, 20 May 2016 12:28:35 +0000 (-0400) Subject: Some more changes (incomplete) X-Git-Tag: v8.5.0-rc1~990^2~9 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63a4b6ba363e00453915563c41a144192862db80;p=dealii.git Some more changes (incomplete) --- diff --git a/examples/step-55/doc/results.dox b/examples/step-55/doc/results.dox index 171dac0eae..284f849ee1 100644 --- a/examples/step-55/doc/results.dox +++ b/examples/step-55/doc/results.dox @@ -162,5 +162,5 @@ nearly perfect scaling in solve time.

Possible extensions

-

Extension 1

- +

Use expensive or cheap preconditioner

+Currently, use_expensive is set to true, but if you set it to false, then you will not be using CG in your calculation of $\widetilde{A^{-1}}$ which is an approximation of $A^{-1}$. Depending on if you chose to use ILU or GMG, you would just be using ILU or a few v-cycles of GMG, respectively, instead of using them as a preconditioner to CG. diff --git a/examples/step-55/step-55.cc b/examples/step-55/step-55.cc index f66d09562c..54a4df6584 100644 --- a/examples/step-55/step-55.cc +++ b/examples/step-55/step-55.cc @@ -316,10 +316,13 @@ namespace Step55 // @sect3{ASPECT BlockSchurPreconditioner} - // This class, which is taken from ASPECT and then slightly modified, - // implements the block Schur preconditioner for the Stokes system discussed - // above. It is templated on the types - // for the preconditioner blocks for velocity and schur complement. + // In the following, we will implement a preconditioner that expands a + // little bit on the ideas discussed in the Results section of step-22. + // Specifically, we will do X, Y, and Z. A further iteration of this + // approach is also used in the ASPECT code + // (see http://aspect.dealii.org) that solves the Stokes equations in + // the context of simulating convection in the earth mantle, and which + // has been used to solve problems on many thousands of processors. // // The bool flag @p do_solve_A in the constructor allows us to either // apply the preconditioner for the velocity block once or use an inner @@ -540,10 +543,13 @@ namespace Step55 const unsigned int n_levels = triangulation.n_levels(); mg_interface_matrices.resize(0, n_levels-1); - mg_interface_matrices.clear (); + mg_interface_matrices.clear (); // In contrast to all other container classes' clear() functions which + // delete the contents of the container, this clear() function + // calls the clear function of all elements stored by this container. mg_matrices.resize(0, n_levels-1); mg_matrices.clear (); mg_sparsity_patterns.resize(0, n_levels-1); + //mg_sparsity_patterns.clear (); for (unsigned int level=0; level > solver (solver_control);