]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix accidentally commited merge conflict
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 22:19:39 +0000 (22:19 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 22:19:39 +0000 (22:19 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26741 0785d39b-7218-0410-832d-ea1e28bc413d

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

index abde3902346e6425be3e78ca1f71746b61f44fc8..b6fae6900d085b6fad622abae0a0e7283588e932 100644 (file)
@@ -121,20 +121,12 @@ namespace LocalIntegrators
       AssertVectorVectorDimension(input, n_comp, fe.n_quadrature_points);
       Assert(result.size() == n_dofs, ExcDimensionMismatch(result.size(), n_dofs));
       
-<<<<<<< HEAD
-      for (unsigned k=0;k<nq;++k)
-       {
-         const double dx = factor * fe.JxW(k);
-         for (unsigned i=0;i<n_dofs;++i)
-=======
       for (unsigned int k=0;k<nq;++k)
        {
          const double dx = factor * fe.JxW(k);
          for (unsigned int i=0;i<n_dofs;++i)
->>>>>>> trunk
            for (unsigned int d=0;d<n_comp;++d)
              {
-               
                result(i) += dx * (input[d][k] * fe.shape_grad_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.