Glassvision/JuliaFEM.jl
1
0
Fork 0
mirror of https://github.com/JuliaFEM/JuliaFEM.jl.git synced 2026-09-27 20:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use FEMQuad.jl to calculate quadrature rules for elements (#134)

Browse Source
This commit is contained in:
Jukka Aho
2017-07-23 18:42:04 +03:00
committed by GitHub
parent d7eb6133d4
commit 95d4eacbad
9 changed files with 79 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/elements.jl
+13 -7
View File
@@ -315,11 +315,15 @@ function get_connectivity(element::Element)
return element.connectivity
end
function get_integration_points(element::Element)
function get_integration_points{E}(element::Element{E})
# first time initialize default integration points
if length(element.integration_points) == 0
ips = get_integration_points(element.properties)
element.integration_points = [IP(i, w, xi) for (i, (w, xi)) in enumerate(ips)]
if E in (Seg2, Seg3, NSeg)
element.integration_points = [IP(i, w, [xi]) for (i, (w, xi)) in enumerate(ips)]
else
element.integration_points = [IP(i, w, xi) for (i, (w, xi)) in enumerate(ips)]
end
end
return element.integration_points
end
@@ -327,11 +331,13 @@ end
""" This is a special case, temporarily change order
of integration scheme mainly for mass matrix.
"""
function get_integration_points(element::Element, change_order::Int)
order = get_integration_order(element.properties)
order += change_order
ips = get_integration_points(element.properties, order)
return [IP(i, w, xi) for (i, (w, xi)) in enumerate(ips)]
function get_integration_points{E}(element::Element{E}, change_order::Int)
ips = get_integration_points(element.properties, Val{change_order})
if E in (Seg2, Seg3, NSeg)
return [IP(i, w, [xi]) for (i, (w, xi)) in enumerate(ips)]
else
return [IP(i, w, xi) for (i, (w, xi)) in enumerate(ips)]
end
end
""" Return dual basis transformation matrix Ae. """