Glassvision/JuliaFEM.jl
1
0
Fork 0
mirror of https://github.com/JuliaFEM/JuliaFEM.jl.git synced 2026-09-29 13:00:29 +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 502e9bbf31
commit 638128b4f3
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.