]> git.unchartedbackwaters.co.uk Git - francis/excafe_benchmarks.git/commitdiff
Merge in vector laplacian benchmark.
authorFrancis Russell <francis@unchartedbackwaters.co.uk>
Fri, 3 Aug 2012 11:46:17 +0000 (12:46 +0100)
committerFrancis Russell <francis@unchartedbackwaters.co.uk>
Fri, 3 Aug 2012 11:46:17 +0000 (12:46 +0100)
Conflicts:
.gitignore

1  2 
.gitignore

diff --cc .gitignore
index 2ff18ce86988b36caafa145e2eccfce520367cae,0232325175ad14870f52970e45e0fe72695e3f9e..fe51c699f4e2a8ae372588e8ae4ed5eb860dd4f8
  /laplacian_2d/laplacian_f?_p?_q?.ufl
  /laplacian_2d/laplacian_f?_p?_q?_tensor.ufl
  /laplacian_2d/laplacian_f?_p?_q?_quadrature.ufl
 -/laplacian_2d/laplacian_f?_p?_q?_tensor.h
 -/laplacian_2d/laplacian_f?_p?_q?_quadrature.h
 -/laplacian_2d/laplacian_f?_p?_q?_excafe.h
+ /vector_laplacian_2d/ufl_rules.mk
+ /vector_laplacian_2d/benchmark_f?_p?_q?
+ /vector_laplacian_2d/benchmark_f?_p?_q?.cpp
+ /vector_laplacian_2d/vector_laplacian_f?_p?_q?.ufl
+ /vector_laplacian_2d/vector_laplacian_f?_p?_q?_tensor.ufl
+ /vector_laplacian_2d/vector_laplacian_f?_p?_q?_quadrature.ufl
 -/vector_laplacian_2d/vector_laplacian_f?_p?_q?_tensor.h
 -/vector_laplacian_2d/vector_laplacian_f?_p?_q?_quadrature.h
 -/vector_laplacian_2d/vector_laplacian_f?_p?_q?_excafe.h