Glassvision/JuliaFEM.jl
1
0
Fork 0
mirror of https://github.com/JuliaFEM/JuliaFEM.jl.git synced 2026-09-30 13:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes to incremental formulation

Browse Source
This commit is contained in:
Jukka Aho
2016-02-11 02:51:27 +02:00
parent 2cca0a5677
commit 7cc14c57c8
3 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/problems.jl
+4 -1
View File
@@ -169,9 +169,11 @@ function update_assembly!(problem, u, la)
assembly.u_prev = copy(assembly.u)
assembly.la_prev = copy(assembly.la)
if get_formulation_type(problem) == :incremental
info("incremental formulation, adding increment to solution vector")
assembly.u += u
assembly.la += la
else
info("total formulation, replacing solution vector with new values")
assembly.u = u
assembly.la = la
end
@@ -179,7 +181,8 @@ function update_assembly!(problem, u, la)
# calculate change of norm
assembly.u_norm_change = norm(assembly.u - assembly.u_prev)
assembly.la_norm_change = norm(assembly.la - assembly.la_prev)
return assembly.u_norm_change, assembly.la_norm_change
#return assembly.u_norm_change, assembly.la_norm_change
return assembly.u, assembly.la
end
""" Update solutions to elements.
src/solvers.jl
+11 -3
View File
@@ -348,16 +348,24 @@ Notes
-----
Default convergence criteria is obtained by checking each sub-problem convergence.
"""
function has_converged(solver::Solver)
function has_converged(solver::Solver; check_convergence_for_boundary_problems=false)
converged = true
eps = solver.nonlinear_system_convergence_tolerance
for problem in solver.problems
has_converged = true
if is_field_problem(problem)
has_converged = problem.assembly.u_norm_change/norm(problem.assembly.u) < eps
info("Details for problem $(problem.name)")
info("Norm: $(norm(problem.assembly.u))")
info("Norm change: $(problem.assembly.u_norm_change)")
info("Has converged? $(has_converged)")
end
if is_boundary_problem(problem)
if is_boundary_problem(problem) && check_convergence_for_boundary_problems
has_converged = problem.assembly.la_norm_change/norm(problem.assembly.la) < eps
info("Details for problem $(problem.name)")
info("Norm: $(norm(problem.assembly.la))")
info("Norm change: $(problem.assembly.la_norm_change)")
info("Has converged? $(has_converged)")
end
converged &= has_converged
end
@@ -394,7 +402,7 @@ function call(solver::Solver)
# 2.3 update solution back to elements
for problem in solver.problems
update_assembly!(problem, u, la)
u, la = update_assembly!(problem, u, la)
update_elements!(problem, u, la)
end