]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Apr 2013 17:46:03 +0000 (17:46 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Apr 2013 17:46:03 +0000 (17:46 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29219 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-37/step-37.cc
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/distributed/tria.h
deal.II/include/deal.II/grid/tria.h
deal.II/include/deal.II/lac/arpack_solver.h
deal.II/include/deal.II/lac/petsc_vector_base.h
deal.II/include/deal.II/lac/solver_cg.h
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/grid/tria.cc

Simple merge
Simple merge
Simple merge
index 7155778e9a3c947c6306b1508b4d797f7d71fc3a,87fe5c1f73ac2c7aa1220963b09a3dd29dd18323..3dd3ddf8235c87e6f074f28ae2b82f7dd80f863e
@@@ -605,8 -607,10 +607,10 @@@ namespace interna
                  }
  
  
-           for (std::vector<types::global_dof_index>::iterator i=dof_handler.mg_levels[level]->dof_object.dofs.begin();
-                i!=dof_handler.mg_levels[level]->dof_object.dofs.end(); ++i)
 -          for (std::vector<unsigned int>::iterator
++          for (std::vector<types::global_dof_index>::iterator
+                i=dof_handler.mg_levels[level]->dof_object.dofs.begin();
+                i!=dof_handler.mg_levels[level]->dof_object.dofs.end();
+              ++i)
              {
                if (*i != DoFHandler<1>::invalid_dof_index)
                  {
Simple merge

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.