]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 03:06:39 +0000 (03:06 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 03:06:39 +0000 (03:06 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@26544 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/source/dofs/dof_tools.cc

index 90b14baf488f04c30d0beb8b8868f9f7e511a439,d49f42032ffb8a6d0f3a13fd039d1b8bff2220a0..fdf9356d4e487d990bb0db7476f77fbe3538c7a4
@@@ -5690,20 -5690,20 +5690,20 @@@ namespace DoFTool
  
  
                                             // otherwise enter all constraints
 -          constraints.add_line (global_dof);
 -
 -          constraint_line.clear ();
 -          for (unsigned int row=first_used_row; row<n_coarse_dofs; ++row)
 -            {
 -              const std::map<unsigned int,float>::const_iterator
 -                j = weights[row].find(col);
 -              if ((j != weights[row].end()) && (j->second != 0))
 -                constraint_line.push_back (std::pair<unsigned int,double>(representants[row],
 -                                                                        j->second));
 -            };
 -
 -          constraints.add_entries (global_dof, constraint_line);
 -        };
 +            constraints.add_line (global_dof);
 +
 +            constraint_line.clear ();
 +            for (unsigned int row=first_used_row; row<n_coarse_dofs; ++row)
 +              {
 +                const std::map<unsigned int,float>::const_iterator
 +                      j = weights[row].find(col);
 +                if ((j != weights[row].end()) && (j->second != 0))
-                       constraint_line.push_back (std::make_pair(representants[row],
++                      constraint_line.push_back (std::pair<unsigned int,double>(representants[row],
 +                                                                                    j->second));
 +              };
 +
 +            constraints.add_entries (global_dof, constraint_line);
 +          };
    }
  
  

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.