solver name

This commit is contained in:
Jukka Aho
2015-12-04 08:09:11 +02:00
parent 4b07da194a
commit c414d49d1b
2 changed files with 58 additions and 8 deletions
+7 -6
View File
@@ -8,6 +8,7 @@ using JuliaFEM
@everywhere assemble = JuliaFEM.Core.assemble
type DirectSolver <: Solver
name :: ASCIIString
field_problems :: Vector{Problem}
boundary_problems :: Vector{BoundaryProblem}
parallel :: Bool
@@ -20,8 +21,9 @@ type DirectSolver <: Solver
end
""" Default initializer. """
function DirectSolver()
function DirectSolver(name="DirectSolver")
DirectSolver(
name,
[], # field problems
[], # boundary problems
false, # parallel run?
@@ -67,12 +69,10 @@ function solve(K, f, C, g, ::Type{Val{:LDLt}})
t0 = time()
# make sure K is symmetric
K = Symmetric(K)
#=
# K = Symmetric(K)
s = maximum(abs(1/2*(K + K') - K))
@assert s < 1.0e-6
K = 1/2*(K + K')
=#
dim = size(K, 1)
@@ -230,8 +230,9 @@ function call(solver::DirectSolver, time::Number=0.0)
tic(timing, "dump matrices to disk")
if solver.dump_matrices
save("host_$(myid())_iteration_$(iter)_matrices.jld",
"stiffness matrix", K, "force vector", f,
filename = "matrices_$(solver.name)_host_$(myid())_iteration_$(iter).jld"
info("dumping matrices to disk, file = $filename")
save(filename, "stiffness matrix", K, "force vector", f,
"constraint matrix lhs", C, "constraint matrix rhs", g)
end
toc(timing, "dump matrices to disk")
+51 -2
View File
@@ -65,6 +65,56 @@ function test_solver_multiple_dirichlet_bc()
end
#test_solver_multiple_dirichlet_bc()
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 = :LU
# solver.dump_matrices = true
solver.max_iterations = 1
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])
end
#test_direct_cholesky_with_non_homogeneous_dirichlet_conditions()
function test_solver_no_convergence()
@@ -106,11 +156,10 @@ function test_solver_no_convergence()
# 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],