decouple test from Mortar2D

JuliaFEM · May 17, 2018 · 9e82564 · 9e82564
1 parent e0bfe12
commit 9e82564
Showing 1 changed file with 31 additions and 169 deletions.
diff --git a/test/test_mortar_2d_mesh_tie_forwarddiff.jl b/test/test_mortar_2d_mesh_tie_forwarddiff.jl
@@ -6,172 +6,34 @@ using JuliaFEM.Preprocess
 using JuliaFEM.Postprocess
 using JuliaFEM.Testing
 
-function get_model(::Type{Val{Symbol("mesh tie with curved 2d block")}};
-            dy=0.0, adjust=false, tolerance=0.0, rotate_normals=false, swap=false,
-            dual_basis=false, use_forwarddiff=true, finite_strain=false,
-            geometric_stiffness=false)
-
-    meshfile = @__DIR__() * "/testdata/block_2d_curved.med"
-    mesh = aster_read_mesh(meshfile)
-
-    upper = Problem(Elasticity, "upper", 2)
-    upper.properties.formulation = :plane_stress
-    upper.properties.finite_strain = finite_strain
-    upper.properties.geometric_stiffness = geometric_stiffness
-    upper.elements = create_elements(mesh, "UPPER")
-    update!(upper.elements, "youngs modulus", 96.0)
-    update!(upper.elements, "poissons ratio", 1/3)
-
-    lower = Problem(Elasticity, "lower", 2)
-    lower.properties.formulation = :plane_stress
-    lower.properties.finite_strain = finite_strain
-    lower.properties.geometric_stiffness = geometric_stiffness
-    lower.elements = create_elements(mesh, "LOWER")
-    update!(lower.elements, "youngs modulus", 96.0)
-    update!(lower.elements, "poissons ratio", 1/3)
-
-    bc_upper = Problem(Dirichlet, "upper boundary", 2, "displacement")
-    bc_upper.elements = create_elements(mesh, "UPPER_TOP")
-    update!(bc_upper.elements, "displacement 1", 0.0)
-    update!(bc_upper.elements, "displacement 2", dy)
-
-    bc_lower = Problem(Dirichlet, "lower boundary", 2, "displacement")
-    bc_lower.elements = create_elements(mesh, "LOWER_BOTTOM")
-    update!(bc_lower.elements, "displacement 1", 0.0)
-    update!(bc_lower.elements, "displacement 2", 0.0)
-
-    interface = Problem(Mortar, "interface between upper and lower block", 2, "displacement")
-    interface_slave_elements = create_elements(mesh, "LOWER_TOP")
-    interface_master_elements = create_elements(mesh, "UPPER_BOTTOM")
-    if swap
-        interface_slave_elements, interface_master_elements = interface_master_elements, interface_slave_elements
-    end
-    update!(interface_slave_elements, "master elements", interface_master_elements)
-    interface.elements = [interface_master_elements; interface_slave_elements]
-    interface.properties.adjust = adjust
-    interface.properties.distval = tolerance
-    interface.properties.rotate_normals = rotate_normals
-    interface.properties.dual_basis = dual_basis
-    interface.properties.use_forwarddiff = use_forwarddiff
-    interface.assembly.u = zeros(2*length(mesh.nodes))
-    interface.assembly.la = zeros(2*length(mesh.nodes))
-
-    solver = Solver(Linear)
-    push!(solver, upper, lower, bc_upper, bc_lower, interface)
-
-    return solver
-
-end
-
-#=
-
-@testset "curved surface with adjust=true, standard lagrange, slave=lower surface, dy=0.0" begin
-    # TODO: analytical solution now known, verify using other fem software
-    solver = get_model("mesh tie with curved 2d block";
-        adjust=false, tolerance=10, dy=-0.1, rotate_normals=true,
-        dual_basis=true, use_forwarddiff=true, finite_strain=false,
-        geometric_stiffness=false)
-    solver()
-    interface = solver["interface between upper and lower block"]
-    @test isapprox(norm(interface.assembly.u), 0.11339715157447851)
-end
-
-
-@testset "curved surface with adjust=true, dual lagrange, slave=lower surface, dy=0.0" begin
-    # TODO: analytical solution now known, verify using other fem software
-    solver = get_model("mesh tie with curved 2d block";
-        adjust=true, tolerance=10, dy=0.0, rotate_normals=true,
-        dual_basis=true, use_forwarddiff=true)
-    solver()
-    interface = solver["interface between upper and lower block"]
-    @test solver.properties.iteration == 2
-    # differs -- why?
-    @test isapprox(norm(interface.assembly.u), 0.11660422877751599)
-end
-
-@testset "curved surface with adjust=true, standard lagrange, slave=lower surface, dy=-0.1" begin
-    # TODO: analytical solution now known, verify using other fem software
-    solver = get_model("mesh tie with curved 2d block";
-        adjust=true, tolerance=10, dy=-0.1, rotate_normals=true,
-        dual_basis=false, use_forwarddiff=true)
-    solver()
-    interface = solver["interface between upper and lower block"]
-    @test solver.properties.iteration == 2
-    @test isapprox(norm(interface.assembly.u), 0.34230262165505887)
-end
-
-@testset "curved surface, adjust=true, dual basis, slave=lower surface, dy=-0.1" begin
-    # TODO: analytical solution now known, verify using other fem software
-    solver = get_model("mesh tie with curved 2d block";
-        adjust=true, tolerance=10, dy=-0.1, rotate_normals=true,
-        dual_basis=true, use_forwarddiff=true)
-    solver()
-    interface = solver["interface between upper and lower block"]
-    @test solver.properties.iteration == 2
-    @test isapprox(norm(interface.assembly.u), 0.34318800698017704)
-end
-
-=#
-
-
-
-@testset "compare forwarddiff solution to normal" begin
-    X = Dict(
-        1 => [0.0, 0.0],
-        2 => [1.0, 0.0],
-        3 => [0.0, 1.0],
-        4 => [1.0, 1.0])
-    u = Dict(
-        1 => [0.0, 0.0],
-        2 => [0.0, 0.0],
-        3 => [0.0, 0.0],
-        4 => [0.0, 0.0])
-    sel1 = Element(Seg2, [1, 2])
-    mel1 = Element(Seg2, [3, 4])
-    update!([sel1, mel1], "geometry", X)
-    update!([sel1, mel1], "displacement", u)
-    p1 = Problem(Mortar2D, "test 1", 2, "displacement")
-    p2 = Problem(Mortar2DAD, "test 2", 2, "displacement")
-    add_slave_elements!(p1, [sel1])
-    add_master_elements!(p1, [mel1])
-    add_slave_elements!(p2, [sel1])
-    add_master_elements!(p2, [mel1])
-    p2.assembly.u = zeros(8)
-    p2.assembly.la = zeros(8)
-    assemble!(p1, 0.0)
-    assemble!(p2, 0.0)
-    println(p1.assembly.C1)
-    println(p2.assembly.C1)
-
-    @test isapprox(p1.assembly, p2.assembly)
-
-    #=
-    empty!(p1.assembly)
-    empty!(p2.assembly)
-    p1.properties.adjust = true
-    p2.properties.adjust = true
-    assemble!(p1, 0.0)
-    assemble!(p2, 0.0)
-    C11 = full(p1.assembly.C1, 4, 8)
-    C12 = full(p2.assembly.C1, 4, 8)
-    C21 = full(p1.assembly.C2, 4, 8)
-    C22 = full(p2.assembly.C2, 4, 8)
-    D1 = full(p1.assembly.D)
-    D2 = full(p2.assembly.D)
-    g1 = full(p1.assembly.g, 4, 1)
-    g2 = full(p2.assembly.g, 4, 1)
-    println("C1")
-    dump(C11)
-    dump(C12)
-    println("C2")
-    dump(C21)
-    dump(C22)
-    println("D")
-    dump(D1)
-    dump(D2)
-    println("g")
-    dump(g1)
-    dump(g2)
-    @test isapprox(p1.assembly, p2.assembly)
-    =#
-end
+X = Dict(
+    1 => [0.0, 0.0],
+    2 => [1.0, 0.0],
+    3 => [0.0, 1.0],
+    4 => [1.0, 1.0])
+
+u = Dict(
+    1 => [0.0, 0.0],
+    2 => [0.0, 0.0],
+    3 => [0.0, 0.0],
+    4 => [0.0, 0.0])
+
+slave = Element(Seg2, [1, 2])
+master = Element(Seg2, [3, 4])
+update!([slave, master], "geometry", X)
+update!([slave, master], "displacement", u)
+problem = Problem(Mortar2DAD, "test problem", 2, "displacement")
+add_slave_elements!(problem, [slave])
+add_master_elements!(problem, [master])
+problem.assembly.u = zeros(8)
+problem.assembly.la = zeros(8)
+assemble!(problem, 0.0)
+C1_expected = 1/6*[
+               2.0 0.0 1.0 0.0 -2.0 0.0 -1.0 0.0
+               0.0 2.0 0.0 1.0 0.0 -2.0 0.0 -1.0
+               1.0 0.0 2.0 0.0 -1.0 0.0 -2.0 0.0
+               0.0 1.0 0.0 2.0 0.0 -1.0 0.0 -2.0]
+C1 = full(problem.assembly.C1)
+C2 = full(problem.assembly.C2)
+@test isapprox(C1, C2)
+@test isapprox(C1, C1_expected)