Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduction of operate_integration_points! closure in run! #7

Merged
merged 2 commits into from
Aug 24, 2019
Merged

Introduction of operate_integration_points! closure in run! #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe6398
Introduction of operate_integration_points! closure in run!
Aug 24, 2019
7639db7
Travis updated to test with Julia 1.2 and allow to fail with nightly.
Aug 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
language: julia

os:
- linux

julia:
- 1.0
- 1.2
- nightly

matrix:
allow_failures:
- julia: nightly
fast_finish: true
notifications:
email: false
script:
- julia --project -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/JuliaFEM/Materials.jl"));
Pkg.build();
Pkg.test(; coverage=true)'

after_success:
- julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
108 changes: 38 additions & 70 deletions src/mecamatso.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,17 +252,41 @@ function FEMBase.run!(analysis::Analysis{MecaMatSo})
FEMBase.initialize!(problem, time)
end

for problem in get_problems(analysis)
for element in get_elements(problem)
for ip in get_integration_points(element)
material_type = getfield(Materials, problem.properties.material_model)
material = Material(material_type, tuple())
ip.fields["material"] = field(material)
material_preprocess_analysis!(material, element, ip, time)
function operate_integration_points!(func!, time)
func_name = last(split(string(func!),"."))
for problem in get_problems(analysis)
for element in get_elements(problem)
for ip in get_integration_points(element)
if func_name == "material_preprocess_analysis!"
material_type = getfield(Materials, problem.properties.material_model)
material = Material(material_type, tuple())
ip.fields["material"] = field(material)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is subject to be changed to be done elsewhere later on

func!(material, element, ip, time)
else
material = ip("material", time)
func!(material, element, ip, time)
end
end
end
end
end

function extrapolate_next_solution()
# extrapolate next solution, use linear approximation
nnodes = Int(length(u)/3)
u_dict = Dict(j => [u[3*(j-1)+k] for k in 1:3] for j in 1:nnodes)
du_dict = Dict(j => [du[3*(j-1)+k] for k in 1:3] for j in 1:nnodes)
for problem in get_problems(analysis)
for element in get_elements(problem)
connectivity = get_connectivity(element)
ue = tuple(collect((u_dict[j]+du_dict[j]) for j in connectivity)...)
update!(element, "displacement", time => ue)
end
end
end

operate_integration_points!(material_preprocess_analysis!, time)

solution_norm = 0.0
solution_norm_prev = Inf

Expand All @@ -274,47 +298,21 @@ function FEMBase.run!(analysis::Analysis{MecaMatSo})
time = round(time + dtime, digits=12)

if props.extrapolate_initial_guess
# extrapolate next solution, use linear approximation
if length(du) != 0
nnodes = Int(length(u)/3)
u_dict = Dict(j => [u[3*(j-1)+k] for k in 1:3] for j in 1:nnodes)
du_dict = Dict(j => [du[3*(j-1)+k] for k in 1:3] for j in 1:nnodes)
for problem in get_problems(analysis)
for element in get_elements(problem)
connectivity = get_connectivity(element)
ue = tuple(collect((u_dict[j]+du_dict[j]) for j in connectivity)...)
update!(element, "displacement", time => ue)
end
end
end
extrapolate_next_solution()
else
fill!(du, 0.0)
solution_norm_prev = Inf
end

for problem in get_problems(analysis)
for element in get_elements(problem)
for ip in get_integration_points(element)
material = ip("material", time)
material_preprocess_increment!(material, element, ip, time)
end
end
end
operate_integration_points!(material_preprocess_increment!, time)

n = 0
while true

n += 1
@info("Solving for time $time, iteration # $n")

for problem in get_problems(analysis)
for element in get_elements(problem)
for ip in get_integration_points(element)
material = ip("material", time)
material_preprocess_iteration!(material, element, ip, time)
end
end
end
operate_integration_points!(material_preprocess_iteration!, time)

K = SparseMatrixCOO()
C = SparseMatrixCOO()
Expand Down Expand Up @@ -351,16 +349,7 @@ function FEMBase.run!(analysis::Analysis{MecaMatSo})

du += Vector((cholesky(Symmetric(K+Kb)) \ (f+fb))[:])

nnodes = Int(dim/3)
u_dict = Dict(j => [u[3*(j-1)+k] for k in 1:3] for j in 1:nnodes)
du_dict = Dict(j => [du[3*(j-1)+k] for k in 1:3] for j in 1:nnodes)
for problem in get_problems(analysis)
for element in get_elements(problem)
connectivity = get_connectivity(element)
ue = tuple(collect(u_dict[j]+du_dict[j] for j in connectivity)...)
update!(element, "displacement", time => ue)
end
end
extrapolate_next_solution()

# Check convergence
solution_norm = norm(du)
Expand All @@ -376,27 +365,13 @@ function FEMBase.run!(analysis::Analysis{MecaMatSo})
error("Model did not converge at time $time in $n iterations.")
end

for problem in get_problems(analysis)
for element in get_elements(problem)
for ip in get_integration_points(element)
material = ip("material", time)
material_postprocess_iteration!(material, element, ip, time)
end
end
end
operate_integration_points!(material_postprocess_iteration!, time)

end # iterations

u += du

for problem in get_problems(analysis)
for element in get_elements(problem)
for ip in get_integration_points(element)
material = ip("material", time)
material_postprocess_increment!(material, element, ip, time)
end
end
end
operate_integration_points!(material_postprocess_increment!, time)

# JuliaFEM.write_results!(analysis, time)

Expand All @@ -406,14 +381,7 @@ function FEMBase.run!(analysis::Analysis{MecaMatSo})

end # step

for problem in get_problems(analysis)
for element in get_elements(problem)
for ip in get_integration_points(element)
material = ip("material", time)
material_postprocess_analysis!(material, element, ip, time)
end
end
end
operate_integration_points!(material_postprocess_analysis!, time)

return nothing

Expand Down