Skip to content

Commit

Permalink
Fix inconsistencies in methods.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lxmota
lxmota committed Feb 7, 2025
1 parent 534da52 commit 1953ceb
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 49 deletions.
35 changes: 11 additions & 24 deletions src/solver.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ function create_step(solver_params::Dict{String,Any})
end
end

function HessianMinimizer(params::Dict{String,Any}, model::Any)
function HessianMinimizer(params::Dict{String,Any}, model::Model)
solver_params = params["solver"]
num_dof, = size(model.free_dofs)
num_dof = length(model.free_dofs)
minimum_iterations = solver_params["minimum iterations"]
maximum_iterations = solver_params["maximum iterations"]
absolute_tolerance = solver_params["absolute tolerance"]
Expand Down Expand Up @@ -139,11 +139,10 @@ function HessianMinimizer(params::Dict{String,Any}, model::Any)
)
end

function ExplicitSolver(params::Dict{String,Any})
function ExplicitSolver(params::Dict{String,Any}, model::Model)
solver_params = params["solver"]
input_mesh = params["input_mesh"]
num_nodes = Exodus.num_nodes(input_mesh.init)
num_dof = 3 * num_nodes
num_dof = length(model.free_dofs)
value = 0.0
gradient = zeros(num_dof)
solution = zeros(num_dof)
Expand All @@ -164,11 +163,10 @@ function ExplicitSolver(params::Dict{String,Any})
)
end

function SteepestDescent(params::Dict{String,Any})
function SteepestDescent(params::Dict{String,Any}, model::Model)
solver_params = params["solver"]
input_mesh = params["input_mesh"]
num_nodes = Exodus.num_nodes(input_mesh.init)
num_dof = 3 * num_nodes
num_dof = length(model.free_dofs)
minimum_iterations = solver_params["minimum iterations"]
maximum_iterations = solver_params["maximum iterations"]
absolute_tolerance = solver_params["absolute tolerance"]
Expand Down Expand Up @@ -240,15 +238,15 @@ function SteepestDescentStep(params::Dict{String,Any})
SteepestDescentStep(step_length)
end

