From: Timo Heister Date: Mon, 26 Oct 2015 13:07:43 +0000 (-0400) Subject: Merge remote-tracking branch 'upstream/master' into parmg X-Git-Tag: v8.4.0-rc2~277^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341db7bdc9bc365757849a1533ba870b3ce14488;p=dealii.git Merge remote-tracking branch 'upstream/master' into parmg Conflicts: doc/news/changes.h --- 341db7bdc9bc365757849a1533ba870b3ce14488 diff --cc doc/news/changes.h index 5147dee4ca,2434c2e80d..8e7de962b7 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@@ -159,14 -159,12 +159,20 @@@ inconvenience this causes

General

    +
  1. 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. +
    + (Timo Heister, Guido Kanschat, 2015/10/26) +
  2. + +
  3. New: Two cell level signals are added to class Triangulation, namely + pre_coarsening_on_cell and post_refinement_on_cell. +
    + (Lei Qiao, 2015/10/22) +
  4. +
  5. New: Triangulation::ghost_owners() returns the set of MPI ranks of the ghost cells. Similarly ::level_ghost_owners() for level ghosts.
    diff --cc tests/multigrid/step-16-bdry1.cc index 26c3e20c2b,325c12ac86..570420ddd2 --- a/tests/multigrid/step-16-bdry1.cc +++ b/tests/multigrid/step-16-bdry1.cc @@@ -348,10 -346,8 +348,10 @@@ void LaplaceProblem::assemble_mult if (use_mw == true) { mg_matrices = 0.; + mg_interface_in = 0.; + mg_interface_out = 0.; - MappingQ1 mapping; + MappingQGeneric mapping(1); MeshWorker::IntegrationInfoBox info_box; UpdateFlags update_flags = update_values | update_gradients | update_hessians; info_box.add_update_flags_all(update_flags);