Implement reading of B33 elements (#42)

* Parse beam B33 topology.
* Modify regexp to handle lowercase definition line.
* Fix incorrect comparison by length of `has_set_def`.

Author: ahojukka5

src/parse_mesh.jl

@@ -32,6 +32,9 @@ element_has_type(::Type{Val{:T2D2}}) = :Seg2
 element_has_nodes(::Type{Val{:T3D2}}) = 2
 element_has_type(::Type{Val{:T3D2}}) = :Seg2
 
+element_has_nodes(::Type{Val{:B33}}) = 2
+element_has_type(::Type{Val{:B33}}) = :Seg2
+
 """Checks for a comment or empty line
 
 Function return true, if line starts with comment character "**"
@@ -73,7 +76,7 @@ end
 """
 function add_set!(model, definition, model_key, abaqus_key, ids)
     has_set_def = parse_definition(definition)
-    if length(has_set_def) != 0
+    if haskey(has_set_def, "elset")
         set_name = has_set_def[abaqus_key]
         @info("Adding $abaqus_key: $set_name")
         model[model_key][set_name] = ids
@@ -133,11 +136,14 @@ If elset definition exists, also adds the set to model.
 function parse_section(model, lines, ::Symbol, idx_start, idx_end, ::Type{Val{:ELEMENT}})
     ids = Integer[]
     definition = lines[idx_start]
-    element_type = regex_match(r"TYPE=([\w\-\_]+)", definition, 1)
+    regexp = r"TYPE=([\w\-\_]+)"i
+    m = match(regexp, definition)
+    m == nothing && error("Could not match regexp $regexp to line $definition")
+    element_type = m[1]
     eltype_sym = Symbol(element_type)
     eltype_nodes = element_has_nodes(Val{eltype_sym})
     element_type = element_has_type(Val{eltype_sym})
-    @info("Parsing elements. Type: $(element_type)")
+    @info("Parsing elements. Type: $(m[1]). Topology: $(element_type)")
     list_iterator = consumeList(lines, idx_start+1, idx_end)
     line = list_iterator()
     while line != nothing

test/runtests.jl

@@ -12,6 +12,7 @@ include("../docs/make.jl")
     @testset "test_create_surface_elements" begin include("test_create_surface_elements.jl") end
     @testset "test_download" begin include("test_download.jl") end
     @testset "test_parse_t2d2" begin include("test_parse_t2d2.jl") end
+    @testset "test_parse_beams" begin include("test_parse_beams.jl") end
 end
 
 include("../docs/deploy.jl")

test/test_parse_beams.jl

@@ -0,0 +1,10 @@
+# This file is a part of JuliaFEM.
+# License is MIT: see https://github.com/JuliaFEM/AbaqusReader.jl/blob/master/LICENSE
+
+using AbaqusReader: abaqus_read_mesh
+using Test
+
+datadir = first(splitext(basename(@__FILE__)))
+filename = joinpath(datadir, "mesh.inp")
+mesh = abaqus_read_mesh(filename)
+@test length(mesh["elements"]) == 7

test/test_parse_beams/mesh.inp

@@ -0,0 +1,16 @@
+*Node
+      1,         240.,        1090.,        147.5
+     74,   244.285721,   1114.28577,   173.357147
+     75,   248.571426,   1138.57141,   199.214279
+     76,   252.857147,   1162.85718,   225.071426
+     77,   257.142853,   1187.14282,   250.928574
+     78,   261.428558,   1211.42859,   276.785706
+     79,   265.714294,   1235.71423,   302.642853
+*Element, type=B33
+1,  1, 74
+2, 74, 75
+3, 75, 76
+4, 76, 77
+5, 77, 78
+6, 78, 79
+7, 79,  2