Merge branch 'master' of https://github.com/ovainola/JuliaFEM

.travis.yml

@@ -2,13 +2,13 @@ language: julia
 os:
   - linux
 julia:
-#  - release
+  - release
   - nightly
 notifications:
   email: false
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-# - julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.build("JuliaFEM"); run(`ls -al`) ;Pkg.test("JuliaFEM"; coverage=true)'
+#  - julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.build("JuliaFEM"); Pkg.test("JuliaFEM"; coverage=true)'
   - julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.build("JuliaFEM")'
 after_success:
  - julia -e 'Pkg.test("JuliaFEM"; coverage=true)'

REQUIRE

@@ -0,0 +1,4 @@
+julia 0.4-
+Logging
+LightXML
+Docile

src/JuliaFEM.jl

@@ -1,6 +1,8 @@
 # This file is a part of JuliaFEM. License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
 module JuliaFEM
 
+VERSION < v"0.4-" && using Docile
+
 export Model, new_model, new_field, get_field, add_nodes, get_nodes, add_elements, get_elements
 
 

test/runtests.jl

@@ -1,6 +1,7 @@
 using JuliaFEM
 using Base.Test
-
+using Logging
+@Logging.configure(level=DEBUG)
 
 function test_create_model()
     m = new_model()
@@ -81,8 +82,8 @@ function test_print()
     close(fil)
   end
   #@test lines_with_print == Dict()
-  println("number of lines with print = ", length(lines_with_print))
-  println(lines_with_print)
+  @debug("number of lines with print = ", length(lines_with_print))
+  @debug(lines_with_print)
   @test length(lines_with_print) == 0
 end
 test_print()
@@ -100,7 +101,7 @@ function test_add_element()
     el2 = Dict("element_type" => 0x6, "node_ids" => [4, 3, 2, 1])
     elements = Dict(1 => el1, 2 => el2)
     add_elements(m, elements)
-    println(m)
+    @debug(m)
     @test m.elements["element_type"][1] == 0x6
     @test m.elements["connectivity"][1] == [1, 2, 3, 4]
 end