cleaning up duplications in mechanics test.

Author: cmhamel

test/mechanics/TestMechanics.jl

@@ -11,14 +11,17 @@ output_file = Base.source_dir() * "/mechanics.e"
 fixed(_, _) = 0.
 displace(_, t) = 1.e-3 * t
 
-function mechanics_test()
+function test_mechanics_dirichlet_only(
+  dev, use_condensed,
+  nsolver, lsolver
+)
   mesh = UnstructuredMesh(mesh_file)
   V = FunctionSpace(mesh, H1Field, Lagrange) 
   physics = Mechanics(PlaneStrain())
   props = create_properties(physics)
 
   u = VectorFunction(V, :displ)
-  asm = SparseMatrixAssembler(u)
+  asm = SparseMatrixAssembler(u; use_condensed=use_condensed)
 
   dbcs = DirichletBC[
     DirichletBC(:displ_x, :sset_3, fixed),
@@ -31,15 +34,24 @@ function mechanics_test()
   times = TimeStepper(0., 1., 1)
   p = create_parameters(mesh, asm, physics, props; dirichlet_bcs=dbcs, times=times)
 
-  solver = NewtonSolver(IterativeLinearSolver(asm, :CgSolver))
+  if dev != cpu
+    p = p |> dev
+    asm = asm |> dev 
+  end
+
+  solver = nsolver(lsolver(asm))
   integrator = QuasiStaticIntegrator(solver)
   evolve!(integrator, p)
 
+  if dev != cpu
+    p = p |> cpu
+  end
+
+  U = p.h1_field
+
   pp = PostProcessor(mesh, output_file, u)
   write_times(pp, 1, 0.0)
-  write_field(pp, 1, ("displ_x", "displ_y"), p.h1_field)
+  write_field(pp, 1, ("displ_x", "displ_y"), U)
   # write_field(pp, 1, U)
   close(pp)
 end
-
-mechanics_test()

test/mechanics/TestMechanicsAMDGPU.jl

@@ -126,52 +126,3 @@ function test_poisson_neumann(
   # rm(output_file; force=true)
   display(solver.timer)
 end
-
-# function test_poisson_iterative(dev, use_condensed)
-#   mesh = UnstructuredMesh(mesh_file)
-#   V = FunctionSpace(mesh, H1Field, Lagrange) 
-#   physics = Poisson()
-#   props = create_properties(physics)
-#   u = ScalarFunction(V, :u)
-#   asm = SparseMatrixAssembler(u; use_condensed)
-
-#   # setup and update bcs
-#   dbcs = DirichletBC[
-#     DirichletBC(:u, :sset_1, bc_func),
-#     DirichletBC(:u, :sset_2, bc_func),
-#     DirichletBC(:u, :sset_3, bc_func),
-#     DirichletBC(:u, :sset_4, bc_func),
-#   ]
-
-#   # iterative solver test
-#   # setup the parameters
-#   p = create_parameters(mesh, asm, physics, props; dirichlet_bcs=dbcs)
-
-#   if dev != cpu
-#     p = p |> dev
-#     asm = asm |> dev 
-#   end
-
-#   # setup solver and integrator
-#   solver = NewtonSolver(IterativeLinearSolver(asm, :CgSolver))
-#   integrator = QuasiStaticIntegrator(solver)
-#   @time evolve!(integrator, p)
-
-#   display(solver.timer)
-
-#   if dev != cpu
-#     p = p |> cpu
-#   end
-
-#   U = p.h1_field
-#   pp = PostProcessor(mesh, output_file, u)
-#   write_times(pp, 1, 0.0)
-#   write_field(pp, 1, ("u",), U)
-#   close(pp)
-
-#   if !Sys.iswindows()
-#     @test exodiff(output_file, gold_file)
-#   end
-#   rm(output_file; force=true)
-#   display(solver.timer)
-# end

test/mechanics/TestMechanicsCUDA.jl

@@ -64,11 +64,22 @@ end
 @testset ExtendedTestSet "Mechanics Problem" begin
   include("mechanics/TestMechanicsCommon.jl")
   include("mechanics/TestMechanics.jl")
+
+  cg_solver = x -> IterativeLinearSolver(x, :CgSolver)
+
+  test_mechanics_dirichlet_only(cpu, false, NewtonSolver, DirectLinearSolver)
+  test_mechanics_dirichlet_only(cpu, true, NewtonSolver, DirectLinearSolver)
+  test_mechanics_dirichlet_only(cpu, false, NewtonSolver, cg_solver)
+  test_mechanics_dirichlet_only(cpu, true, NewtonSolver, cg_solver)
+  
   if AMDGPU.functional()
-    include("mechanics/TestMechanicsAMDGPU.jl")
+    test_mechanics_dirichlet_only(rocm, false, NewtonSolver, cg_solver)
+    test_mechanics_dirichlet_only(rocm, true, NewtonSolver, cg_solver)
   end
+
   if CUDA.functional()
-    include("mechanics/TestMechanicsCUDA.jl")
+    test_mechanics_dirichlet_only(cuda, false, NewtonSolver, cg_solver)
+    test_mechanics_dirichlet_only(cuda, true, NewtonSolver, cg_solver)
   end
 end