mirror of
https://github.com/JuliaFEM/JuliaFEM.jl.git
synced 2026-09-28 20:46:58 +00:00
Fixed multiple dispatch issues on io.jl
Related to issue #74, io.jl is no more modifying functionality of LightXML
This commit is contained in:
Jukka Aho
+36
-182
@@ -23,25 +23,48 @@ end
|
||||
@test attribute(obj2, "Name") == "Test Domain"
|
||||
end
|
||||
|
||||
@testset "put and get to xdmf" begin
|
||||
@testset "Xdmf filtering" begin
|
||||
grid1 = new_element("Grid")
|
||||
add_text(grid1, "I am first grid")
|
||||
grid2 = new_element("Grid")
|
||||
add_text(grid2, "I am second grid")
|
||||
set_attribute(grid2, "Name", "Frame 2")
|
||||
grid3 = new_element("Grid")
|
||||
add_text(grid3, "I am third grid")
|
||||
grids = [grid1, grid2, grid3]
|
||||
|
||||
@test content(xdmf_filter(grids, "Grid")) == "I am first grid"
|
||||
@test content(xdmf_filter(grids, "Grid[1]")) == "I am first grid"
|
||||
@test content(xdmf_filter(grids, "Grid[2]")) == "I am second grid"
|
||||
@test content(xdmf_filter(grids, "Grid[3]")) == "I am third grid"
|
||||
@test content(xdmf_filter(grids, "Grid[end]")) == "I am third grid"
|
||||
@test content(xdmf_filter(grids, "Grid[@Name=Frame 2]")) == "I am second grid"
|
||||
@test xdmf_filter(grids, "Grid[0]") == nothing
|
||||
@test xdmf_filter(grids, "Grid[4]") == nothing
|
||||
@test xdmf_filter(grids, "Grid[@Name=Frame 3]") == nothing
|
||||
@test xdmf_filter(grids, "Domain/Grid[@Name=Frame 3]") == nothing
|
||||
@test xdmf_filter(grids, "Domain") == nothing
|
||||
end
|
||||
|
||||
@testset "XML traverse" begin
|
||||
xdmf = Xdmf()
|
||||
domain = new_child(xdmf, "Domain")
|
||||
domain = new_child(xdmf.xml, "Domain")
|
||||
grid = new_child(domain, "Grid")
|
||||
grid["CollectionType"] = "Temporal"
|
||||
grid["GridType"] = "Collection"
|
||||
set_attribute(grid, "CollectionType", "Temporal")
|
||||
set_attribute(grid, "GridType", "Collection")
|
||||
|
||||
frame1 = new_child(grid, "Grid")
|
||||
time1 = new_child(frame1, "Time")
|
||||
set_attributes(time1, Dict("Value" => 0.0))
|
||||
set_attribute(time1, "Value", 0.0)
|
||||
X1 = new_child(frame1, "Geometry")
|
||||
set_attributes(X1, Dict("Type" => "XY"))
|
||||
set_attribute(X1, "Type", "XY")
|
||||
|
||||
frame2 = new_child(grid, "Grid")
|
||||
set_attributes(frame2, Dict("Name" => "Frame 2"))
|
||||
set_attribute(frame2, "Name", "Frame 2")
|
||||
time2 = new_child(frame2, "Time")
|
||||
set_attributes(time2, Dict("Value" => 1.0))
|
||||
set_attribute(time2, "Value", 1.0)
|
||||
X2 = new_child(frame2, "Geometry")
|
||||
set_attributes(X2, Dict("Type" => "XY"))
|
||||
set_attribute(X2, "Type", "XY")
|
||||
|
||||
add_child(grid, frame1)
|
||||
add_child(grid, frame2)
|
||||
@@ -50,178 +73,9 @@ end
|
||||
add_child(X2, dataitem)
|
||||
|
||||
println(xdmf.xml)
|
||||
@test has_child(xdmf.xml, "Domain")
|
||||
@test isa(get_child(xdmf.xml, "Domain"), XMLElement)
|
||||
@test !has_attribute(xdmf.xml, "Domain")
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Time/Value"), 0.0)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[2]/Time/Value"), 1.0)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[end]/Time/Value"), 1.0)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[@Name=Frame 2]/Time/Value"), 1.0)
|
||||
@test read(xdmf, "/Domain/Grid/Grid/Time/Value") == "0.0"
|
||||
@test read(xdmf, "/Domain/Grid/Grid[2]/Time/Value") == "1.0"
|
||||
@test read(xdmf, "/Domain/Grid/Grid[end]/Time/Value") == "1.0"
|
||||
@test read(xdmf, "/Domain/Grid/Grid[@Name=Frame 2]/Time/Value") == "1.0"
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[2]/Geometry/DataItem"), [1.0, 2.0])
|
||||
end
|
||||
|
||||
|
||||
#=
|
||||
|
||||
@testset "higher level xdmf" begin
|
||||
e1 = Element(Quad4, 1, [1, 2, 3, 4])
|
||||
e2 = Element(Quad4, 2, [5, 6, 7, 8])
|
||||
p1 = Problem(Elasticity, "Body 1", 2)
|
||||
p2 = Problem(Elasticity, "Body 2", 2)
|
||||
push!(p1, e1)
|
||||
push!(p2, e2)
|
||||
#update!(p1)
|
||||
|
||||
e3 = Element(Seg2, 3, [1, 2])
|
||||
e4 = Element(Seg2, 4, [3, 4])
|
||||
e5 = Element(Seg2, 5, [5, 6])
|
||||
p3 = Problem(Dirichlet, "Fixed BC", 2, "displacement")
|
||||
p4 = Problem(Contact, "Contact between bodies 1 and 2", 2, "displacement")
|
||||
push!(p3, e3)
|
||||
push!(p4, e4)
|
||||
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],
|
||||
5 => [0.0, 2.0],
|
||||
6 => [1.0, 2.0],
|
||||
7 => [1.0, 3.0],
|
||||
8 => [0.0, 3.0])
|
||||
u = Dict{Int64, Vector{Float64}}(
|
||||
1 => [0.1, 0.1],
|
||||
2 => [0.1, 0.1],
|
||||
3 => [0.1, 0.1],
|
||||
4 => [0.1, 0.1],
|
||||
5 => [0.1, 0.1],
|
||||
6 => [0.1, 0.1],
|
||||
7 => [0.1, 0.1],
|
||||
8 => [0.1, 0.1])
|
||||
n = Dict{Int64, Vector{Float64}}(
|
||||
3 => [0.0, 1.0],
|
||||
4 => [0.0, 1.0])
|
||||
R = Dict{Int64, Vector{Float64}}(
|
||||
1 => [0.0, 1.0],
|
||||
2 => [0.0, 1.0])
|
||||
update!(e4, "master elements", [e3])
|
||||
end
|
||||
|
||||
@testset "save results to disk, linear solver" begin
|
||||
X = Dict{Int, Vector{Float64}}(
|
||||
1 => [0.0,0.0],
|
||||
2 => [1.0,0.0],
|
||||
3 => [1.0,1.0],
|
||||
4 => [0.0,1.0])
|
||||
element = Element(Quad4, [1, 2, 3, 4])
|
||||
update!(element, "geometry", X)
|
||||
update!(element, "temperature thermal conductivity", 6.0)
|
||||
update!(element, "temperature load", 0.0 => 12.0)
|
||||
update!(element, "temperature load", 1.0 => 24.0)
|
||||
problem = Problem(Heat, "one element heat problem", 1)
|
||||
problem.properties.formulation = "2D"
|
||||
push!(problem, element)
|
||||
boundary_element = Element(Seg2, [1, 2])
|
||||
update!(boundary_element, "geometry", X)
|
||||
update!(boundary_element, "temperature 1", 0.0)
|
||||
bc = Problem(Dirichlet, "fixed", 1, "temperature")
|
||||
push!(bc, boundary_element)
|
||||
xdmf = Xdmf()
|
||||
solver = Solver(Linear, problem, bc)
|
||||
solver.xdmf = xdmf
|
||||
|
||||
solver.time = 0.0
|
||||
solver()
|
||||
empty!(problem.assembly)
|
||||
solver.time = 1.0
|
||||
solver()
|
||||
|
||||
info(solver("temperature", 0.0))
|
||||
info(solver("temperature", 1.0))
|
||||
info(element("temperature load", [0.0, 0.0], 0.0))
|
||||
info(element("temperature load", [0.0, 0.0], 1.0))
|
||||
|
||||
info("h5 file = $(h5file(xdmf))")
|
||||
E = read(xdmf.hdf, "/Topology/Quad4/Element IDs")
|
||||
C = read(xdmf.hdf, "/Topology/Quad4/Connectivity")
|
||||
N = read(xdmf.hdf, "/Node IDs")
|
||||
X = read(xdmf.hdf, "/Geometry")
|
||||
T1 = read(xdmf.hdf, "/Results/Time 0.0/Nodal Fields/Temperature")
|
||||
T2 = read(xdmf.hdf, "/Results/Time 1.0/Nodal Fields/Temperature")
|
||||
@test isapprox(E, [-1])
|
||||
@test isapprox(C, [0 1 2 3])
|
||||
@test isapprox(N, [1, 2, 3, 4])
|
||||
X_expected = [0.0 0.0; 1.0 0.0; 1.0 1.0; 0.0 1.0]'
|
||||
T1_expected = [0.0 0.0 1.0 1.0]
|
||||
T2_expected = [0.0 0.0 2.0 2.0]
|
||||
@test isapprox(X, X_expected)
|
||||
@test isapprox(T1, T1_expected)
|
||||
@test isapprox(T2, T2_expected)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Time/Value"), 0.0)
|
||||
@test read(xdmf, "/Domain/Grid/Grid/Geometry/Type") == "XY"
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Geometry/DataItem"), X_expected)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Topology/DataItem"), [0 1 2 3])
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Topology[@TopologyType=Polyline]/DataItem"), [0 1])
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[1]/Attribute[@Name=Temperature]/DataItem"), T1_expected)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[2]/Attribute[@Name=Temperature]/DataItem"), T2_expected)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[end]/Time/Value"), 1.0)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[end]/Topology/DataItem"), [0 1 2 3])
|
||||
end
|
||||
|
||||
@testset "save results to disk, nonlinear solver" begin
|
||||
X = Dict{Int, Vector{Float64}}(
|
||||
1 => [0.0,0.0],
|
||||
2 => [1.0,0.0],
|
||||
3 => [1.0,1.0],
|
||||
4 => [0.0,1.0])
|
||||
element = Element(Quad4, [1, 2, 3, 4])
|
||||
update!(element, "geometry", X)
|
||||
update!(element, "temperature thermal conductivity", 6.0)
|
||||
update!(element, "temperature load", 0.0 => 12.0)
|
||||
update!(element, "temperature load", 1.0 => 24.0)
|
||||
problem = Problem(Heat, "one element heat problem", 1)
|
||||
problem.properties.formulation = "2D"
|
||||
push!(problem, element)
|
||||
boundary_element = Element(Seg2, [1, 2])
|
||||
update!(boundary_element, "geometry", X)
|
||||
update!(boundary_element, "temperature 1", 0.0)
|
||||
bc = Problem(Dirichlet, "fixed", 1, "temperature")
|
||||
push!(bc, boundary_element)
|
||||
solver = Solver(Nonlinear, problem, bc)
|
||||
solver.xdmf = Xdmf()
|
||||
|
||||
solver.time = 0.0
|
||||
solver()
|
||||
solver.time = 1.0
|
||||
solver()
|
||||
|
||||
xdmf = get(solver.xdmf)
|
||||
info("h5 file = $(h5file(xdmf))")
|
||||
E = read(xdmf.hdf, "/Topology/Quad4/Element IDs")
|
||||
C = read(xdmf.hdf, "/Topology/Quad4/Connectivity")
|
||||
N = read(xdmf.hdf, "/Node IDs")
|
||||
X = read(xdmf.hdf, "/Geometry")
|
||||
T11 = read(xdmf.hdf, "/Results/Time 0.0/Iteration 1/Nodal Fields/Temperature")
|
||||
T12 = read(xdmf.hdf, "/Results/Time 0.0/Iteration 2/Nodal Fields/Temperature")
|
||||
T21 = read(xdmf.hdf, "/Results/Time 1.0/Iteration 1/Nodal Fields/Temperature")
|
||||
T22 = read(xdmf.hdf, "/Results/Time 1.0/Iteration 2/Nodal Fields/Temperature")
|
||||
X_expected = [
|
||||
0.0 0.0
|
||||
1.0 0.0
|
||||
1.0 1.0
|
||||
0.0 1.0]
|
||||
T1_expected = [0.0 0.0 1.0 1.0]
|
||||
T2_expected = [0.0 0.0 2.0 2.0]
|
||||
@test isapprox(T12, T1_expected)
|
||||
@test isapprox(T22, T2_expected)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Time/Value"), 0.0)
|
||||
@test read(xdmf, "/Domain/Grid/Grid/Geometry/Type") == "XY"
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Geometry/DataItem"), X_expected')
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Topology/DataItem"), [0 1 2 3])
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid/Topology[@TopologyType=Polyline]/DataItem"), [0 1])
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[1]/Attribute[@Name=Temperature]/DataItem"), T1_expected)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[2]/Attribute[@Name=Temperature]/DataItem"), T2_expected)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[end]/Time/Value"), 1.0)
|
||||
@test isapprox(read(xdmf, "/Domain/Grid/Grid[end]/Topology/DataItem"), [0 1 2 3])
|
||||
end
|
||||
|
||||
=#
|
||||
|
||||
Reference in New Issue
Block a user