mirror of
https://github.com/JuliaFEM/JuliaFEM.jl.git
synced 2026-09-28 04:35:08 +00:00
fixed xdmf writer tests + some modifications hwo elements are exported
This commit is contained in:
Jukka Aho
+104
-108
@@ -1,32 +1,72 @@
|
||||
# This file is a part of JuliaFEM.
|
||||
# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
|
||||
|
||||
using FactCheck
|
||||
using Logging
|
||||
@Logging.configure(level=INFO)
|
||||
module XDMFTests
|
||||
|
||||
using LightXML
|
||||
using JuliaFEM
|
||||
using JuliaFEM.Postprocess
|
||||
using JuliaFEM.Test
|
||||
|
||||
testdata = """\
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.1">
|
||||
<Domain>
|
||||
<Grid CollectionType="Temporal" GridType="Collection" Name="Collection">
|
||||
<Geometry Type="None"/>
|
||||
<Topology Dimensions="0" Type="NoTopology"/>
|
||||
<Grid Name="Grid">
|
||||
<Time Value="123"/>
|
||||
<Time Value="123"/>
|
||||
<Geometry Type="XYZ">
|
||||
<DataItem DataType="Float" Dimensions="12" Format="XML" Precision="4">0 0 0 1 0 0 0 1 0 0 0 1</DataItem>
|
||||
<DataItem DataType="Float" Dimensions="60" Format="XML" Precision="8">
|
||||
0.0 0.0 0.0
|
||||
1.0 0.0 0.0
|
||||
0.0 1.0 0.0
|
||||
0.0 0.0 1.0
|
||||
0.5 0.0 0.0
|
||||
0.5 0.5 0.0
|
||||
0.0 0.5 0.0
|
||||
0.0 0.0 0.5
|
||||
0.5 0.0 0.5
|
||||
0.0 0.5 0.5
|
||||
1.0 1.0 1.0
|
||||
2.0 1.0 1.0
|
||||
1.0 2.0 1.0
|
||||
1.0 1.0 2.0
|
||||
1.5 1.0 1.0
|
||||
1.5 1.5 1.0
|
||||
1.0 1.5 1.0
|
||||
1.0 1.0 1.5
|
||||
1.5 1.0 1.5
|
||||
1.0 1.5 1.5
|
||||
</DataItem>
|
||||
</Geometry>
|
||||
<Topology Dimensions="1" Type="Mixed">
|
||||
<DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">6 0 1 2 3</DataItem>
|
||||
<Topology TopologyType="Mixed" NumberOfElements="2" >
|
||||
<DataItem Format="XML" DataType="Int" Dimensions="22">
|
||||
38 0 1 2 3 4 5 6 7 8 9
|
||||
38 10 11 12 13 14 15 16 17 18 19
|
||||
</DataItem>
|
||||
</Topology>
|
||||
<Attribute Center="Cell" Name="Temperature field" Type="Scalar">
|
||||
<DataItem DataType="Int" Dimensions="1" Format="XML" Precision="4">56</DataItem>
|
||||
</Attribute>
|
||||
<Attribute Center="Node" Name="Density" Type="Vector">
|
||||
<DataItem DataType="Float" Dimensions="12" Format="XML" Precision="4">1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0</DataItem>
|
||||
<Attribute Center="Node" Name="Displacement" Type="Vector">
|
||||
<DataItem DataType="Float" Dimensions="60" Format="XML" Precision="8">
|
||||
0.0 0.0 0.0
|
||||
1.0 0.0 0.0
|
||||
0.0 1.0 0.0
|
||||
0.0 0.0 1.0
|
||||
0.5 0.0 0.0
|
||||
0.5 0.5 0.0
|
||||
0.0 0.5 0.0
|
||||
0.0 0.0 0.5
|
||||
0.5 0.0 0.5
|
||||
0.0 0.5 0.5
|
||||
1.0 1.0 1.0
|
||||
2.0 1.0 1.0
|
||||
1.0 2.0 1.0
|
||||
1.0 1.0 2.0
|
||||
1.5 1.0 1.0
|
||||
1.5 1.5 1.0
|
||||
1.0 1.5 1.0
|
||||
1.0 1.0 1.5
|
||||
1.5 1.0 1.5
|
||||
1.0 1.5 1.5
|
||||
</DataItem>
|
||||
</Attribute>
|
||||
</Grid>
|
||||
</Grid>
|
||||
@@ -34,100 +74,56 @@ testdata = """\
|
||||
</Xdmf>
|
||||
"""
|
||||
|
||||
# makes no sense for vector field
|
||||
# <DataItem DataType="Float" Dimensions="4" Format="XML" Precision="4">1 2 4 7</DataItem>
|
||||
function test_write_to_xml()
|
||||
nodes = Vector{Float64}[
|
||||
[0.0, 0.0, 0.0],
|
||||
[1.0, 0.0, 0.0],
|
||||
[0.0, 1.0, 0.0],
|
||||
[0.0, 0.0, 1.0],
|
||||
[0.5, 0.0, 0.0],
|
||||
[0.5, 0.5, 0.0],
|
||||
[0.0, 0.5, 0.0],
|
||||
[0.0, 0.0, 0.5],
|
||||
[0.5, 0.0, 0.5],
|
||||
[0.0, 0.5, 0.5],
|
||||
[1.0, 1.0, 1.0],
|
||||
[2.0, 1.0, 1.0],
|
||||
[1.0, 2.0, 1.0],
|
||||
[1.0, 1.0, 2.0],
|
||||
[1.5, 1.0, 1.0],
|
||||
[1.5, 1.5, 1.0],
|
||||
[1.0, 1.5, 1.0],
|
||||
[1.0, 1.0, 1.5],
|
||||
[1.5, 1.0, 1.5],
|
||||
[1.0, 1.5, 1.5]]
|
||||
|
||||
facts("test test data") do
|
||||
xdoc = XMLDocument()
|
||||
xroot = create_root(xdoc, "Xdmf")
|
||||
set_attribute(xroot, "xmlns:xi", "http://www.w3.org/2001/XInclude")
|
||||
set_attribute(xroot, "Version", "2.1")
|
||||
domain = new_child(xroot, "Domain")
|
||||
temporal_collection = new_child(domain, "Grid")
|
||||
set_attribute(temporal_collection, "CollectionType", "Temporal")
|
||||
set_attribute(temporal_collection, "GridType", "Collection")
|
||||
set_attribute(temporal_collection, "Name", "Collection")
|
||||
geometry = new_child(temporal_collection, "Geometry")
|
||||
set_attribute(geometry, "Type", "None")
|
||||
topology = new_child(temporal_collection, "Topology")
|
||||
set_attribute(topology, "Dimensions", "0")
|
||||
set_attribute(topology, "Type", "NoTopology")
|
||||
|
||||
grid = new_child(temporal_collection, "Grid")
|
||||
set_attribute(grid, "Name", "Grid")
|
||||
time = new_child(grid, "Time")
|
||||
set_attribute(time, "Value", "123")
|
||||
geometry = new_child(grid, "Geometry")
|
||||
set_attribute(geometry, "Type", "XYZ")
|
||||
dataitem = new_child(geometry, "DataItem")
|
||||
set_attribute(dataitem, "DataType", "Float")
|
||||
set_attribute(dataitem, "Dimensions", "12")
|
||||
set_attribute(dataitem, "Format", "XML")
|
||||
set_attribute(dataitem, "Precision", "4")
|
||||
add_text(dataitem, "0 0 0 1 0 0 0 1 0 0 0 1")
|
||||
|
||||
topology = new_child(grid, "Topology")
|
||||
set_attribute(topology, "Dimensions", "1")
|
||||
set_attribute(topology, "Type", "Mixed")
|
||||
dataitem = new_child(topology, "DataItem")
|
||||
set_attribute(dataitem, "DataType", "Int")
|
||||
set_attribute(dataitem, "Dimensions", "5")
|
||||
set_attribute(dataitem, "Format", "XML")
|
||||
set_attribute(dataitem, "Precision", 4)
|
||||
add_text(dataitem, "6 0 1 2 3")
|
||||
attribute = new_child(grid, "Attribute")
|
||||
set_attribute(attribute, "Center", "Cell")
|
||||
set_attribute(attribute, "Name", "Temperature field")
|
||||
set_attribute(attribute, "Type", "Scalar")
|
||||
dataitem = new_child(attribute, "DataItem")
|
||||
set_attribute(dataitem, "DataType", "Int")
|
||||
set_attribute(dataitem, "Dimensions", 1)
|
||||
set_attribute(dataitem, "Format", "XML")
|
||||
set_attribute(dataitem, "Precision", 4)
|
||||
add_text(dataitem, "56")
|
||||
attribute = new_child(grid, "Attribute")
|
||||
set_attribute(attribute, "Center", "Node")
|
||||
set_attribute(attribute, "Name", "Density")
|
||||
set_attribute(attribute, "Type", "Vector")
|
||||
dataitem = new_child(attribute, "DataItem")
|
||||
set_attribute(dataitem, "DataType", "Float")
|
||||
set_attribute(dataitem, "Dimensions", 12)
|
||||
set_attribute(dataitem, "Format", "XML")
|
||||
set_attribute(dataitem, "Precision", 4)
|
||||
add_text(dataitem, "1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0")
|
||||
#save_file(xdoc, "/tmp/model.xmf")
|
||||
@fact string(xdoc) => testdata
|
||||
elements = [
|
||||
(:Tet10, [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
|
||||
(:Tet10, [11, 12, 13, 14, 15, 16, 17, 18, 19, 20])]
|
||||
|
||||
displacement_field = nodes # same structure
|
||||
xdoc, model = JuliaFEM.Postprocess.xdmf_new_model()
|
||||
temporal_collection = JuliaFEM.Postprocess.xdmf_new_temporal_collection(model)
|
||||
grid = JuliaFEM.Postprocess.xdmf_new_grid(temporal_collection; time=1)
|
||||
JuliaFEM.Postprocess.xdmf_new_mesh!(grid, nodes, elements)
|
||||
JuliaFEM.Postprocess.xdmf_new_nodal_field!(grid, "Displacement", displacement_field)
|
||||
JuliaFEM.Postprocess.xdmf_save_model(xdoc, "/tmp/foo.xmf")
|
||||
#info("exported data model: \n$(string(xdoc))")
|
||||
#@test string(xdoc) == testdata
|
||||
d1 = split(string(xdoc), "\n")
|
||||
# d2 = split(testdata, "\n")
|
||||
d2 = open(readlines, Pkg.dir("JuliaFEM")*"/test/testdata/quad_two_tet10.xmf")
|
||||
println("comparing string")
|
||||
for i in 1:length(d1)
|
||||
println("d1: $(d1[i])")
|
||||
println("d2: $(d2[i])")
|
||||
#status = d1 == d2 ? "MATCHES" : "NO MATCH"
|
||||
#info("line: $(d1[i]) $status")
|
||||
#if d1 != d2
|
||||
# info("should be:\n$(d2[i])")
|
||||
#end
|
||||
d1 == d2 || error("No match")
|
||||
end
|
||||
end
|
||||
|
||||
using JuliaFEM: xdmf_new_model, xdmf_new_grid, xdmf_new_temporal_collection, xdmf_new_mesh, xdmf_new_field, xdmf_save_model
|
||||
|
||||
facts("test model write XML") do
|
||||
X = [0 0 0; 1 0 0; 0 1 0; 0 0 1]'
|
||||
elmap = [6 1 2 3 4]' # element type 6, nodes 1 2 3 4
|
||||
temperature_field = [56]
|
||||
density_field = Float64[1 2 3; 4 5 6; 7 8 9; 10 11 12]'
|
||||
xdoc, model = xdmf_new_model()
|
||||
temporal_collection = xdmf_new_temporal_collection(model)
|
||||
grid = xdmf_new_grid(temporal_collection; time=123)
|
||||
xdmf_new_mesh(grid, X, elmap)
|
||||
xdmf_new_field(grid, "Temperature field", "elements", temperature_field)
|
||||
xdmf_new_field(grid, "Density", "nodes", density_field)
|
||||
@fact string(xdoc) => testdata
|
||||
end
|
||||
|
||||
facts("test that xdmf throws error when trying to add field not able to handle") do
|
||||
xdoc, model = xdmf_new_model()
|
||||
temporal_collection = xdmf_new_temporal_collection(model)
|
||||
grid = xdmf_new_grid(temporal_collection; time=123)
|
||||
temperature_field = ["56"] # strings not supported by xdmf
|
||||
@fact_throws xdmf_new_field(grid, "unknown field data", "elements", temperature_field)
|
||||
end
|
||||
|
||||
facts("test saving xdmf model") do
|
||||
xdoc, model = xdmf_new_model()
|
||||
# FIXME: xdoc here is just / of xml file, we're not interested of it but
|
||||
# xdmf_new_model returns it that we're able to save xml file.
|
||||
t = tempname()
|
||||
xdmf_save_model(xdoc, t)
|
||||
@fact isfile(t) => true
|
||||
end
|
||||
|
||||
Vendored
+52
-28
@@ -3,37 +3,61 @@
|
||||
<Domain>
|
||||
<Grid CollectionType="Temporal" GridType="Collection" Name="Collection">
|
||||
<Grid Name="Grid">
|
||||
<Time Value="1"/>
|
||||
<Geometry Type="XYZ">
|
||||
<Time Value="0"/>
|
||||
<DataItem DataType="Float" Dimensions="20 3" Format="XML" Precision="8">
|
||||
0.0 0.0 0.0
|
||||
1.0 0.0 0.0
|
||||
0.0 1.0 0.0
|
||||
0.0 0.0 1.0
|
||||
0.5 0.0 0.0
|
||||
0.5 0.5 0.0
|
||||
0.0 0.5 0.0
|
||||
0.0 0.0 0.5
|
||||
0.5 0.0 0.5
|
||||
0.0 0.5 0.5
|
||||
1.0 1.0 1.0
|
||||
2.0 1.0 1.0
|
||||
1.0 2.0 1.0
|
||||
1.0 1.0 2.0
|
||||
1.5 1.0 1.0
|
||||
1.5 1.5 1.0
|
||||
1.0 1.5 1.0
|
||||
1.0 1.0 1.5
|
||||
1.5 1.0 1.5
|
||||
1.0 1.5 1.5
|
||||
</DataItem>
|
||||
<DataItem DataType="Float" Dimensions="60" Format="XML" Precision="8">
|
||||
0.0 0.0 0.0
|
||||
1.0 0.0 0.0
|
||||
0.0 1.0 0.0
|
||||
0.0 0.0 1.0
|
||||
0.5 0.0 0.0
|
||||
0.5 0.5 0.0
|
||||
0.0 0.5 0.0
|
||||
0.0 0.0 0.5
|
||||
0.5 0.0 0.5
|
||||
0.0 0.5 0.5
|
||||
1.0 1.0 1.0
|
||||
2.0 1.0 1.0
|
||||
1.0 2.0 1.0
|
||||
1.0 1.0 2.0
|
||||
1.5 1.0 1.0
|
||||
1.5 1.5 1.0
|
||||
1.0 1.5 1.0
|
||||
1.0 1.0 1.5
|
||||
1.5 1.0 1.5
|
||||
1.0 1.5 1.5
|
||||
</DataItem>
|
||||
</Geometry>
|
||||
<Topology TopologyType="Mixed" NumberOfElements="2" >
|
||||
<DataItem Format="XML" DataType="Int" Dimensions="2 11">
|
||||
38 0 1 2 3 4 5 6 7 8 9
|
||||
38 10 11 12 13 14 15 16 17 18 19
|
||||
</DataItem>
|
||||
<Topology TopologyType="Mixed" NumberOfElements="2">
|
||||
<DataItem Format="XML" DataType="Int" Dimensions="22">
|
||||
38 0 1 2 3 4 5 6 7 8 9
|
||||
38 10 11 12 13 14 15 16 17 18 19
|
||||
</DataItem>
|
||||
</Topology>
|
||||
<Attribute Center="Node" Name="Displacement" Type="Vector">
|
||||
<DataItem DataType="Float" Dimensions="60" Format="XML" Precision="8">
|
||||
0.0 0.0 0.0
|
||||
1.0 0.0 0.0
|
||||
0.0 1.0 0.0
|
||||
0.0 0.0 1.0
|
||||
0.5 0.0 0.0
|
||||
0.5 0.5 0.0
|
||||
0.0 0.5 0.0
|
||||
0.0 0.0 0.5
|
||||
0.5 0.0 0.5
|
||||
0.0 0.5 0.5
|
||||
1.0 1.0 1.0
|
||||
2.0 1.0 1.0
|
||||
1.0 2.0 1.0
|
||||
1.0 1.0 2.0
|
||||
1.5 1.0 1.0
|
||||
1.5 1.5 1.0
|
||||
1.0 1.5 1.0
|
||||
1.0 1.0 1.5
|
||||
1.5 1.0 1.5
|
||||
1.0 1.5 1.5
|
||||
</DataItem>
|
||||
</Attribute>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Domain>
|
||||
|
||||
Reference in New Issue
Block a user