"coordinates" -> "geometry"

This commit is contained in:
Jukka Aho
2015-09-08 20:54:04 +03:00
parent 87f5f2c11b
commit f5d56823bd
3 changed files with 3 additions and 7 deletions
-4
View File
@@ -17,8 +17,4 @@ include("xdmf.jl")
include("abaqus_reader.jl")
include("interfaces.jl")
export set_coordinates, get_coordinates #, set_material
#export set_coordinates, get_coordinates, set_material
end # module
+1 -1
View File
@@ -64,7 +64,7 @@ Get jacobian of element evaluated at point xi
"""
function get_jacobian(el::Element, xi)
dbasisdxi = get_dbasisdxi(el, xi)
X = get_field(el, :coordinates)
X = get_field(el, :geometry)
#J = interpolate(X, dbasisdxi, xi)'
J = X*dbasisdxi
return J
+2 -2
View File
@@ -137,7 +137,7 @@ function integrate(f::Function)
function integrate(el::Element)
target = []
for ip in el.integration_points
J = interpolate(el, "coordinates", ip.xi; derivative=true)
J = interpolate(el, :geometry, ip.xi; derivative=true)
push!(target, ip.weight*f(el, ip)*det(J))
end
return sum(target)
@@ -152,7 +152,7 @@ function integrate!(f::Function, el::Element, target)
# set target to zero
el.attributes[target][:] = 0.0
for ip in el.integration_points
J = interpolate(el, "coordinates", ip.xi; derivative=true)
J = interpolate(el, :geometry, ip.xi; derivative=true)
el.attributes[target][:,:] += ip.weight*f(el, ip)*det(J)
end
end