]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Use braces for more obvious nesting.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 26 Mar 2004 21:03:09 +0000 (21:03 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 26 Mar 2004 21:03:09 +0000 (21:03 +0000)
git-svn-id: https://svn.dealii.org/trunk@8887 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/dofs/dof_constraints.templates.h

index 186f25d104e6a6c9b2564bee40341062df0e8954..dd9a4a33043e360b48fa8fe533dd1998406b2e5a 100644 (file)
@@ -185,98 +185,102 @@ ConstraintMatrix::condense (SparseMatrix<number> &uncondensed) const
     {
       if (distribute[row] == deal_II_numbers::invalid_unsigned_int)
                                         // regular line. loop over cols
-       for (unsigned int j=sparsity.get_rowstart_indices()[row];
-            j<sparsity.get_rowstart_indices()[row+1]; ++j)
-         {
-                                            // end of row reached?
-                                            // this should not
-                                            // happen, since we only
-                                            // operate on compressed
-                                            // matrices!
-           Assert (sparsity.get_column_numbers()[j] !=
-                    SparsityPattern::invalid_entry,
-                   ExcMatrixNotClosed());
+        {
+          for (unsigned int j=sparsity.get_rowstart_indices()[row];
+               j<sparsity.get_rowstart_indices()[row+1]; ++j)
+            {
+                                               // end of row reached?
+                                               // this should not
+                                               // happen, since we only
+                                               // operate on compressed
+                                               // matrices!
+              Assert (sparsity.get_column_numbers()[j] !=
+                      SparsityPattern::invalid_entry,
+                      ExcMatrixNotClosed());
            
-           if (distribute[sparsity.get_column_numbers()[j]] !=
-                deal_II_numbers::invalid_unsigned_int)
-                                              // distribute entry at
-                                              // regular row @p{row}
-                                              // and irregular column
-                                              // sparsity.get_column_numbers()[j];
-                                              // set old entry to
-                                              // zero
-             {
-               for (unsigned int q=0;
-                    q!=lines[distribute[sparsity.get_column_numbers()[j]]]
-                                   .entries.size(); ++q)
-                 uncondensed.add (row,
-                                  lines[distribute[sparsity.get_column_numbers()[j]]]
-                                  .entries[q].first,
-                                  uncondensed.global_entry(j) *
-                                  lines[distribute[sparsity.get_column_numbers()[j]]]
-                                  .entries[q].second);
+              if (distribute[sparsity.get_column_numbers()[j]] !=
+                  deal_II_numbers::invalid_unsigned_int)
+                                                 // distribute entry at
+                                                 // regular row @p{row}
+                                                 // and irregular column
+                                                 // sparsity.get_column_numbers()[j];
+                                                 // set old entry to
+                                                 // zero
+                {
+                  for (unsigned int q=0;
+                       q!=lines[distribute[sparsity.get_column_numbers()[j]]]
+                                      .entries.size(); ++q)
+                    uncondensed.add (row,
+                                     lines[distribute[sparsity.get_column_numbers()[j]]]
+                                     .entries[q].first,
+                                     uncondensed.global_entry(j) *
+                                     lines[distribute[sparsity.get_column_numbers()[j]]]
+                                     .entries[q].second);
                
-               uncondensed.global_entry(j) = 0.;
-             };
-         }
+                  uncondensed.global_entry(j) = 0.;
+                };
+            }
+        }
       else
                                         // row must be distributed
-       for (unsigned int j=sparsity.get_rowstart_indices()[row];
-            j<sparsity.get_rowstart_indices()[row+1]; ++j)
-         {
-                                            // end of row reached?
-                                            // this should not
-                                            // happen, since we only
-                                            // operate on compressed
-                                            // matrices!
-           Assert (sparsity.get_column_numbers()[j] !=
-                    SparsityPattern::invalid_entry,
-                   ExcMatrixNotClosed());
-
-           if (distribute[sparsity.get_column_numbers()[j]] ==
-                deal_II_numbers::invalid_unsigned_int)
-                                              // distribute entry at
-                                              // irregular row
-                                              // @p{row} and regular
-                                              // column
-                                              // sparsity.get_column_numbers()[j]. set
-                                              // old entry to zero
-             {
-               for (unsigned int q=0;
-                    q!=lines[distribute[row]].entries.size(); ++q) 
-                 uncondensed.add (lines[distribute[row]].entries[q].first,
-                                  sparsity.get_column_numbers()[j],
-                                  uncondensed.global_entry(j) *
-                                  lines[distribute[row]].entries[q].second);
+        {
+          for (unsigned int j=sparsity.get_rowstart_indices()[row];
+               j<sparsity.get_rowstart_indices()[row+1]; ++j)
+            {
+                                               // end of row reached?
+                                               // this should not
+                                               // happen, since we only
+                                               // operate on compressed
+                                               // matrices!
+              Assert (sparsity.get_column_numbers()[j] !=
+                      SparsityPattern::invalid_entry,
+                      ExcMatrixNotClosed());
+
+              if (distribute[sparsity.get_column_numbers()[j]] ==
+                  deal_II_numbers::invalid_unsigned_int)
+                                                 // distribute entry at
+                                                 // irregular row
+                                                 // @p{row} and regular
+                                                 // column
+                                                 // sparsity.get_column_numbers()[j]. set
+                                                 // old entry to zero
+                {
+                  for (unsigned int q=0;
+                       q!=lines[distribute[row]].entries.size(); ++q) 
+                    uncondensed.add (lines[distribute[row]].entries[q].first,
+                                     sparsity.get_column_numbers()[j],
+                                     uncondensed.global_entry(j) *
+                                     lines[distribute[row]].entries[q].second);
                
-               uncondensed.global_entry(j) = 0.;
-             }
-           else
-                                              // distribute entry at
-                                              // irregular row
-                                              // @p{row} and
-                                              // irregular column
-                                              // sparsity.get_column_numbers()[j]
-                                              // set old entry to one
-                                              // if on main diagonal,
-                                              // zero otherwise
-             {
-               for (unsigned int p=0; p!=lines[distribute[row]].entries.size(); ++p)
-                 for (unsigned int q=0;
-                      q!=lines[distribute[sparsity.get_column_numbers()[j]]]
-                                     .entries.size(); ++q)
-                   uncondensed.add (lines[distribute[row]].entries[p].first,
-                                    lines[distribute[sparsity.get_column_numbers()[j]]]
-                                    .entries[q].first,
-                                    uncondensed.global_entry(j) *
-                                    lines[distribute[row]].entries[p].second *
-                                    lines[distribute[sparsity.get_column_numbers()[j]]]
-                                    .entries[q].second);
+                  uncondensed.global_entry(j) = 0.;
+                }
+              else
+                                                 // distribute entry at
+                                                 // irregular row
+                                                 // @p{row} and
+                                                 // irregular column
+                                                 // sparsity.get_column_numbers()[j]
+                                                 // set old entry to one
+                                                 // if on main diagonal,
+                                                 // zero otherwise
+                {
+                  for (unsigned int p=0; p!=lines[distribute[row]].entries.size(); ++p)
+                    for (unsigned int q=0;
+                         q!=lines[distribute[sparsity.get_column_numbers()[j]]]
+                                        .entries.size(); ++q)
+                      uncondensed.add (lines[distribute[row]].entries[p].first,
+                                       lines[distribute[sparsity.get_column_numbers()[j]]]
+                                       .entries[q].first,
+                                       uncondensed.global_entry(j) *
+                                       lines[distribute[row]].entries[p].second *
+                                       lines[distribute[sparsity.get_column_numbers()[j]]]
+                                       .entries[q].second);
                
-               uncondensed.global_entry(j) = (row == sparsity.get_column_numbers()[j] ?
-                                              average_diagonal : 0. );
-             }
-         }
+                  uncondensed.global_entry(j) = (row == sparsity.get_column_numbers()[j] ?
+                                                 average_diagonal : 0. );
+                }
+            }
+        }
     }
 }
 

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.