-
Notifications
You must be signed in to change notification settings - Fork 11
[ADDITION] Added a variant of the Herschel Bulkley rheology #317
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.
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
Open
mthielma
wants to merge
9
commits into
JuliaGeodynamics:main
Choose a base branch
from
mthielma:mt/hb_rheology
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+427
−2
Open
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
33023df
Added a variant of the Herschel Bulkley rheology based on an earlier …
mthielma 3169be3
removed a function where it did not belong,
mthielma 2da15ac
Modified according to Albert's suggestions
mthielma 724391d
changed fastpow to pow in Viscosity.jl
mthielma 1831933
added functions to compute viscosity, stress and strain rate
mthielma a09cc51
fixed compute_viscosity_tauII
mthielma ba80216
progress, fix a few bugs, missing import?
aelligp 1af6426
modified HerschelBulkley.jl and test_CreepLaw.jl
mthielma 738f7b4
format
aelligp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
|
|
||
|
|
||
| struct HerschelBulkley{T, U1, U2, U3} <: AbstractCreepLaw{T} | ||
| n::T # shear thinning exponent | ||
| η0::GeoUnit{T, U1} # "rigid" viscosity | ||
| τ0::GeoUnit{T, U2} # critical stress | ||
| ηr::GeoUnit{T, U1} # reference viscosity at the critical strain rate, which is given by 0.5*τ0/η0 and the critical temperature | ||
| Q::GeoUnit{T, U3} # temperature dependence of ηr, activation energy divided by R, unit is K | ||
| Tr::GeoUnit{T,U3} # reference temperature | ||
| function HerschelBulkley(; | ||
| n = 3, | ||
| η0 = 1e24Pa*s, | ||
| τ0 = 100e6Pa, | ||
| ηr = 1e20Pa*s, | ||
| Q = 0K, | ||
| Tr = 1600K, | ||
| ) | ||
| # Convert to GeoUnits | ||
| η0U = convert(GeoUnit, η0) | ||
| τ0U = convert(GeoUnit, τ0) | ||
| ηrU = convert(GeoUnit, ηr) | ||
| QU = convert(GeoUnit,Q) | ||
| Tr = convert(GeoUnit,Tr) | ||
| # Extract struct types | ||
| T = typeof(η0U).types[1] | ||
| U1 = typeof(η0U).types[2] | ||
| U2 = typeof(σ0U).types[2] | ||
| U3 = typeof(Tr).types[2] | ||
| # Create struct | ||
| return new{T, U1, U2, U3}( | ||
| n, η0U,τ0U,ηrU,QU, Tr | ||
| ) | ||
| end | ||
|
|
||
| function HerschelBulkley(n, η0,τ0,ηr,Q,Tr) | ||
| return HerschelBulkley(;n = n, η0 = η0,τ0 = τ0,ηr = ηr,Q = Q,Tr = Tr) | ||
| end | ||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.