From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Fri, 3 Aug 2012 11:46:17 +0000 (+0100)
Subject: Merge in vector laplacian benchmark.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=01c7b05b7d4608d9dfe904806820a156d967f4b1;p=francis%2Fexcafe_benchmarks.git

Merge in vector laplacian benchmark.

Conflicts:
	.gitignore
---

01c7b05b7d4608d9dfe904806820a156d967f4b1
diff --cc .gitignore
index 2ff18ce,0232325..fe51c69
--- a/.gitignore
+++ b/.gitignore
@@@ -17,4 -19,15 +16,9 @@@
  /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