]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from upstream using the command 'svn merge ^/branches/branch_merge_mg_into_dof_...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 12:17:56 +0000 (12:17 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 12:17:56 +0000 (12:17 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25875 0785d39b-7218-0410-832d-ea1e28bc413d

53 files changed:
1  2 
deal.II/examples/step-18/step-18.cc
deal.II/examples/step-4/step-4.cc
deal.II/examples/step-42/step-42.cc
deal.II/examples/step-5/step-5.cc
deal.II/examples/step-6/step-6.cc
deal.II/include/deal.II/dofs/dof_tools.h
deal.II/source/dofs/block_info.cc
deal.II/source/dofs/dof_renumbering.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/dofs/dof_tools.inst.in
tests/benchmarks/spec2006-447.dealII.cc
tests/bits/joa_1.cc
tests/bits/step-13.cc
tests/bits/step-14.cc
tests/bits/step-15.cc
tests/bits/step-16.cc
tests/bits/step-3.cc
tests/bits/step-4.cc
tests/bits/step-5.cc
tests/bits/step-6.cc
tests/bits/step-7.cc
tests/bits/step-8.cc
tests/codim_one/gradients.cc
tests/deal.II/block_matrices.cc
tests/deal.II/fe_values_view_21.cc
tests/deal.II/fe_values_view_22.cc
tests/deal.II/inhomogeneous_constraints.cc
tests/deal.II/inhomogeneous_constraints_block.cc
tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
tests/deal.II/inhomogeneous_constraints_vector.cc
tests/fail/circular_01.cc
tests/fail/hp-step-14.cc
tests/fail/hp-step-15.cc
tests/fe/abf_01.cc
tests/fe/deformed_projection.h
tests/fe/rt_normal_02.cc
tests/hp/compare_hp_vs_nonhp_01.cc
tests/hp/crash_17.cc
tests/hp/crash_17_compressed_set_sparsity.cc
tests/hp/crash_18.cc
tests/hp/crash_18_compressed_set_sparsity.cc
tests/hp/step-13.cc
tests/hp/step-3.cc
tests/hp/step-3a.cc
tests/hp/step-3b.cc
tests/hp/step-3c.cc
tests/hp/step-4.cc
tests/hp/step-5.cc
tests/hp/step-6.cc
tests/hp/step-7.cc
tests/hp/step-8.cc
tests/multigrid/step-16.cc
tests/umfpack/umfpack_04.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 05b3369a3134089a12536e939772e4f4b8456e38,6207efca1caea2d4aca843b0c4755b5850ba85ff..22361b42869d97961e95b8c11264cfdc976c2de5
@@@ -1243,14 -1243,14 +1243,14 @@@ namespace DoFTool
                                      * extract_dofs() for one level
                                      * of a multi-grid DoF numbering.
                                      */
 -  template <int dim, int spacedim>
 +  template <class DH>
    void
    extract_level_dofs (const unsigned int       level,
 -                      const MGDoFHandler<dim,spacedim> &dof,
 -                      const std::vector<bool> &select,
 -                      std::vector<bool>       &selected_dofs,
 -                      const bool               blocks = false);
 +                            const DH &dof,
 +                            const std::vector<bool> &select,
 +                            std::vector<bool>       &selected_dofs,
 +                            const bool               blocks = false);
-       
    /**
     * Extract all degrees of freedom
     * which are at the boundary and
    template <class DH>
    void
    count_dofs_per_block (const DH &dof,
 -                        std::vector<unsigned int> &dofs_per_block,
 -                        const std::vector<unsigned int>  &target_block
 -                          = std::vector<unsigned int>());
 +                        std::vector<types::global_dof_index> &dofs_per_block,
-                         std::vector<types::global_dof_index>  target_block
++                        const std::vector<types::global_dof_index>  &target_block
 +                          = std::vector<types::global_dof_index>());
  
                                     /**
                                      * @deprecated See the previous
index 530c256cc14f43478cf4ff0d0a09fffa9b3cb7a3,f74605a2bece7f6345e3260318fc64f60117812b..1ae1207819efa221c8e09a162990339a8b82d186
@@@ -25,29 -25,12 +25,27 @@@ DEAL_II_NAMESPACE_OPE
  
  template <int dim, int spacedim>
  void
 -BlockInfo::initialize(const DoFHandler<dim, spacedim>& dof)
 +BlockInfo::initialize(const DoFHandler<dim, spacedim>& dof, bool levels_only, bool multigrid)
  {
 -  const FiniteElement<dim, spacedim>& fe = dof.get_fe();
 -  std::vector<unsigned int> sizes(fe.n_blocks());
 -  DoFTools::count_dofs_per_block(dof, sizes);
 -  bi_global.reinit(sizes);
 +  if (!levels_only) {
 +    const FiniteElement<dim, spacedim>& fe = dof.get_fe();
 +    std::vector<unsigned int> sizes(fe.n_blocks());
 +    DoFTools::count_dofs_per_block(dof, sizes);
 +    bi_global.reinit(sizes);
 +  }
 +  
 +  if (multigrid) {
 +    std::vector<std::vector<unsigned int> > sizes (dof.get_tria ().n_levels ());
 +    
 +    for (unsigned int i = 0; i < sizes.size (); ++i)
 +      sizes[i].resize (dof.get_fe ().n_blocks ());
 +
- //TODO[MB]:
-     Assert (false, ExcMessage("Markus: This still needs to be fixed, it doesn't compile."));
- //    MGTools::count_dofs_per_block (dof, sizes);
++    MGTools::count_dofs_per_block (dof, sizes);
 +    levels.resize (sizes.size ());
 +    
 +    for (unsigned int i = 0; i < sizes.size (); ++i)
 +      levels[i].reinit (sizes[i]);
 +  }
  }
  
  
index fe6a8dc859303b341400776e4c9f59e189c20bbc,c1204f1f433f45eecc63457589d6e2d9a22d8cbc..b91603fb0ca14893aa83f7b438903fd1a833c2f3
@@@ -4871,9 -4871,11 +4871,11 @@@ namespace DoFTool
    template <class DH>
    void
    count_dofs_per_block (const DH &dof_handler,
 -                        std::vector<unsigned int> &dofs_per_block,
 +                        std::vector<types::global_dof_index> &dofs_per_block,
-                         std::vector<unsigned int>  target_block)
+                         const std::vector<unsigned int>  &target_block_)
    {
+     std::vector<unsigned int>  target_block = target_block_;
      const dealii::hp::FECollection<DH::dimension,DH::space_dimension>
        fe_collection (dof_handler.get_fe());
      Assert (fe_collection.size() < 256, ExcNotImplemented());
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
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.