]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge remote-tracking branch 'upstream/master' into parmg 1768/head
authorTimo Heister <timo.heister@gmail.com>
Mon, 26 Oct 2015 13:07:43 +0000 (09:07 -0400)
committerTimo Heister <timo.heister@gmail.com>
Mon, 26 Oct 2015 13:07:43 +0000 (09:07 -0400)
Conflicts:
doc/news/changes.h

1  2 
doc/news/changes.h
include/deal.II/dofs/dof_tools.h
tests/multigrid/step-16-bdry1.cc
tests/multigrid/step-16.cc

index 5147dee4ca996d8ced978456e048f43e86d66645,2434c2e80d3370ccca84accc7dbb1a12b4980ce9..8e7de962b7af55d9a609b42b95a9e3800078c6a5
@@@ -159,14 -159,12 +159,20 @@@ inconvenience this causes
  <a name="general"></a>
  <h3>General</h3>
  <ol>
 +  <li> New: Preliminary support for parallel, adaptive, geometric multigrid is
 +  now in place with changes to MGConstrainedDoFs (many new functions), MGTransfer,
 +  MGTools::extract_inner_interface_dofs, MGTransferPrebuilt,
 +  DoFTools::extract_locally_relevant_level_dofs.
 +  <br>
 +  (Timo Heister, Guido Kanschat, 2015/10/26)
 +  </li>
 +
+   <li> New: Two cell level signals are added to class Triangulation, namely
+   pre_coarsening_on_cell and post_refinement_on_cell.
+   <br>
+   (Lei Qiao, 2015/10/22)
+   </li>
    <li> New: Triangulation::ghost_owners() returns the set of MPI ranks of the
    ghost cells. Similarly ::level_ghost_owners() for level ghosts.
    <br>
Simple merge
index 26c3e20c2bc143b740f39d56ee6e6edcacb1c23d,325c12ac86af0b04abd72a443d3d7452a5765e91..570420ddd24fc16238ee891c03503096ee173526
@@@ -348,10 -346,8 +348,10 @@@ void LaplaceProblem<dim>::assemble_mult
    if (use_mw == true)
      {
        mg_matrices = 0.;
 +      mg_interface_in = 0.;
 +      mg_interface_out = 0.;
  
-       MappingQ1<dim> mapping;
+       MappingQGeneric<dim> mapping(1);
        MeshWorker::IntegrationInfoBox<dim> info_box;
        UpdateFlags update_flags = update_values | update_gradients | update_hessians;
        info_box.add_update_flags_all(update_flags);
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.