From 3e61db8658573bb8845d4c99de3b79cce5ae8a98 Mon Sep 17 00:00:00 2001 From: TeroFrondelius Date: Tue, 25 Oct 2016 16:39:51 +0300 Subject: [PATCH] Fixing abaqus nodes reader and adding C3D10 surfaces --- src/abaqus.jl | 5 +++++ src/preprocess_abaqus_reader.jl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/abaqus.jl b/src/abaqus.jl index 3845693..c95aabb 100644 --- a/src/abaqus.jl +++ b/src/abaqus.jl @@ -503,6 +503,11 @@ function get_child_element(element_type::Symbol, element_side::Symbol, :S2 => (:Tri3, [1, 4, 2]), :S3 => (:Tri3, [2, 4, 3]), :S4 => (:Tri3, [3, 4, 1])), + :Tet10 => Dict( + :S1 => (:Tri6, [1, 5, 2, 6, 3, 7]), + :S2 => (:Tri6, [1, 8, 4, 9, 2, 5]), + :S3 => (:Tri6, [2, 9, 4, 10, 3, 6]), + :S4 => (:Tri6, [3, 10, 4, 8, 1, 7])), :Hex8 => Dict( :P1 => (:Quad4, [1, 2, 3, 4]), :P2 => (:Quad4, [5, 8, 7, 6]), diff --git a/src/preprocess_abaqus_reader.jl b/src/preprocess_abaqus_reader.jl index e491885..9261b6c 100644 --- a/src/preprocess_abaqus_reader.jl +++ b/src/preprocess_abaqus_reader.jl @@ -44,7 +44,7 @@ function parse_section(model, lines, key::Symbol, idx_start, definition = lines[idx_start] for line in lines[idx_start + 1: idx_end] if !(empty_or_comment_line(line)) - m = matchall(r"[-0-9.]+", line) + m = matchall(r"[-0-9.eE]+", line) node_id = parse(Int, m[1]) coords = float(m[2:end]) model["nodes"][node_id] = coords