diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl index 7e2eb46..41f90a7 100644 --- a/src/JuliaFEM.jl +++ b/src/JuliaFEM.jl @@ -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 diff --git a/src/elements.jl b/src/elements.jl index 829fac0..11a2530 100644 --- a/src/elements.jl +++ b/src/elements.jl @@ -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 diff --git a/src/math.jl b/src/math.jl index 623b53d..8326d78 100644 --- a/src/math.jl +++ b/src/math.jl @@ -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