]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
merge from mainline
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 3 Sep 2012 22:39:48 +0000 (22:39 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 3 Sep 2012 22:39:48 +0000 (22:39 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_merge_mg_into_dof_handler@26223 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/include/deal.II/dofs/dof_handler.h
deal.II/source/dofs/dof_handler.cc

index 9c309c653996fa7df0dd89a14556777965c0806a,68fdcc45d8c2c96401179430f3e867c675c34522..f0ec67fc8665ee45c88915edbbbbe766b4bd2ee2
@@@ -317,10 -305,7 +305,9 @@@ class DoFHandler  :  public Subscripto
                                        * releases the lock of this
                                        * object to the finite element.
                                        */
-     virtual void distribute_dofs (const FiniteElement<dim,spacedim> &fe,
-                                                 const unsigned int        offset = 0);
+     virtual void distribute_dofs (const FiniteElement<dim,spacedim> &fe);
 +    
-     virtual void distribute_mg_dofs (const FiniteElement<dim, spacedim>& fe, const unsigned int offset = 0);
++    virtual void distribute_mg_dofs (const FiniteElement<dim, spacedim>& fe);
  
                                       /**
                                        * After distribute_dofs() with
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.