fixed 3d, since there is no dev field anymore

This commit is contained in:
Olli
2016-10-09 14:51:06 +03:00
parent 35a2ac28ec
commit 739c0cedc8
2 changed files with 10 additions and 6 deletions
+3 -2
View File
@@ -510,7 +510,9 @@ function assemble{El<:Elasticity3DVolumeElements}(problem::Problem{Elasticity},
0.0 0.0 0.0 0.0 0.5-nu 0.0
0.0 0.0 0.0 0.0 0.0 0.5-nu]
if "plasticity" in keys(element.dev)
element_keys = get_keys(element)
if "plasticity" in element_keys
plastic_def = element.dev["plasticity"]
calculate_stress! = plastic_def["stress"]
params = plastic_def["params"]
@@ -530,7 +532,6 @@ function assemble{El<:Elasticity3DVolumeElements}(problem::Problem{Elasticity},
Dtan = D
end
println(round(stress_vec, 4))
:strain in props.store_fields && update!(ip, "strain", time => strain_vec)
:stress in props.store_fields && update!(ip, "stress", time => stress_vec)
:stress11 in props.store_fields && update!(ip, "stress11", time => stress_vec[1])
@@ -21,10 +21,13 @@ using JuliaFEM.Testing
update!([element1], "youngs modulus", 200e3)
update!([element1], "poissons ratio", 0.3)
element1.dev["plastdicity"] = Dict{Any, Any}("stress" => JuliaFEM.ideal_plasticity!,
"yield_surface" => Val{:von_mises},
"params" => Dict("yield_stress" => 500.0))
plastic_parameters = Dict{Any, Any}("type" => JuliaFEM.ideal_plasticity!,
"yield_surface" => Val{:von_mises},
"params" => Dict("yield_stress" => 175.0))
to_integ_points = Dict()
map(x-> to_integ_points[x] = plastic_parameters, get_connectivity(element))
update!(element, "plasticity", to_integ_points)
elasticity_problem = Problem(Elasticity, "solve continuum block", 3)
elasticity_problem.properties.finite_strain = false
elasticity_problem.properties.geometric_stiffness = false