]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Mar 2013 19:32:47 +0000 (19:32 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Mar 2013 19:32:47 +0000 (19:32 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28945 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/meshworker/dof_info.h
deal.II/source/lac/petsc_parallel_sparse_matrix.cc
deal.II/source/lac/sparse_direct.cc

Simple merge
index 08ea1d316b7e534aabb09f970f02579652445184,cc12fedd04c0151973f228763d68b995de2a0d4f..76f1679ce93af80e0578e08c141fbef130cd94fa
@@@ -281,10 -280,9 +280,9 @@@ namespace MeshWorke
  //----------------------------------------------------------------------//
  
    template <int dim, int spacedim, typename number>
-   template <class DH>
-   DoFInfo<dim,spacedim,number>::DoFInfo(const DH &dof_handler)
+   DoFInfo<dim,spacedim,number>::DoFInfo(const DoFHandler<dim,spacedim> &dof_handler)
    {
 -    std::vector<unsigned int> aux(1);
 +    std::vector<types::global_dof_index> aux(1);
      aux[0] = dof_handler.get_fe().dofs_per_cell;
      aux_local_indices.reinit(aux);
    }
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.