From a213d24d6d9ad2b70b72fbc0b0555daf36234693 Mon Sep 17 00:00:00 2001
From: Olli Vainola <olli.vainola@gbw.fi>
Date: Sat, 16 May 2015 09:19:22 +0300
Subject: [PATCH 1/2] shape functions added

---
 src/shape_functions.jl | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/shape_functions.jl

diff --git a/src/shape_functions.jl b/src/shape_functions.jl
new file mode 100644
index 0000000..c40ebaf
--- /dev/null
+++ b/src/shape_functions.jl
@@ -0,0 +1 @@
+function rectangle_linear(\eta, \zeta)

From 92f387a55c102fe36a104a307b870babbe829c39 Mon Sep 17 00:00:00 2001
From: Olli Vainola <olli.vainola@gbw.fi>
Date: Sat, 16 May 2015 10:04:27 +0300
Subject: [PATCH 2/2] hexa shape functions added

---
 src/shape_functions.jl  | 20 +++++++++++++++++++-
 src/shape_functions.jl~ | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 src/shape_functions.jl~

diff --git a/src/shape_functions.jl b/src/shape_functions.jl
index c40ebaf..f035904 100644
--- a/src/shape_functions.jl
+++ b/src/shape_functions.jl
@@ -1 +1,19 @@
-function rectangle_linear(\eta, \zeta)
+function C2D4(ξ::Float64, η::Float64)
+     values::Array{Float64, 1} = [(1 - ξ) * (1 - η),
+                                  ξ * (1 - η),
+                                  ξ * η,
+                                  (1 - ξ) * η]
+    return values
+end
+
+function C3D8(ξ::Float64, η::Float64, μ::Float64)
+    values::Array{Float64, 1} = 1 / 8 * [(1 - ξ) * (1 - η) * (1 - μ),
+                                         (1 + ξ) * (1 - η) * (1 - μ),
+                                         (1 + ξ) * (1 + η) * (1 - μ),
+                                         (1 - ξ) * (1 + η) * (1 - μ),
+                                         (1 - ξ) * (1 - η) * (1 + μ),
+                                         (1 + ξ) * (1 - η) * (1 + μ),
+                                         (1 + ξ) * (1 + η) * (1 + μ),
+                                         (1 - ξ) * (1 + η) * (1 + μ)]
+    return values
+end
diff --git a/src/shape_functions.jl~ b/src/shape_functions.jl~
new file mode 100644
index 0000000..f035904
--- /dev/null
+++ b/src/shape_functions.jl~
@@ -0,0 +1,19 @@
+function C2D4(ξ::Float64, η::Float64)
+     values::Array{Float64, 1} = [(1 - ξ) * (1 - η),
+                                  ξ * (1 - η),
+                                  ξ * η,
+                                  (1 - ξ) * η]
+    return values
+end
+
+function C3D8(ξ::Float64, η::Float64, μ::Float64)
+    values::Array{Float64, 1} = 1 / 8 * [(1 - ξ) * (1 - η) * (1 - μ),
+                                         (1 + ξ) * (1 - η) * (1 - μ),
+                                         (1 + ξ) * (1 + η) * (1 - μ),
+                                         (1 - ξ) * (1 + η) * (1 - μ),
+                                         (1 - ξ) * (1 - η) * (1 + μ),
+                                         (1 + ξ) * (1 - η) * (1 + μ),
+                                         (1 + ξ) * (1 + η) * (1 + μ),
+                                         (1 - ξ) * (1 + η) * (1 + μ)]
+    return values
+end