This commit is contained in:
Jukka Aho
2015-12-03 16:28:35 +02:00
parent 6f3bde50b1
commit b5c0e09a18
3 changed files with 232 additions and 763 deletions
File diff suppressed because it is too large Load Diff
+3
View File
@@ -17,6 +17,9 @@ element_has_nodes(::Type{Val{:C3D20E}}) = 20
element_has_nodes(::Type{Val{:S3}}) = 3
element_has_type( ::Type{Val{:S3}}) = :Seg3
element_has_nodes(::Type{Val{:STRI65}}) = 6
element_has_type(::Type{Val{:STRI65}}) = :Tri6
"""
Checks for if line is a comment line or just empty
"""
+12 -4
View File
@@ -7,7 +7,7 @@ using JuliaFEM.API: Model
"""
This needs this a bit honing ...
"""
function solve!(model::Model, case_name::ASCIIString, time::Float64)
function get_solver(model::Model, case_name::ASCIIString, time::Float64)
element_ids = keys(model.elements)
all_elements = model.elements
case = model.load_cases[case_name]
@@ -71,9 +71,17 @@ function solve!(model::Model, case_name::ASCIIString, time::Float64)
end
# Creating the solver
solver = JuliaFEM.Core.(case.solver)(field_problem, dirile_arr...)
#solver = JuliaFEM.Core.(case.solver)(field_problem, dirile_arr...)
solver = JuliaFEM.Core.(case.solver)()
push!(solver, field_problem)
for d in dirile_arr
push!(solver, d)
end
return solver
end
function solve!(model::Model, case_name::ASCIIString, time::Float64)
solver = get_solver(model, case_name, time)
# Solving
solver(time)
end
end