Merge 606a2ea into 267e2af

.travis.yml

@@ -1,16 +1,21 @@
 language: julia
+
 os:
     - linux
+
 julia:
-    - 0.6
+    - 0.7
+    - 1.0
+    - nightly
+
+matrix:
+    allow_failures:
+        - julia: nightly
+
 addons:
     apt:
         packages:
             - hdf5-tools
-before_script:
-    - julia --color=yes -e 'Pkg.clone("https://github.com/JuliaFEM/PkgTestSuite.jl.git")'
-    - julia --color=yes -e 'using PkgTestSuite; init()'
-script:
-    - julia --color=yes -e 'using PkgTestSuite; test()'
+
 after_success:
-    - julia --color=yes -e 'using PkgTestSuite; deploy()'
+    - julia -e 'cd(Pkg.dir("AsterReader")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

REQUIRE

@@ -1,2 +1,3 @@
-julia 0.6
+julia 0.7
+FEMBase
 HDF5

docs/deploy.jl

@@ -5,7 +5,7 @@ using Documenter
 
 deploydocs(
     repo = "github.com/JuliaFEM/AsterReader.jl.git",
-    julia = "0.6",
+    julia = "0.7",
     target = "build",
     deps = nothing,
     make = nothing)

src/AsterReader.jl

@@ -2,8 +2,24 @@
 # License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE
 
 module AsterReader
-using HDF5
+
+using FEMBase, HDF5, LinearAlgebra, SparseArrays
+
+"""
+    parse_node_id(node_name)
+
+Return id number from node name. Usually the node name contains the id number,
+i.e. N123 => 123 and so on.
+
+"""
+function parse_node_id(node_name)
+    m = match(r"\d+", node_name)
+    m != nothing || error("Unable to parse id from node name $node_name.")
+    return tryparse(Int, m.match)
+end
+
 include("read_aster_mesh.jl")
 include("read_aster_results.jl")
 export aster_read_mesh
+
 end

src/read_aster_mesh.jl

@@ -5,7 +5,7 @@ function aster_parse_nodes(section; strip_characters=true)
     nodes = Dict{Any, Vector{Float64}}()
     has_started = false
     for line in split(section, '\n')
-        m = matchall(r"[\w.-]+", line)
+        m = collect((string(m.match) for m in eachmatch(r"[\w.-]+", line)))
         if (length(m) != 1) && (!has_started)
             continue
         end
@@ -18,13 +18,13 @@ function aster_parse_nodes(section; strip_characters=true)
                 break
             end
         end
+        to(T, x) = map(x -> parse(T, x), x)
         if length(m) == 4
-            nid = m[1]
             if strip_characters
-                nid = matchall(r"\d", nid)
-                nid = parse(Int, nid[1])
+                nodes[parse_node_id(m[1])] = to(Float64, m[2:end])
+            else
+                nodes[nid] = to(Float64, m[2:end])
             end
-            nodes[nid] = float(m[2:end])
         end
     end
     return nodes
@@ -203,5 +203,3 @@ function aster_read_mesh(fn, mesh_name=nothing)
     end
     return mesh
 end
-
-

src/read_aster_results.jl

@@ -23,9 +23,7 @@ function aster_read_nodes(rmed::RMEDFile)
     node_coords = reshape(node_coords, nnodes, dim)'
     stripper(node_name) = strip(ascii(unsafe_string(pointer(convert(Vector{UInt8}, node_name)))))
     node_names = map(stripper, node_names)
-    # INFO: quite safe assumption is that id is in node name, i.e. N1 => 1, N123 => 123
-    node_id(node_name) = parse(matchall(r"\d+", node_name)[1])
-    node_ids = map(node_id, node_names)
+    node_ids = map(parse_node_id, node_names)
     nodes = Dict(j => node_coords[:,j] for j in node_ids)
     return nodes
 end
@@ -34,7 +32,7 @@ end
 function aster_read_data(rmed::RMEDFile, field_name; field_type=:NODE,
                          info_fields=true, node_ids=nothing)
 
-    if contains(field_name, "ELGA")
+    if occursin("ELGA", field_name)
         field_type = :GAUSS
     end
 
@@ -46,7 +44,7 @@ function aster_read_data(rmed::RMEDFile, field_name; field_type=:NODE,
     if info_fields
         field_names = keys(rmed.data["CHA"])
         all_fields = join(field_names, ", ")
-        info("results: $all_fields")
+        @info("results: $all_fields")
     end
 
     chdata = rmed.data["CHA"]["RESU____$field_name"]
@@ -60,4 +58,3 @@ function aster_read_data(rmed::RMEDFile, field_name; field_type=:NODE,
     end
     return results
 end
-

test/REQUIRE

@@ -0,0 +1 @@
+Documenter

test/runtests.jl

@@ -1,10 +1,13 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE
 
-using AsterReader
-using Base.Test
+using FEMBase, AsterReader, Test, LinearAlgebra, SparseArrays
+
+include(joinpath("..", "docs", "make.jl"))
 
 @testset "AsterReader.jl" begin
     include("test_read_aster_mesh.jl")
     include("test_read_aster_results.jl")
 end
+
+include(joinpath("..", "docs", "deploy.jl"))

test/test_read_aster_mesh.jl

@@ -1,7 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE
 
-using Base.Test
+using FEMBase, Test, AsterReader
 using AsterReader: aster_parse_nodes, aster_read_mesh, MEDFile, get_element_sets
 
 datadir = first(splitext(basename(@__FILE__)))

test/test_read_aster_results.jl

@@ -1,7 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE
 
-using Base.Test
+using FEMBase, AsterReader, Test
 using AsterReader: RMEDFile, aster_read_data
 
 datadir = first(splitext(basename(@__FILE__)))