From: kanschat Date: Mon, 2 Apr 2012 20:53:57 +0000 (+0000) Subject: check in before more accidents happen with reformatting X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=635428761fe33df4e8f5a62ad73ef7569334c62c;p=dealii-svn.git check in before more accidents happen with reformatting git-svn-id: https://svn.dealii.org/trunk@25370 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/integrators/laplace.h b/deal.II/include/deal.II/integrators/laplace.h index 56950b4a72..bebeb55341 100644 --- a/deal.II/include/deal.II/integrators/laplace.h +++ b/deal.II/include/deal.II/integrators/laplace.h @@ -253,51 +253,33 @@ namespace LocalIntegrators const double nue = (factor2 < 0) ? factor1 : factor2; for (unsigned k=0;k& n = fe1.normal_vector(k); - for (unsigned i=0;i& n = fe1.normal_vector(k); + for (unsigned int d=0;d= threshold) - if (!mg_constrained_dofs->at_refinement_edge(level, i1[j]) && - !mg_constrained_dofs->at_refinement_edge(level, i2[k])) - { - if (mg_constrained_dofs->set_boundary_values()) - { - if ((!mg_constrained_dofs->is_boundary_index(level, i1[j]) && - !mg_constrained_dofs->is_boundary_index(level, i2[k])) - || - (mg_constrained_dofs->is_boundary_index(level, i1[j]) && - mg_constrained_dofs->is_boundary_index(level, i2[k]) && - i1[j] == i2[k])) - G.add(i1[j], i2[k], M(j,k)); - } - else - G.add(i1[j], i2[k], M(j,k)); - } - } + { + for (unsigned int j=0; j= threshold) + if (!mg_constrained_dofs->at_refinement_edge(level, i1[j]) && + !mg_constrained_dofs->at_refinement_edge(level, i2[k])) + { + if (mg_constrained_dofs->set_boundary_values()) + { + // At the + // boundary, + // only enter + // the term + // on the + // diagonal, + // but not + // the + // coupling terms + if ((!mg_constrained_dofs->is_boundary_index(level, i1[j]) && + !mg_constrained_dofs->is_boundary_index(level, i2[k])) + || + (mg_constrained_dofs->is_boundary_index(level, i1[j]) && + mg_constrained_dofs->is_boundary_index(level, i2[k]) && + i1[j] == i2[k])) + G.add(i1[j], i2[k], M(j,k)); + } + else + G.add(i1[j], i2[k], M(j,k)); + } + } }