Glassvision/JuliaFEM.jl
1
0
Fork 0
mirror of https://github.com/JuliaFEM/JuliaFEM.jl.git synced 2026-09-29 13:00:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding commit....

Browse Source 
Merge branch 'master' of https://github.com/JuliaFEM/JuliaFEM.jl

Conflicts:
	src/abaqus_reader.jl
This commit is contained in:
ovainola
2015-06-25 20:57:20 +03:00
parent 1f7967b604 3e48ae32ab
commit d41654ea25
6 changed files with 603 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/abaqus_reader.jl
+14
View File
@@ -1,5 +1,9 @@
<<<<<<< HEAD
# This file is a part of JuliaFEM.
# License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
=======
# This file is a part of JuliaFEM. License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
>>>>>>> 3e48ae32abe7a17af89cd1e23d798532aed2960a
module abaqus_reader
using Logging
@@ -10,9 +14,15 @@ VERSION < v"0.4-" && using Docile
eldims = Dict("C3D10" => 10)
global handlers = Dict()
<<<<<<< HEAD
@doc """
Register new handler for parser
""" ->
=======
"""
Register new handler for parser
"""
>>>>>>> 3e48ae32abe7a17af89cd1e23d798532aed2960a
function add_handler(section, function_name)
handlers[section] = function_name
end
@@ -130,4 +140,8 @@ add_handler("ELEMENT", parse_element_section)
add_handler("NSET", parse_nodeset_section)
<<<<<<< HEAD
end
=======
end
>>>>>>> 3e48ae32abe7a17af89cd1e23d798532aed2960a