interpolation routines to separate file.

src/JuliaFEM.jl

@@ -6,6 +6,8 @@ module JuliaFEM
 VERSION < v"0.4-" && using Docile
 using Lexicon
 
+include("types.jl") # type definitions
+include("interpolate.jl")
 include("elasticity_solver.jl")
 include("xdmf.jl")
 include("abaqus_reader.jl")

src/elasticity_solver.jl

@@ -47,54 +47,6 @@ function dummy(a)
 end
 
 
-"""
-Interpolate field variable using basis functions f for point ip.
-This function tries to be as general as possible and allows interpolating
-lot of different fields.
-
-Parameters
-----------
-field :: Array{Number, dim}
-  Field variable
-basis :: Function
-  Basis functions
-ip :: Array{Number, 1}
-  Point to interpolate
-"""
-function interpolate{T<:Real}(field::Array{T,1}, basis::Function, ip)
-    result = dot(field, basis(ip))
-    return result
-end
-function interpolate{T<:Real}(field::Array{T,2}, basis::Function, ip)
-    m, n = size(field)
-    bip = basis(ip)
-    tmp = size(bip)
-    if length(tmp) == 1
-        ndim = 1
-        nnodes = tmp[1]
-    else
-        ndim, nnodes = size(bip)
-    end
-    if ndim == 1
-        if n == nnodes
-            result = field * bip
-        elseif m == nnodes
-            result = field' * bip
-        end
-    else
-      if n == nnodes
-        result = bip' * field
-    elseif m == nnodes
-      result = bip' * field'
-    end
-    end
-    if length(result) == 1
-        result = result[1]
-    end
-    return result
-end
-
-
 """
 Calculate local tangent stiffness matrix and residual force vector
 R = T - F for elasticity problem.

src/interpolate.jl

@@ -0,0 +1,53 @@
+# This file is a part of JuliaFEM.
+# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
+
+"""
+Interpolate field variable using basis functions f for point ip.
+This function tries to be as general as possible and allows interpolating
+lot of different fields.
+
+Parameters
+----------
+field :: Array{Number, dim}
+  Field variable
+basis :: Function
+  Basis functions
+ip :: Array{Number, 1}
+  Point to interpolate
+"""
+function interpolate{T<:Real}(field::Array{T,1}, basis::Function, ip)
+    result = dot(field, basis(ip))
+    return result
+end
+function interpolate{T<:Real}(field::Array{T,2}, basis::Function, ip)
+    m, n = size(field)
+    bip = basis(ip)
+    tmp = size(bip)
+    if length(tmp) == 1
+        ndim = 1
+        nnodes = tmp[1]
+    else
+        ndim, nnodes = size(bip)
+    end
+    if ndim == 1
+        if n == nnodes
+            result = field * bip
+        elseif m == nnodes
+            result = field' * bip
+        end
+    else
+      if n == nnodes
+        result = bip' * field
+    elseif m == nnodes
+      result = bip' * field'
+    end
+    end
+    if length(result) == 1
+        result = result[1]
+    end
+    return result
+end
+function interpolate(e::Element, field::ASCIIString, x::Array{Float64,1}; derivative=false)
+    return interpolate(e.attributes[field], derivative ? e.dbasis : e.basis, x)
+end
+

src/types.jl

@@ -0,0 +1,28 @@
+# This file is a part of JuliaFEM.
+# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
+
+
+type Element
+    id :: Int
+    element_type :: Int
+    node_ids :: Array{Int, 1}
+    basis :: Function
+    dbasis :: Function
+    attributes :: Dict{ASCIIString, Any}
+    ipoints :: Array{Float64, 2}
+    iweights :: Array{Float64, 1}
+end
+
+
+type Assembly
+    # LHS
+    I :: Array{Int64, 1}
+    J :: Array{Int64, 1}
+    A :: Array{Float64, 1}
+    # RHS
+    i :: Array{Int64, 1}
+    b :: Array{Float64, 1}
+    # global dofs for each element
+    gdofs :: Dict{Int64, Array{Int64, 1}}
+end
+