function create_solver(params::Dict{String,Any}, model::Any)
function create_solver(params::Dict{String,Any}, model::Model)
solver_params = params["solver"]
solver_name = solver_params["type"]
if solver_name == "Hessian minimizer"
return HessianMinimizer(params, model)
elseif solver_name == "explicit solver"
return ExplicitSolver(params)
return ExplicitSolver(params, model)
elseif solver_name == "steepest descent"
return SteepestDescent(params)
return SteepestDescent(params, model)
else
error("Unknown type of solver : ", solver_name)
end
Expand Down Expand Up @@ -294,12 +292,9 @@ function copy_solution_source_targets(
end
end



#*************OP INF**********************
function copy_solution_source_targets(
integrator::Newmark,
solver::HessianMinimizer,
_::HessianMinimizer,
model::LinearOpInfRom,
)
displacement = integrator.displacement
Expand Down Expand Up @@ -331,7 +326,6 @@ function copy_solution_source_targets(

end


function copy_solution_source_targets(
model::SolidMechanics,
integrator::QuasiStatic,
Expand Down Expand Up @@ -509,8 +503,6 @@ function copy_solution_source_targets(
solver.solution = integrator.acceleration
end


### Move to model?
function evaluate(integrator::Newmark, solver::HessianMinimizer, model::LinearOpInfRom)
beta = integrator.β
gamma = integrator.γ
Expand All @@ -524,7 +516,7 @@ function evaluate(integrator::Newmark, solver::HessianMinimizer, model::LinearOp
#Ae = r, r = b - Ax
##M uddot + Ku = f

num_dof, = size(model.free_dofs)
num_dof = length(model.free_dofs)
I = Matrix{Float64}(LinearAlgebra.I, num_dof, num_dof)
LHS = I / (dt * dt * beta) + Matrix{Float64}(model.opinf_rom["K"])
RHS = model.opinf_rom["f"] + model.reduced_boundary_forcing + 1.0 / (dt * dt * beta) .* integrator.disp_pre
Expand All @@ -534,7 +526,6 @@ function evaluate(integrator::Newmark, solver::HessianMinimizer, model::LinearOp
solver.gradient[:] = -residual
end


function evaluate(integrator::QuasiStatic, solver::HessianMinimizer, model::SolidMechanics)
stored_energy, internal_force, body_force, stiffness_matrix = evaluate(integrator, model)
if model.failed == true
Expand All @@ -552,7 +543,6 @@ function evaluate(integrator::QuasiStatic, solver::HessianMinimizer, model::Soli
end
end


function evaluate(integrator::QuasiStatic, solver::SteepestDescent, model::SolidMechanics)
stored_energy, internal_force, body_force, _ = evaluate(integrator, model)
if model.failed == true
Expand Down Expand Up @@ -680,8 +670,6 @@ function compute_step(
return -solver.hessian \ solver.gradient
end



function compute_step(
_::CentralDifference,
model::SolidMechanics,
Expand Down Expand Up @@ -715,7 +703,6 @@ function update_solver_convergence_criterion(
solver.converged = converged_absolute || converged_relative
end


function update_solver_convergence_criterion(
solver::SteepestDescent,
absolute_error::Float64,
Expand Down
37 changes: 12 additions & 25 deletions src/time_integrator.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function adaptive_stepping_parameters(integrator_params::Dict{String,Any})
return minimum_time_step, decrease_factor, maximum_time_step, increase_factor
end

function QuasiStatic(params::Dict{String,Any})
function QuasiStatic(params::Dict{String,Any}, model::Model)
integrator_params = params["time integrator"]
initial_time = integrator_params["initial time"]
final_time = integrator_params["final time"]
Expand All @@ -36,9 +36,7 @@ function QuasiStatic(params::Dict{String,Any})
minimum_time_step, decrease_factor, maximum_time_step, increase_factor = adaptive_stepping_parameters(integrator_params)
time = prev_time = initial_time
stop = 0
input_mesh = params["input_mesh"]
num_nodes = Exodus.num_nodes(input_mesh.init)
num_dof = 3 * num_nodes
num_dof = length(model.free_dofs)
displacement = zeros(num_dof)
velocity = zeros(num_dof)
acceleration = zeros(num_dof)
Expand Down Expand Up @@ -67,7 +65,7 @@ function QuasiStatic(params::Dict{String,Any})
)
end

function Newmark(params::Dict{String,Any}, model::Any)
function Newmark(params::Dict{String,Any}, model::Model)
integrator_params = params["time integrator"]
initial_time = integrator_params["initial time"]
final_time = integrator_params["final time"]
Expand All @@ -78,7 +76,7 @@ function Newmark(params::Dict{String,Any}, model::Any)
stop = 0
β = integrator_params["β"]
γ = integrator_params["γ"]
num_dof, = size(model.free_dofs)
num_dof = length(model.free_dofs)
displacement = zeros(num_dof)
velocity = zeros(num_dof)
acceleration = zeros(num_dof)
Expand Down Expand Up @@ -110,7 +108,7 @@ function Newmark(params::Dict{String,Any}, model::Any)
)
end

function CentralDifference(params::Dict{String,Any})
function CentralDifference(params::Dict{String,Any}, model::Model)
integrator_params = params["time integrator"]
initial_time = integrator_params["initial time"]
final_time = integrator_params["final time"]
Expand All @@ -123,9 +121,7 @@ function CentralDifference(params::Dict{String,Any})
stop = 0
CFL = integrator_params["CFL"]
γ = integrator_params["γ"]
input_mesh = params["input_mesh"]
num_nodes = Exodus.num_nodes(input_mesh.init)
num_dof = 3 * num_nodes
num_dof = length(model.free_dofs)
displacement = zeros(num_dof)
velocity = zeros(num_dof)
acceleration = zeros(num_dof)
Expand Down Expand Up @@ -155,22 +151,22 @@ function CentralDifference(params::Dict{String,Any})
)
end

function create_time_integrator(params::Dict{String,Any}, model::Any)
function create_time_integrator(params::Dict{String,Any}, model::Model)
integrator_params = params["time integrator"]
integrator_name = integrator_params["type"]
if integrator_name == "quasi static"
return QuasiStatic(params)
return QuasiStatic(params, model)
elseif integrator_name == "Newmark"
return Newmark(params, model)
elseif integrator_name == "central difference"
return CentralDifference(params)
return CentralDifference(params, model)
else
error("Unknown type of time integrator : ", integrator_name)
end
end

function is_static(integrator::TimeIntegrator)
return integrator == QuasiStatic
return typeof(integrator) == QuasiStatic
end

function is_dynamic(integrator::TimeIntegrator)
Expand Down Expand Up @@ -206,17 +202,13 @@ function predict(integrator::Newmark, solver::Any, model::LinearOpInfRom)
end

function correct(integrator::Newmark, solver::Any, model::LinearOpInfRom)

dt = integrator.time_step
beta = integrator.β
gamma = integrator.γ

integrator.displacement[:] = solver.solution[:]
integrator.acceleration[:] = (solver.solution - integrator.disp_pre) / (beta * dt * dt)
integrator.velocity[:] = integrator.velo_pre + dt * gamma * integrator.acceleration[:]

model.reduced_state[:] = solver.solution[:]

end

function initialize(integrator::QuasiStatic, solver::Any, model::SolidMechanics)
Expand Down Expand Up @@ -496,7 +488,7 @@ function write_step(params::Dict{String,Any}, integrator::Any, model::Any)
end
write_step_csv(integrator, model, sim_id)
if haskey(params, "CSV write sidesets") == true
write_sideset_step_csv(params, integrator, model, sim_id)
write_sideset_step_csv(integrator, model, sim_id)
end
end
end
Expand Down Expand Up @@ -529,13 +521,10 @@ function write_step_csv(integrator::TimeIntegrator, model::SolidMechanics, sim_i
end
end

function write_sideset_step_csv(params::Dict{String,Any}, integrator::DynamicTimeIntegrator, model::SolidMechanics, sim_id::Integer)
function write_sideset_step_csv(integrator::DynamicTimeIntegrator, model::SolidMechanics, sim_id::Integer)
stop = integrator.stop
index_string = "-" * string(stop, pad=4)
sim_id_string = string(sim_id, pad=2) * "-"
input_mesh = params["input_mesh"]
bc_params = params["boundary conditions"]

for bc ∈ model.boundary_conditions
if (typeof(bc) == SMDirichletBC)
node_set_name = bc.node_set_name
Expand Down Expand Up @@ -577,7 +566,6 @@ function write_step_csv(integrator::DynamicTimeIntegrator, model::OpInfModel, si
index_string = "-" * string(stop, pad=4)
sim_id_string = string(sim_id, pad=2) * "-"
reduced_states_filename = sim_id_string * "reduced_states" * index_string * ".csv"
time_filename = sim_id_string * "time" * index_string * ".csv"
writedlm(reduced_states_filename, model.reduced_state)
write_step_csv(integrator, model.fom_model, sim_id)
end
Expand Down Expand Up @@ -608,7 +596,6 @@ function write_step_exodus(
write_step_exodus(params, integrator, model.fom_model)
end


function write_step_exodus(params::Dict{String,Any}, integrator::TimeIntegrator, model::SolidMechanics)
time = integrator.time
stop = integrator.stop
Expand Down

0 comments on commit 1953ceb

Please sign in to comment.