Merge branch 'master' into kc/local_buffer

This commit is contained in:
Jukka Aho
2019-11-26 15:29:02 +07:00
15 changed files with 155 additions and 56 deletions
-2
View File
@@ -1,2 +0,0 @@
Documenter
Literate
+3 -2
View File
@@ -3,8 +3,11 @@
using JuliaFEM, Test
<<<<<<< HEAD
# include("../docs/make.jl")
=======
>>>>>>> master
@testset "JuliaFEM.jl" begin
@testset "test_dirichlet.jl" begin
include("test_dirichlet.jl")
@@ -163,5 +166,3 @@ using JuliaFEM, Test
include("test_von_mises_material.jl")
end
end
include("../docs/deploy.jl")
@@ -34,4 +34,4 @@ eigs_expected = [8809.45, 4936.01, 2880.56, 2491.66, 2004.85,
195.832, 104.008, 72.7562, 64.4376, 53.8515,
23.8417, 16.6354, 9.54682, 6.93361, 2.22099,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
@test isapprox(eigs, eigs_expected; atol=1.0e-2)
@test isapprox(sort(eigs), sort(eigs_expected); atol=1.0e-2)