From: bangerth Date: Fri, 28 Sep 2012 01:10:20 +0000 (+0000) Subject: Fix a merge conflict. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63e01fb905e839b78d218c5ef286082509153298;p=dealii-svn.git Fix a merge conflict. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26816 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 b6fae6900d..5e42f01ca5 100644 --- a/deal.II/include/deal.II/integrators/laplace.h +++ b/deal.II/include/deal.II/integrators/laplace.h @@ -127,6 +127,7 @@ namespace LocalIntegrators for (unsigned int i=0;i& n = fe.normal_vector(k); - for (unsigned i=0;i& n = fe.normal_vector(k); for (unsigned int i=0;i>>>>>> trunk { const double dnv = fe.shape_grad(i,k) * n; const double dnu = Dinput[k] * n; @@ -268,11 +261,7 @@ namespace LocalIntegrators { const double dx = factor * fe.JxW(k); const Point& n = fe.normal_vector(k); -<<<<<<< HEAD - for (unsigned i=0;i>>>>>> trunk for (unsigned int d=0;d>>>>>> trunk { const double dx = fe1.JxW(k); const Point& n = fe1.normal_vector(k); -<<<<<<< HEAD - for (unsigned i=0;i>>>>>> trunk { const double vi = fe1.shape_value(i,k); const Tensor<1,dim>& Dvi = fe1.shape_grad(i,k); @@ -466,20 +447,12 @@ namespace LocalIntegrators const double penalty = .5 * pen * (nui + nue); -<<<<<<< HEAD - for (unsigned k=0;k>>>>>> trunk { const double dx = fe1.JxW(k); const Point& n = fe1.normal_vector(k); -<<<<<<< HEAD - for (unsigned i=0;i>>>>>> trunk for (unsigned int d=0;d