]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix a merge conflict.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 01:10:20 +0000 (01:10 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 01:10:20 +0000 (01:10 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26816 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/integrators/laplace.h

index b6fae6900d085b6fad622abae0a0e7283588e932..5e42f01ca562a74e873b887398c50d3b28b5fe77 100644 (file)
@@ -127,6 +127,7 @@ namespace LocalIntegrators
          for (unsigned int i=0;i<n_dofs;++i)
            for (unsigned int d=0;d<n_comp;++d)
              {
+               
                result(i) += dx * (input[d][k] * fe.shape_grad_component(i,k,d));
              }
        }
@@ -205,19 +206,11 @@ namespace LocalIntegrators
         AssertDimension(Dinput.size(), fe.n_quadrature_points);
         AssertDimension(data.size(), fe.n_quadrature_points);
 
-<<<<<<< HEAD
-        for (unsigned k=0;k<fe.n_quadrature_points;++k)
-          {
-            const double dx = factor * fe.JxW(k);
-            const Point<dim>& n = fe.normal_vector(k);
-            for (unsigned i=0;i<n_dofs;++i)
-=======
         for (unsigned int k=0;k<fe.n_quadrature_points;++k)
           {
             const double dx = factor * fe.JxW(k);
             const Point<dim>& n = fe.normal_vector(k);
             for (unsigned int i=0;i<n_dofs;++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<dim>& n = fe.normal_vector(k);
-<<<<<<< HEAD
-            for (unsigned i=0;i<n_dofs;++i)
-=======
             for (unsigned int i=0;i<n_dofs;++i)
->>>>>>> trunk
               for (unsigned int d=0;d<n_comp;++d)
                 {
                   const double dnv = fe.shape_grad_component(i,k,d) * n;
@@ -393,20 +382,12 @@ namespace LocalIntegrators
   
   const unsigned int n_dofs = fe1.dofs_per_cell;
   
-<<<<<<< HEAD
-  for (unsigned k=0;k<fe1.n_quadrature_points;++k)
-=======
   for (unsigned int k=0;k<fe1.n_quadrature_points;++k)
->>>>>>> trunk
     {
       const double dx = fe1.JxW(k);
       const Point<dim>& n = fe1.normal_vector(k);
       
-<<<<<<< HEAD
-      for (unsigned i=0;i<n_dofs;++i)
-=======
       for (unsigned int i=0;i<n_dofs;++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<fe1.n_quadrature_points;++k)
-=======
       for (unsigned int k=0;k<fe1.n_quadrature_points;++k)
->>>>>>> trunk
        {
          const double dx = fe1.JxW(k);
          const Point<dim>& n = fe1.normal_vector(k);
          
-<<<<<<< HEAD
-         for (unsigned i=0;i<n1;++i)
-=======
          for (unsigned int i=0;i<n1;++i)
->>>>>>> trunk
            for (unsigned int d=0;d<n_comp;++d)
              {
                const double vi = fe1.shape_value_component(i,k,d);

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.