Glassvision/JuliaFEM.jl
1
0
Fork 0
mirror of https://github.com/JuliaFEM/JuliaFEM.jl.git synced 2026-08-28 23:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed creating elements + preprocess aster med file more general for other inputs too

Browse Source
This commit is contained in:
Jukka Aho
2016-06-18 12:53:01 +03:00
parent bdb8f19bcf
commit 1ce7fd6096
8 changed files with 149 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JuliaFEM.jl
+8 -4
View File
@@ -76,8 +76,6 @@ export find_intersection, calc_reflection, calc_normal
### MORTAR STUFF ###
include("mortar.jl") # mortar projection
include("abaqus_reader_old.jl")
# rest of things
include("utils.jl")
include("core.jl")
@@ -88,9 +86,15 @@ include("api.jl")
end
module Preprocess
include("abaqus_reader.jl")
include("preprocess.jl")
export create_elements
include("preprocess_abaqus_reader.jl")
include("preprocess_abaqus_reader_old.jl")
include("preprocess_aster_reader.jl")
export aster_create_elements, parse_aster_med_file
export aster_create_elements, parse_aster_med_file, is_aster_mail_keyword,
parse_aster_header, aster_parse_nodes, aster_renumber_nodes!,
aster_renumber_elements!, aster_combine_meshes, aster_read_mesh,
filter_by_element_set, filter_by_element_id
end
module Postprocess
src/preprocess.jl
+75
View File
@@ -0,0 +1,75 @@
# This file is a part of JuliaFEM.
# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
importall Base
using JuliaFEM
type Mesh
nodes :: Dict{Int64, Vector{Float64}}
node_sets :: Dict{ASCIIString, Set{Int64}}
elements :: Dict{Int64, Vector{Int64}}
element_types :: Dict{Int64, Symbol}
element_sets :: Dict{ASCIIString, Set{Int64}}
end
function Mesh()
return Mesh(Dict(), Dict(), Dict(), Dict(), Dict())
end
function add_node!(mesh::Mesh, nid::Int, ncoords::Vector{Float64})
mesh.nodes[nid] = ncoords
end
function add_element!(mesh::Mesh, elid::Int, eltype::Symbol, connectivity::Vector{Int64})
mesh.elements[elid] = connectivity
mesh.element_types[elid] = eltype
end
function add_element_to_element_set!(mesh::Mesh, set_name::ASCIIString, elids...)
if !haskey(mesh.element_sets, set_name)
mesh.element_sets[set_name] = Set{Int64}()
end
push!(mesh.element_sets[set_name], elids...)
end
function copy(mesh::Mesh)
mesh2 = Mesh()
mesh2.nodes = copy(mesh.nodes)
mesh2.node_sets = copy(mesh.node_sets)
mesh2.elements = copy(mesh.elements)
mesh2.element_types = copy(mesh.element_types)
mesh2.element_sets = copy(mesh.element_sets)
return mesh2
end
function filter_by_element_id(mesh::Mesh, element_ids::Vector{Int64})
mesh2 = copy(mesh)
mesh2.elements = Dict()
for elid in element_ids
if haskey(mesh.elements, elid)
mesh2.elements[elid] = mesh.elements[elid]
end
end
return mesh2
end
function filter_by_element_set(mesh::Mesh, set_name::ASCIIString)
filter_by_element_id(mesh::Mesh, collect(mesh.element_sets[set_name]))
end
function create_elements(mesh::Mesh)
elements = Element[]
for (elid, elcon) in mesh.elements
eltype = mesh.element_types[elid]
element = Element(JuliaFEM.(eltype), elcon)
update!(element, "geometry", mesh.nodes)
push!(elements, element)
end
return elements
end
function create_elements(mesh::Mesh, element_set::ASCIIString)
return create_elements(filter_by_element_set(mesh, element_set))
end
src/preprocess_aster_reader.jl
+22
View File
@@ -372,3 +372,25 @@ function parse_aster_med_file(fn::ASCIIString, mesh_name=nothing)
result["connectivity"] = conn
return result
end
function aster_read_mesh(fn::ASCIIString, mesh_name=nothing)
result = parse_aster_med_file(fn, mesh_name)
mesh = Mesh()
for (nid, ncoords) in result["nodes"]
add_node!(mesh, nid, ncoords)
end
mapping = Dict(
:SE2 => :Seg2,
:TR3 => :Tri3,
:TR6 => :Tri6,
:QU4 => :Quad4,
:HE8 => :Hex8,
:TE4 => :Tet4,
:T10 => :Tet10)
for (elid, (eltype, elset, elcon)) in result["connectivity"]
add_element!(mesh, elid, mapping[eltype], elcon)
add_element_to_element_set!(mesh, string(elset), elid)
end
return mesh
end
test/test_elasticity_2d_linear_with_surface_load.jl
+10 -10
View File
@@ -7,27 +7,27 @@ using JuliaFEM.Test
@testset "test 2d linear elasticity with surface load" begin
meshfile = "/geometry/2d_block/BLOCK_1elem.med"
mesh = parse_aster_med_file(Pkg.dir("JuliaFEM")*meshfile)
mesh = aster_read_mesh(Pkg.dir("JuliaFEM")*meshfile)
# field problem
block = Problem(Elasticity, "BLOCK", 2)
block.properties.formulation = :plane_stress
block.properties.finite_strain = false
block.properties.geometric_stiffness = false
elements = aster_create_elements(mesh, :BLOCK, :QU4)
update!(elements, "youngs modulus", 288.0)
update!(elements, "poissons ratio", 1/3)
update!(elements, "displacement load 2", 576.0)
push!(block, elements...)
block.elements = create_elements(mesh, "BLOCK")
update!(block.elements, "youngs modulus", 288.0)
update!(block.elements, "poissons ratio", 1/3)
update!(block.elements, "displacement load 2", 576.0)
traction = aster_create_elements(mesh, :TOP, :SE2)
traction = create_elements(mesh, "TOP")
update!(traction, "displacement traction force 2", 288.0)
push!(block, traction...)
# boundary conditions
bc_sym = Problem(Dirichlet, "symmetry bc", 2, "displacement")
bc_elements_left = aster_create_elements(mesh, :LEFT, :SE2)
bc_elements_bottom = aster_create_elements(mesh, :BOTTOM, :SE2)
bc_elements_left = create_elements(mesh, "LEFT")
bc_elements_bottom = create_elements(mesh, "BOTTOM")
update!(bc_elements_left, "displacement 1", 0.0)
update!(bc_elements_bottom, "displacement 2", 0.0)
push!(bc_sym, bc_elements_left..., bc_elements_bottom...)
@@ -46,7 +46,7 @@ using JuliaFEM.Test
@test isapprox(u3, u3_expected)
info("strain")
for ip in get_integration_points(elements[1])
for ip in get_integration_points(block.elements[1])
eps = ip("strain")
@printf "%i | %8.3f %8.3f | %8.3f %8.3f %8.3f\n" ip.id ip.coords[1] ip.coords[2] eps[1] eps[2] eps[3]
@test isapprox(eps, [u3; 0.0])
test/test_elasticity_2d_nonhomogeneous_boundary_conditions.jl
+5 -3
View File
@@ -10,6 +10,8 @@ using JuliaFEM.Test
# field problem
block = Problem(Elasticity, "BLOCK", 2)
block.properties.formulation = :plane_stress
block.properties.finite_strain = true
block.properties.geometric_stiffness = true
nodes = Dict{Int, Vector{Float64}}(
1 => [0.0, 0.0],
@@ -51,21 +53,21 @@ using JuliaFEM.Test
for ip in get_integration_points(element)
eps = ip("strain")
@printf "%i | %8.3f %8.3f | %8.3f %8.3f %8.3f\n" ip.id ip.coords[1] ip.coords[2] eps[1] eps[2] eps[3]
@test isapprox(eps, eps_expected)
@test isapprox(eps, eps_expected, atol=1.0e-5)
end
#=
info("cauchy stress")
for ip in get_integration_points(element)
sig = ip("cauchy stress")
@printf "%i | %8.3f %8.3f | %8.3f %8.3f %8.3f\n" ip.id ip.coords[1] ip.coords[2] sig[1] sig[2] sig[3]
@test isapprox(sig, sig_expected)
end
info("pk2 stress")
for ip in get_integration_points(element)
sig = ip("pk2 stress")
@printf "%i | %8.3f %8.3f | %8.3f %8.3f %8.3f\n" ip.id ip.coords[1] ip.coords[2] sig[1] sig[2] sig[3]
@test isapprox(sig, sig_expected)
end
=#
end
test/test_elasticity_2d_nonlinear_with_surface_load.jl
+1
View File
@@ -13,6 +13,7 @@ using JuliaFEM.Test
block = Problem(Elasticity, "BLOCK", 2)
block.properties.formulation = :plane_stress
block.properties.finite_strain = true
block.properties.geometric_stiffness = true
elements = aster_create_elements(mesh, :BLOCK, :QU4)
update!(elements, "youngs modulus", 288.0)
test/test_elasticity_2d_plane_stress_stiffness_matrix.jl
+10 -8
View File
@@ -8,18 +8,20 @@ using JuliaFEM.Test
@testset "test 2d linear elasticity local matrices" begin
element = Element(Quad4, [1, 2, 3, 4])
element["geometry"] = Vector{Float64}[
[0.0, 0.0],
[1.0, 0.0],
[1.0, 1.0],
[0.0, 1.0]]
element["youngs modulus"] = 288.0
element["poissons ratio"] = 1/3
X = Dict{Int64, Vector{Float64}}(
1 => [0.0, 0.0],
2 => [1.0, 0.0],
3 => [1.0, 1.0],
4 => [0.0, 1.0])
update!(element, "geometry", X)
update!(element, "youngs modulus" => 288.0, "poissons ratio" => 1/3)
element["displacement load"] = DCTI([4.0, 8.0])
problem = Problem(Elasticity, "[0x1] x [0x1] block", 2)
problem.properties.formulation = :plane_stress
K, f = assemble!(problem, element)
assemble!(problem, element)
K = full(problem.assembly.K)
f = full(problem.assembly.f)
K_expected = [
144 54 -90 0 -72 -54 18 0
test/test_preprocess_aster_reader.jl
+18 -18
View File
@@ -1,17 +1,12 @@
# This file is a part of JuliaFEM.
# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
module AsterReaderTests
using JuliaFEM
using JuliaFEM.Preprocess
using JuliaFEM.Test
#using JuliaFEM: parse
using JuliaFEM.Preprocess: aster_parse_nodes, aster_renumber_nodes!,
aster_renumber_elements!, aster_combine_meshes
function test_read_mesh()
mesh = """
@testset "read ascii mesh" begin
mesh = """
COOR_2D
N1 0.0 0.0
N2 1.0 0.0
@@ -38,17 +33,15 @@ mesh = """
FIN
"""
m = parse(mesh, Val{:CODE_ASTER_MAIL})
@test m["nodes"]["N1"] == [0.0, 0.0]
@test m["elements"]["E1"] == ["QUAD4", ["N1", "N2", "N3", "N4"]]
@test m["elements"]["E2"] == ["SEG2", ["N3", "N4"]]
@test m["elsets"]["BODY1"] == ["E1", "E2"]
@test m["nsets"]["NALL"] == ["N1", "N2"]
# m = parse(mesh, Val{:CODE_ASTER_MAIL})
# @test m["nodes"]["N1"] == [0.0, 0.0]
# @test m["elements"]["E1"] == ["QUAD4", ["N1", "N2", "N3", "N4"]]
# @test m["elements"]["E2"] == ["SEG2", ["N3", "N4"]]
# @test m["elsets"]["BODY1"] == ["E1", "E2"]
# @test m["nsets"]["NALL"] == ["N1", "N2"]
end
#test_read_mesh()
function test_parse_nodes()
@testset "parse nodes" begin
section = """
N9 2.0 3.0 4.0
COOR_3D
@@ -70,7 +63,6 @@ function test_parse_nodes()
@test nodes[8] == Float64[0.0, 1.0, 1.0]
@test length(nodes) == 8
end
#test_parse_nodes()
@testset "test combining meshes" begin
@@ -114,4 +106,12 @@ end
@test mesh["connectivity"][2] == (:SE2, :GRP1, [3, 4])
end
@testset "test reading aster .med file" begin
fn = Pkg.dir("JuliaFEM")*"/geometry/2d_block/BLOCK_1elem.med"
mesh = aster_read_mesh(fn)
@test haskey(mesh.element_sets, "BLOCK")
@test length(mesh.elements) == 5
mesh2 = filter_by_element_set(mesh, "BLOCK")
@test haskey(mesh2.element_sets, "BLOCK")
@test length(mesh2.elements) == 1
end