From: David Wells <drwells@vt.edu>
Date: Tue, 19 May 2015 16:01:39 +0000 (-0400)
Subject: Update the step-22 benchmark as well.
X-Git-Tag: v8.3.0-rc1~161^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78744bbbeb5164e2a265d42e2585c277035d6f8a;p=dealii.git

Update the step-22 benchmark as well.
---

diff --git a/tests/benchmarks/test_assembly/step-22.cc b/tests/benchmarks/test_assembly/step-22.cc
index 5287edc626..21f122e08e 100644
--- a/tests/benchmarks/test_assembly/step-22.cc
+++ b/tests/benchmarks/test_assembly/step-22.cc
@@ -661,67 +661,38 @@ namespace Step22
     // is entirely analgous to what we
     // already did in step-11 and step-18.
     //
-    // There is one snag again here, though:
-    // it turns out that using the
-    // CompressedSparsityPattern (or the
-    // block version
-    // BlockCompressedSparsityPattern we
-    // would use here) has a bottleneck that
-    // makes the algorithm to build the
-    // sparsity pattern be quadratic in the
-    // number of degrees of freedom. This
-    // doesn't become noticeable until we get
-    // well into the range of several 100,000
-    // degrees of freedom, but eventually
-    // dominates the setup of the linear
-    // system when we get to more than a
-    // million degrees of freedom. This is
-    // due to the data structures used in the
-    // CompressedSparsityPattern class,
-    // nothing that can easily be
-    // changed. Fortunately, there is an easy
-    // solution: the
-    // CompressedSimpleSparsityPattern class
+    // The DynamicSparsityPattern class
     // (and its block variant
-    // BlockCompressedSimpleSparsityPattern)
+    // BlockDynamicSparsityPattern)
     // has exactly the same interface, uses a
-    // different %internal data structure and
+    // different %internal data structure, and
     // is linear in the number of degrees of
     // freedom and therefore much more
-    // efficient for large problems. As
-    // another alternative, we could also
-    // have chosen the class
-    // BlockCompressedSetSparsityPattern that
-    // uses yet another strategy for %internal
-    // memory management. Though, that class
-    // turns out to be more memory-demanding
-    // than
-    // BlockCompressedSimpleSparsityPattern
-    // for this example.
+    // efficient for large problems.
     //
-    // Consequently, this is the class that
-    // we will use for our intermediate
-    // sparsity representation. All this is
-    // done inside a new scope, which means
-    // that the memory of <code>csp</code>
-    // will be released once the information
-    // has been copied to
+    // Consequently, we will use
+    // BlockDynamicSparsityPattern for our
+    // intermediate sparsity representation. All
+    // this is done inside a new scope, which
+    // means that the memory of <code>dsp</code>
+    // will be released once the information has
+    // been copied to
     // <code>sparsity_pattern</code>.
     {
-      timer.enter_section("make csp");
-      BlockCompressedSimpleSparsityPattern csp (2,2);
+      timer.enter_section("make dsp");
+      BlockDynamicSparsityPattern dsp (2,2);
 
-      csp.block(0,0).reinit (n_u, n_u);
-      csp.block(1,0).reinit (n_p, n_u);
-      csp.block(0,1).reinit (n_u, n_p);
-      csp.block(1,1).reinit (n_p, n_p);
+      dsp.block(0,0).reinit (n_u, n_u);
+      dsp.block(1,0).reinit (n_p, n_u);
+      dsp.block(0,1).reinit (n_u, n_p);
+      dsp.block(1,1).reinit (n_p, n_p);
 
-      csp.collect_sizes();
+      dsp.collect_sizes();
 
-      DoFTools::make_sparsity_pattern (dof_handler, csp, constraints, false);
-      timer.exit_section("make csp");
+      DoFTools::make_sparsity_pattern (dof_handler, dsp, constraints, false);
+      timer.exit_section("make dsp");
       timer.enter_section("copy sp");
-      sparsity_pattern.copy_from (csp);
+      sparsity_pattern.copy_from (dsp);
       timer.exit_section("copy sp");
     }
 
@@ -868,7 +839,7 @@ namespace Step22
               {
                 for (unsigned int j=0; j<=i; ++j)
                   {
-                    local_matrix(i,j) += (2 * symgrad_phi_u[i] * symgrad_phi_u[j]
+                    local_matrix(i,j) += (2 * (symgrad_phi_u[i] * symgrad_phi_u[j])
                                           - div_phi_u[i] * phi_p[j]
                                           - phi_p[i] * div_phi_u[j]
                                           + phi_p[i] * phi_p[j])