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

Add get_α for melt-dependent density #204

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Add get_α for melt-dependent density #204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ceba9fd
get_alpha for melt-dep rho
albert-de-montserrat Jun 24, 2024
3ec8d38
fixup
albert-de-montserrat Jun 24, 2024
c9add7a
small rework
albert-de-montserrat Jun 25, 2024
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
10 changes: 9 additions & 1 deletion src/Utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,12 @@ function add_extractor_functions(::Type{_T}, param_field) where _T
end
end
end
end
end

function get_α(rho::MeltDependent_Density; ϕ::T=0.0, kwargs...) where {T}
αsolid = rho.ρsolid.α.val
αmelt = rho.ρmelt.α.val
return @muladd ϕ * αmelt + (1-ϕ) * αsolid
end

get_α(rho::MeltDependent_Density, args) = get_α(rho; args...)
7 changes: 7 additions & 0 deletions test/test_Density.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,13 @@ using Test, GeoParams, StaticArrays, LaTeXStrings
@test ρmelt ≈ 2198.68
@test ρ == (1-args.ϕ)*ρsolid + args.ϕ*ρmelt

x = MeltDependent_Density(
ρsolid = PT_Density(α= 1e-3),
ρmelt = PT_Density(α= 1e-2),
)
@test GeoParams.Density.get_α(x, (;ϕ = 1)) == 1e-2
@test GeoParams.Density.get_α(x, (;ϕ = 0)) == 1e-3
@test GeoParams.Density.get_α(x, (;ϕ = 0.5)) == 0.0055

rheologies = (
SetMaterialParams(;
Expand Down
Loading