From 5cf067288e2d0c0bee2d1928ccca810a7f3c7102 Mon Sep 17 00:00:00 2001 From: Jukka Aho Date: Sat, 2 Jan 2016 00:17:40 +0200 Subject: [PATCH] solve total quantity u for now, set solve_residual=false in solver --- src/linear_elasticity.jl | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/linear_elasticity.jl b/src/linear_elasticity.jl index cca07f0..1201db6 100644 --- a/src/linear_elasticity.jl +++ b/src/linear_elasticity.jl @@ -57,10 +57,10 @@ function assemble!{E<:CG, P<:LinearElasticityProblem}(assembly::Assembly, proble # solve residual, i.e. K du = K \ -(Ku(prev) - F) # in first iteration u(prev) typically 0 -> no effect # but if geometrical or material nonlinearities iterations are needed - if haskey(element, "displacement") - u_prev = vec(element("displacement", ip, time)) - add!(assembly.force_vector, gdofs, -Kt*u_prev) - end +# if haskey(element, "displacement") +# u_prev = vec(element("displacement", ip, time)) +# add!(assembly.force_vector, gdofs, -Kt*u_prev) +# end end if haskey(element, "displacement load") b = element("displacement load", ip, time) @@ -120,14 +120,11 @@ function assemble!{E<:CG, P<:PlaneStressLinearElasticityProblem}(assembly::Assem # solve residual, i.e. K du = K \ -(Ku(prev) - F) # in first iteration u(prev) typically 0 -> no effect # but if geometrical or material nonlinearities iterations are needed - if haskey(element, "displacement") - u_prev = element("displacement", time) -# info("u_prev = $u_prev") -# info("Kt = $Kt") - u_prev = vec(u_prev) -# info("u_prev = $u_prev") - add!(assembly.force_vector, gdofs, -Kt*u_prev) - end +# if haskey(element, "displacement") +# u_prev = element("displacement", time) +# u_prev = vec(u_prev) +# add!(assembly.force_vector, gdofs, -Kt*u_prev) +# end end if haskey(element, "displacement load") b = element("displacement load", ip, time)