From 05b31a14eebe263faafae33f6f29fe894fa763ec Mon Sep 17 00:00:00 2001 From: Jukka Aho Date: Mon, 9 Jan 2017 11:26:26 +0200 Subject: [PATCH] removed obsolete test files --- test/test_api.jl | 104 ----------- test/test_directsolver.jl | 226 ------------------------ test/test_directsolver_with_vonmises.jl | 221 ----------------------- 3 files changed, 551 deletions(-) delete mode 100644 test/test_api.jl delete mode 100644 test/test_directsolver.jl delete mode 100644 test/test_directsolver_with_vonmises.jl diff --git a/test/test_api.jl b/test/test_api.jl deleted file mode 100644 index c3c542c..0000000 --- a/test/test_api.jl +++ /dev/null @@ -1,104 +0,0 @@ -# This file is a part of JuliaFEM. -# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md - -using JuliaFEM -using JuliaFEM.Preprocess -using JuliaFEM.Testing - -#= -using JuliaFEM.API -using JuliaFEM.Interfaces -=# - -#= TODO: Fix test -@testset "test basic workflow" begin - - # basic workflow, copied from test_solver.jl - model = Model("Piston Calculation") - - add_node!(model, 1, [0.0, 0.0]) - model.nodes[2] = [1.0, 0.0] - add_node!(model, 3, [1.0, 1.0]) - model.nodes[4] = [0.0, 1.0] - - # create elements - e1 = Element(1, [1, 2, 3, 4], :Quad4) - e2 = Element(2, [1, 2], :Seg2) - e3 = Element(3, [3, 4], :Seg2) - model.elements[1] = e1 - model.elements[2] = e2 - add_element!(model, 3, :Seg2, [3, 4]) - - # element set - elset = ElementSet("body", [e1, e2]) - elset4 = ElementSet("set_material", [e1]) - - model.elsets["body"] = elset - add_element_set!(model, "heat_flux", [2]) - add_element_set!(model, "constant_temp", [e3]) - add_element_set!(model, elset4) - - # material properties - material = Material("myMaterial") - material["temperature thermal conductivity"] = 6.0 - material["density"] = 36.0 - add_material!(model, "set_material", material) - - # Create problem - field_problem = Simulation(:HeatProblem) - add_element_set!(field_problem, "body") # is this necessary? - - # boundary conditions - bc = DirichletBC("constant_temp", "temperature" => 0.0) - ne = NeumannBC("heat_flux", "temperature flux" => ((0.0 => 0.0), - (1.0 => 600.0))) - - # LoadCase - add_boundary_condition!(field_problem, bc) - add_boundary_condition!(field_problem, ne) - - # Get solver - add_solver!(field_problem, :LinearSolver) - - # add case - add_simulation!(model, "Heat problem", field_problem) - #model.load_cases["Heat problem"] = field_problem - - # Solve problem - solve!(model, "Heat problem", 1.0) - xi = [0.0, -1.0] - T = model.elements[1].results("temperature", xi, 1.0) - X = model.elements[2].results("geometry", xi, 1.0) - info("Temperature at point X = $X is T = $T") - #@test isapprox(T, 200.0) -end -=# - -#= TODO: Fix test -@testset "test reading piston model using API" begin - abaqus_input = open(parse_abaqus, "./geometry/piston/piston_8789_P1.inp") - model = Model("Piston Calculation", abaqus_input) - @test length(keys(model.elsets)) == 4 - @test length(keys(model.nsets)) == 1 - @test length(keys(model.elements)) == 37331 - @test length(keys(model.nodes)) == 8789 -end -=# - -#= TODO: Fix test -function test_piston_107168() - abaqus_input = open(parse_abaqus, "./geometry/piston/piston_107168_P2.inp") - - model = Model("Piston Calculation", abaqus_input) - @test length(keys(model.elsets)) == 3 - @test length(keys(model.nsets)) == 1 - @test length(keys(model.elements)) == 65948 - @test length(keys(model.nodes)) == 107168 -end -=# - -function slow_test_something_that_takes_long_time() - info("This test is SLOW.") - test_piston_170168() -end - diff --git a/test/test_directsolver.jl b/test/test_directsolver.jl deleted file mode 100644 index 27f147f..0000000 --- a/test/test_directsolver.jl +++ /dev/null @@ -1,226 +0,0 @@ -# This file is a part of JuliaFEM. -# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md - -using JuliaFEM -using JuliaFEM.Preprocess -using JuliaFEM.Postprocess -using JuliaFEM.Testing - -# TODO: Fix tests - -function test_solver_multiple_dirichlet_bc() - - N = Vector[[0.0, 0.0], [1.0, 0.0], [0.0, 1.0], [1.0, 1.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e1["youngs modulus"] = 900.0 - e1["poissons ratio"] = 0.25 - b1 = Seg2([3, 4]) - b1["geometry"] = Vector[N[3], N[4]] - b1["displacement traction force"] = ( - 0.0 => Vector[[0.0, 0.0], [0.0, 0.0]], - 1.0 => Vector[[0.0, -100.0], [0.0, -100.0]]) - - problem = PlaneStressElasticityProblem() - push!(problem, e1) - push!(problem, b1) - - # manually solve problem 1 - # free_dofs = [3, 5, 6, 8] - # free_dofs = [3, 6, 7, 8] - #solve!(problem, free_dofs, 0.0; max_iterations=10) - #disp = e1("displacement", [1.0, 1.0], 0.0) - #info("displacement at tip: $disp") - #@test isapprox(disp, [3.17431158889468E-02, -1.38591518927826E-01]) - - # boundary elements for dirichlet dx=0 - dx = Seg2([1, 3]) - dx["geometry"] = Vector[N[1], N[3]] - dx["displacement 1"] = 0.0 - - # boundary elements for dirichlet dy=0 - dy = Seg2([1, 2]) - dy["geometry"] = Vector[N[1], N[2]] - dy["displacement 2"] = 0.0 - - problem2 = DirichletProblem("displacement", 2) - push!(problem2, dx) - - problem3 = DirichletProblem("displacement", 2) - push!(problem3, dy) - - solver = DirectSolver() - solver.dump_matrices = true - solver.name = "test_solver_multiple_dirichlet_bc" - push!(solver, problem) - push!(solver, problem2) - push!(solver, problem3) - - # launch solver - #norm = solver(0.0) - norm = solver(1.0) - disp = e1("displacement", [1.0, 1.0], 1.0) - info("displacement at tip: $disp") - @test isapprox(disp, [3.17431158889468E-02, -1.38591518927826E-01]) - -end - -function test_direct_cholesky_with_non_homogeneous_dirichlet_conditions() - - N = Vector[[0.0, 0.0], [1.0, 0.0], [0.0, 1.0], [1.0, 1.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e1["youngs modulus"] = 900.0 - e1["poissons ratio"] = 0.25 - - problem = PlaneStressElasticityProblem() - push!(problem, e1) - - # left boundary: dx=-0.1, dy=0.1 - bc1 = Seg2([1, 3]) - bc1["geometry"] = Vector[N[1], N[3]] - bc1["displacement 1"] = -0.1 - bc1["displacement 2"] = 0.1 - - # right boundary: dx=0.2, dy=-0.2 - bc2 = Seg2([2, 4]) - bc2["geometry"] = Vector[N[2], N[4]] - bc2["displacement 1"] = 0.2 - bc2["displacement 2"] = -0.2 - - boundary = DirichletProblem("displacement", 2) - push!(boundary, bc1) - push!(boundary, bc2) - - solver = DirectSolver("test_direct_cholesky_with_non_homogeneous_dirichlet_boundary_conditions") - push!(solver, problem) - push!(solver, boundary) - - # launch solver - solver.method = :UMFPACK - solver.dump_matrices = true - solver.max_iterations = 1 - iters, status = solver(0.0) -# FIXME: solver gives no convergence warning when all dofs are fixed. - n1disp = e1("displacement", [-1.0, -1.0], 0.0) - n2disp = e1("displacement", [ 1.0, -1.0], 0.0) - n3disp = e1("displacement", [-1.0, 1.0], 0.0) - n4disp = e1("displacement", [ 1.0, 1.0], 0.0) - udisp = [n1disp n2disp n3disp n4disp] - info("nodal disp = ", udisp) - @test isapprox(n1disp, [-0.1, 0.1]) - @test isapprox(n3disp, [-0.1, 0.1]) - @test isapprox(n2disp, [ 0.2, -0.2]) - @test isapprox(n4disp, [ 0.2, -0.2]) - @test status == true -end - -function test_solver_no_convergence() - - N = Vector[[0.0, 0.0], [1.0, 0.0], [0.0, 1.0], [1.0, 1.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e1["youngs modulus"] = 900.0 - e1["poissons ratio"] = 0.25 - b1 = Seg2([3, 4]) - b1["geometry"] = Vector[N[3], N[4]] - b1["displacement traction force"] = Vector[[100.0, 100.0], [100.0, 100.0]] - - problem = PlaneStressElasticityProblem() - push!(problem, e1) - push!(problem, b1) - - # boundary elements for dirichlet dx=0 - dx = Seg2([1, 3]) - dx["geometry"] = Vector[N[1], N[3]] - dx["displacement 1"] = 0.0 - - # boundary elements for dirichlet dy=0 - dy = Seg2([1, 2]) - dy["geometry"] = Vector[N[1], N[2]] - dy["displacement 2"] = 0.0 - - problem2 = DirichletProblem("displacement", 2) - push!(problem2, dx) - - problem3 = DirichletProblem("displacement", 2) - push!(problem3, dy) - - solver = DirectSolver() - solver.max_iterations = 1 - push!(solver, problem) - push!(solver, problem2) - push!(solver, problem3) - - # launch solver - iterations, status = solver(0.0) - @test status == false -end - - -function test_solver_multiple_bodies_multiple_dirichlet_bc() - N = Vector[ - [0.0, 0.0], [1.0, 0.0], - [0.0, 1.0], [1.0, 1.0], - [0.0, 2.0], [1.0, 2.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e2 = Quad4([3, 4, 6, 5]) - e2["geometry"] = Vector[N[3], N[4], N[6], N[5]] - for el in [e1, e2] - el["youngs modulus"] = 900.0 - el["poissons ratio"] = 0.25 - end - b1 = Seg2([5, 6]) - b1["geometry"] = Vector[N[5], N[6]] - b1["displacement traction force"] = Vector[[0.0, -100.0], [0.0, -100.0]] - - body1 = PlaneStressElasticityProblem() - push!(body1, e1) - - body2 = PlaneStressElasticityProblem() - push!(body2, e2) - push!(body2, b1) - - # boundary elements for dirichlet dx=0 - dx1 = Seg2([1, 3]) - dx1["geometry"] = Vector[N[1], N[3]] - dx2 = Seg2([3, 5]) - dx2["geometry"] = Vector[N[3], N[5]] - for dx in [dx1, dx2] - dx["displacement 1"] = 0.0 - end - - boundary1 = DirichletProblem("displacement", 2) - push!(boundary1, dx1) - push!(boundary1, dx2) - - # boundary elements for dirichlet dy=0 - dy1 = Seg2([1, 2]) - dy1["geometry"] = Vector[N[1], N[2]] - dy1["displacement 2"] = 0.0 - - boundary2 = DirichletProblem("displacement", 2) - push!(boundary2, dy1) - - - solver = DirectSolver() - push!(solver, body1) - push!(solver, body2) - push!(solver, boundary1) - push!(solver, boundary2) - - # launch solver - norm = solver(0.0) - - disp = e2("displacement", [1.0, 1.0], 0.0) - info("displacement at tip: $disp") - # code aster verification, two_elements.comm - @test isapprox(disp, [3.17431158889468E-02, -2.77183037855653E-01]) - -end - diff --git a/test/test_directsolver_with_vonmises.jl b/test/test_directsolver_with_vonmises.jl deleted file mode 100644 index f04b551..0000000 --- a/test/test_directsolver_with_vonmises.jl +++ /dev/null @@ -1,221 +0,0 @@ -# This file is a part of JuliaFEM. -# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md - -using JuliaFEM -using JuliaFEM.Preprocess -using JuliaFEM.Postprocess -using JuliaFEM.Testing - -# TODO: Fix tests. - -function test_solver_multiple_dirichlet_bc() - - N = Vector[[0.0, 0.0], [1.0, 0.0], [0.0, 1.0], [1.0, 1.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e1["youngs modulus"] = 900.0 - e1["poissons ratio"] = 0.25 - e1["yield stress"] = 100.0 - e1["material model"] = :vonMises - b1 = Seg2([3, 4]) - b1["geometry"] = Vector[N[3], N[4]] - b1["displacement traction force"] = ( - 0.0 => Vector[[0.0, 0.0], [0.0, 0.0]], - 1.0 => Vector[[0.0, -100.0], [0.0, -100.0]]) - - #problem = PlaneStressElasticityProblem() - problem = PlaneStressElasticPlasticProblem() - push!(problem, e1) - push!(problem, b1) - - # boundary elements for dirichlet dx=0 - dx = Seg2([1, 3]) - dx["geometry"] = Vector[N[1], N[3]] - dx["displacement 1"] = 0.0 - - # boundary elements for dirichlet dy=0 - dy = Seg2([1, 2]) - dy["geometry"] = Vector[N[1], N[2]] - dy["displacement 2"] = 0.0 - - problem2 = DirichletProblem("displacement", 2) - push!(problem2, dx) - - problem3 = DirichletProblem("displacement", 2) - push!(problem3, dy) - - solver = DirectSolver() - #solver.dump_matrices = true - solver.name = "test_solver_multiple_dirichlet_bc" - push!(solver, problem) - push!(solver, problem2) - push!(solver, problem3) - - # launch solver - #norm = solver(0.0) - norm = solver(1.0) - disp = e1("displacement", [1.0, 1.0], 1.0) - info("displacement at tip: $disp") - #@test isapprox(disp, [3.17431158889468E-02, -1.38591518927826E-01]) - -end - -function test_direct_cholesky_with_non_homogeneous_dirichlet_conditions() - - N = Vector[[0.0, 0.0], [1.0, 0.0], [0.0, 1.0], [1.0, 1.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e1["youngs modulus"] = 900.0 - e1["poissons ratio"] = 0.25 - - problem = PlaneStressElasticityProblem() - push!(problem, e1) - - # left boundary: dx=-0.1, dy=0.1 - bc1 = Seg2([1, 3]) - bc1["geometry"] = Vector[N[1], N[3]] - bc1["displacement 1"] = -0.1 - bc1["displacement 2"] = 0.1 - - # right boundary: dx=0.2, dy=-0.2 - bc2 = Seg2([2, 4]) - bc2["geometry"] = Vector[N[2], N[4]] - bc2["displacement 1"] = 0.2 - bc2["displacement 2"] = -0.2 - - boundary = DirichletProblem("displacement", 2) - push!(boundary, bc1) - push!(boundary, bc2) - - solver = DirectSolver("test_direct_cholesky_with_non_homogeneous_dirichlet_boundary_conditions") - push!(solver, problem) - push!(solver, boundary) - - # launch solver - solver.method = :UMFPACK - solver.dump_matrices = true - solver.max_iterations = 1 - iters, status = solver(0.0) -# FIXME: solver gives no convergence warning when all dofs are fixed. - n1disp = e1("displacement", [-1.0, -1.0], 0.0) - n2disp = e1("displacement", [ 1.0, -1.0], 0.0) - n3disp = e1("displacement", [-1.0, 1.0], 0.0) - n4disp = e1("displacement", [ 1.0, 1.0], 0.0) - udisp = [n1disp n2disp n3disp n4disp] - info("nodal disp = ", udisp) - @test isapprox(n1disp, [-0.1, 0.1]) - @test isapprox(n3disp, [-0.1, 0.1]) - @test isapprox(n2disp, [ 0.2, -0.2]) - @test isapprox(n4disp, [ 0.2, -0.2]) - @test status == true -end - -function test_solver_no_convergence() - - N = Vector[[0.0, 0.0], [1.0, 0.0], [0.0, 1.0], [1.0, 1.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e1["youngs modulus"] = 900.0 - e1["poissons ratio"] = 0.25 - b1 = Seg2([3, 4]) - b1["geometry"] = Vector[N[3], N[4]] - b1["displacement traction force"] = Vector[[100.0, 100.0], [100.0, 100.0]] - - problem = PlaneStressElasticityProblem() - push!(problem, e1) - push!(problem, b1) - - # boundary elements for dirichlet dx=0 - dx = Seg2([1, 3]) - dx["geometry"] = Vector[N[1], N[3]] - dx["displacement 1"] = 0.0 - - # boundary elements for dirichlet dy=0 - dy = Seg2([1, 2]) - dy["geometry"] = Vector[N[1], N[2]] - dy["displacement 2"] = 0.0 - - problem2 = DirichletProblem("displacement", 2) - push!(problem2, dx) - - problem3 = DirichletProblem("displacement", 2) - push!(problem3, dy) - - solver = DirectSolver() - solver.max_iterations = 1 - push!(solver, problem) - push!(solver, problem2) - push!(solver, problem3) - - # launch solver - iterations, status = solver(0.0) - @test status == false -end - - -function test_solver_multiple_bodies_multiple_dirichlet_bc() - N = Vector[ - [0.0, 0.0], [1.0, 0.0], - [0.0, 1.0], [1.0, 1.0], - [0.0, 2.0], [1.0, 2.0]] - - e1 = Quad4([1, 2, 4, 3]) - e1["geometry"] = Vector[N[1], N[2], N[4], N[3]] - e2 = Quad4([3, 4, 6, 5]) - e2["geometry"] = Vector[N[3], N[4], N[6], N[5]] - for el in [e1, e2] - el["youngs modulus"] = 900.0 - el["poissons ratio"] = 0.25 - end - b1 = Seg2([5, 6]) - b1["geometry"] = Vector[N[5], N[6]] - b1["displacement traction force"] = Vector[[0.0, -100.0], [0.0, -100.0]] - - body1 = PlaneStressElasticityProblem() - push!(body1, e1) - - body2 = PlaneStressElasticityProblem() - push!(body2, e2) - push!(body2, b1) - - # boundary elements for dirichlet dx=0 - dx1 = Seg2([1, 3]) - dx1["geometry"] = Vector[N[1], N[3]] - dx2 = Seg2([3, 5]) - dx2["geometry"] = Vector[N[3], N[5]] - for dx in [dx1, dx2] - dx["displacement 1"] = 0.0 - end - - boundary1 = DirichletProblem("displacement", 2) - push!(boundary1, dx1) - push!(boundary1, dx2) - - # boundary elements for dirichlet dy=0 - dy1 = Seg2([1, 2]) - dy1["geometry"] = Vector[N[1], N[2]] - dy1["displacement 2"] = 0.0 - - boundary2 = DirichletProblem("displacement", 2) - push!(boundary2, dy1) - - - solver = DirectSolver() - push!(solver, body1) - push!(solver, body2) - push!(solver, boundary1) - push!(solver, boundary2) - - # launch solver - norm = solver(0.0) - - disp = e2("displacement", [1.0, 1.0], 0.0) - info("displacement at tip: $disp") - # code aster verification, two_elements.comm - @test isapprox(disp, [3.17431158889468E-02, -2.77183037855653E-01]) - -end -