Skip to content

Parameterizes injectivity scaling factor #126

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

Merged
jmartfrut merged 2 commits into from
Mar 5, 2026
Merged

Parameterizes injectivity scaling factor #126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0f8142
Parameterizes injectivity scaling factor
jmartfrut Mar 5, 2026
50f137b
Removes unused parameter from line search
jmartfrut Mar 5, 2026
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
15 changes: 7 additions & 8 deletions src/Solvers/LineSearches.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,17 @@ struct Injectivity_Preserving_LS{A} <: AbstractLineSearch
αmin::Float64
ρ::Float64
c::Float64
β::Float64
caches::A
function Injectivity_Preserving_LS(α::CellState, U, V; maxiter::Int64=50, αmin::Float64=1e-16, ρ::Float64=0.5, c::Float64=0.95)
function Injectivity_Preserving_LS(α::CellState, U, V; maxiter::Int64=50, αmin::Float64=1e-16, ρ::Float64=0.5, c::Float64=0.95, β::Float64=0.95)
caches = (U, V)
new{typeof(caches)}(α, maxiter, αmin, ρ, c, caches)
new{typeof(caches)}(α, maxiter, αmin, ρ, c, β, caches)
end


function (obj::Injectivity_Preserving_LS)(x::AbstractVector, dx::AbstractVector, b::AbstractVector, op::NonlinearOperator)

_, maxiter, αmin, ρ, c = obj.α, obj.maxiter, obj.αmin, obj.ρ, obj.c
_, maxiter, αmin, ρ, c= obj.α, obj.maxiter, obj.αmin, obj.ρ, obj.c
#update cell state
U, V = obj.caches
xh = FEFunction(U, x)
Expand All @@ -94,22 +95,20 @@ struct Injectivity_Preserving_LS{A} <: AbstractLineSearch

end



function InjectivityCheck(α, ∇u, ∇du)
function InjectivityCheck(α, ∇u, ∇du, β)
ε = 1e-6
F = ∇u + one(∇u)
J = det(F)
H = J * inv(F)'
# if det(F+∇du) < 0.2
# @show det(F), det(F+∇du)
# end
return true, min(0.95*abs(( -J) / (det(∇du) + tr(H' * ∇du) )), 1.0)
return true, min(β*abs(( -J) / (det(∇du) + tr(H' * ∇du) )), 1.0)

end


function update_cellstate!(obj::Injectivity_Preserving_LS, xh, dxh)
update_state!(InjectivityCheck, obj.α, ∇(xh)', ∇(dxh)')
update_state!(InjectivityCheck, obj.α, ∇(xh)', ∇(dxh)', obj.β)
return minimum(minimum((obj.α.values)))
end
Loading