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

Speeding up strain rate and deviatoric stress kernels #110

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Speeding up strain rate and deviatoric stress kernels #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/ConstitutiveRelationships.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using Base: Float64
using Parameters, LaTeXStrings, Unitful
using ..Units
using GeoParams: AbstractMaterialParam, AbstractConstitutiveLaw, AbstractComposite
import GeoParams: param_info, fastpow, nphase, ntuple_idx, @print
import GeoParams: param_info, fastpow, pow_check, nphase, ntuple_idx, @print
import GeoParams: second_invariant, second_invariant_staggered
using BibTeX
using ..MaterialParameters: MaterialParamsInfo
Expand Down
86 changes: 57 additions & 29 deletions src/CreepLaw/DiffusionCreep.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,14 @@ Returns diffusion creep strainrate as a function of 2nd invariant of the stress
@unpack_val n, r, p, A, E, V, R = a
FT, FE = a.FT, a.FE

f_r = pow_check(f, r)
d_p = pow_check(d, p)
TauII_FT_n = pow_check(FT * TauII, n)

return A *
fastpow(TauII * FT, n) *
fastpow(f, r) *
fastpow(d, p) *
TauII_FT_n *
f_r *
d_p *
exp(-(E + P * V) / (R * T)) / FE
end

Expand All @@ -194,7 +198,11 @@ end
@unpack_units n, r, p, A, E, V, R = a
FT, FE = a.FT, a.FE

ε = A * fastpow(TauII * FT, n) * fastpow(f, r) * fastpow(d, p) * exp(-(E + P * V) / (R * T)) / FE
f_r = pow_check(f, r)
d_p = pow_check(d, p)
TauII_FT_n = pow_check(FT * TauII, n)

ε = A * TauII_FT_n * f_r * d_p * exp(-(E + P * V) / (R * T)) / FE

return ε
end
Expand Down Expand Up @@ -231,34 +239,38 @@ returns the derivative of strainrate versus stress
)
@unpack_val n, r, p, A, E, V, R = a
FT, FE = a.FT, a.FE

f_r = pow_check(f, r)
d_p = pow_check(d, p)
TauII_FT_n = pow_check(FT * TauII, -1 + n)

return fastpow(FT * TauII, -1 + n) *
fastpow(f, r) *
fastpow(d, p) *
return TauII_FT_n *
f_r *
d_p *
A *
FT *
exp((-E - P * V) / (R * T)) *
inv(FE)
end


@inline function dεII_dτII(
a::DiffusionCreep, TauII::Quantity; T=1K, P=0Pa, f=1NoUnits, d=1m, kwargs...
)
@unpack_units n, r, p, A, E, V, R = a
FT, FE = a.FT, a.FE

f_r = pow_check(f, r)
d_p = pow_check(d, p)

return FT *
fastpow(f, r) *
fastpow(d, p) *
f_r *
d_p *
A *
FT *
exp((-E - P * V) / (R * T)) *
inv(FE)
end



"""
computeCreepLaw_TauII(EpsII::_T, a::DiffusionCreep; T::_T, P=zero(_T), f=one(_T), d=one(_T), kwargs...)

Expand All @@ -272,11 +284,16 @@ Returns diffusion creep stress as a function of 2nd invariant of the strain rate

n_inv = inv(n)

A_n = pow_check(A, -n_inv)
EpsII_FE_n = pow_check(EpsII * FE, n_inv)
f_r = pow_check(f, -r * n_inv)
d_p = pow_check(d, -p * n_inv)

τ =
fastpow(A, -n_inv) *
fastpow(EpsII * FE, n_inv) *
fastpow(f, -r * n_inv) *
fastpow(d, -p * n_inv) *
A_n *
EpsII_FE_n *
f_r*
d_p*
exp((E + P * V) / (n * R * T)) / FT

return τ
Expand All @@ -290,11 +307,15 @@ end

n_inv = inv(n)

A_n = pow_check(A, -n_inv)
f_r = pow_check(f, -r * n_inv)
d_p = pow_check(d, -p * n_inv)

τ =
fastpow(A, -n_inv) *
fastpow(EpsII * FE, 1) *
fastpow(f, -r * n_inv) *
fastpow(d, -p * n_inv) *
A_n *
EpsII * FE *
f_r *
d_p *
exp((E + P * V) / (n * R * T)) / FT

return τ
Expand Down Expand Up @@ -325,15 +346,20 @@ end

n_inv = inv(n)

A_n = pow_check(A, -n_inv)
EpsII_FE_n = pow_check(EpsII * FE, n_inv-1)
f_r = pow_check(f, -r * n_inv)
d_p = pow_check(d, -p * n_inv)

# computed symbolically:
return (
FE *
fastpow(A, -n_inv) *
fastpow(d, -p * n_inv) *
fastpow(f, -r * n_inv) *
fastpow(EpsII * FE, n_inv - 1) *
A_n *
d_p *
f_r *
EpsII_FE_n *
exp((E + P * V) / (n * R * T ))
) / (FT )
) / FT
end

@inline function dτII_dεII(
Expand All @@ -342,15 +368,17 @@ end
@unpack_units r, p, A, E, V, R = a
FT, FE = a.FT, a.FE

f_r = pow_check(f, -r)
d_p = pow_check(d, -p)

# computed symbolically:
return (
FE *
inv(A) *
fastpow(d, -p ) *
fastpow(f, -r ) *
fastpow(EpsII * FE, 0) *
d_p *
f_r *
exp((E + P * V) / (R * T ))
) / (FT )
) / FT
end

# Print info
Expand Down
64 changes: 46 additions & 18 deletions src/CreepLaw/DislocationCreep.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ end
@unpack_val n, r, A, E, V, R = a
FT, FE = a.FT, a.FE

ε = A * fastpow(TauII * FT, n) * fastpow(f, r) * exp(-(E + P * V) / (R * T)) / FE
f_r = pow_check(f, r)
TauII_FT_n = pow_check(FT * TauII, n)

ε = A * TauII_FT_n * f_r * exp(-(E + P * V) / (R * T)) / FE
return ε
end

Expand All @@ -170,7 +173,10 @@ end
@unpack_units n, r, A, E, V, R = a
FT, FE = a.FT, a.FE

ε = A * fastpow(TauII * FT, n) * fastpow(f, r) * exp(-(E + P * V) / (R * T)) / FE
f_r = pow_check(f, r)
TauII_FT_n = pow_check(FT * TauII, n)

ε = A * TauII_FT_n * f_r * exp(-(E + P * V) / (R * T)) / FE

return ε
end
Expand All @@ -197,8 +203,11 @@ end
@unpack_val n, r, A, E, V, R = a
FT, FE = a.FT, a.FE

return fastpow(FT * TauII, -1 + n) *
fastpow(f, r) *
f_r = pow_check(f, r)
FT_TauII_n = pow_check(FT * TauII, -1 + n)

return FT_TauII_n *
f_r *
A *
FT *
n *
Expand All @@ -211,9 +220,12 @@ end
)
@unpack_units n, r, A, E, V, R = a
FT, FE = a.FT, a.FE

f_r = pow_check(f, r)
FT_TauII_n = pow_check(FT * TauII, -1 + n)

return fastpow(FT * TauII, -1 + n) *
fastpow(f, r)*
return FT_TauII_n *
f_r *
A *
FT *
n *
Expand Down Expand Up @@ -243,9 +255,13 @@ Computes the stress for a Dislocation creep law given a certain strain rate
FT, FE = a.FT, a.FE
_n = inv(n)

return fastpow(A, -_n) *
fastpow(EpsII * FE, _n) *
fastpow(f, -r * _n) *
A_n = pow_check(A, -_n)
f_r = pow_check(f, -r * _n)
EpsII_FE_n = pow_check(EpsII * FE, _n)

return A_n *
EpsII_FE_n *
f_r *
exp((E + P * V) / (n * R * T)) / FT
end

Expand All @@ -256,9 +272,13 @@ end
FT, FE = a.FT, a.FE
_n = inv(n)

return fastpow(A, -_n) *
fastpow(EpsII * FE, _n) *
fastpow(f, -r * _n) *
A_n = pow_check(A, -_n)
f_r = pow_check(f, -r * _n)
EpsII_FE_n = pow_check(EpsII * FE, _n)

return A_n*
f_r*
EpsII_FE_n*
exp((E + P * V) / (n * R * T)) / FT
end

Expand Down Expand Up @@ -293,11 +313,15 @@ end
FT, FE = a.FT, a.FE
_n = inv(n)

A_n = pow_check(A, -_n)
f_r = pow_check(f, -r * _n)
EpsII_FE_n = pow_check(EpsII * FE, _n-1)

return (
FE *
fastpow(A, - _n) *
fastpow(f, -r * _n) *
fastpow(EpsII * FE, _n - 1) *
A_n *
f_r *
EpsII_FE_n *
exp((E + P * V) / (R * T * n))
) / (FT * n)
end
Expand All @@ -308,11 +332,15 @@ end
@unpack_units n, r, A, E, V, R = a
FT, FE = a.FT, a.FE

A_n = pow_check(A, -_n)
f_r = pow_check(f, -r * _n)
EpsII_FE_n = pow_check(EpsII * FE, _n-1)

return (
FE *
fastpow(A, - _n) *
fastpow(f, -r * _n) *
fastpow(EpsII * FE, _n - 1) *
A_n *
f_r *
EpsII_FE_n *
exp((E + P * V) / (R * T * n))
) / (FT * n)
end
Expand Down
10 changes: 10 additions & 0 deletions src/Utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ end
return x^n
end

@inline function pow_check(x::T, n) where T
if isone(x) || isone(n)
x
elseif iszero(n)
one(T)
else
fastpow(x, n)
end
end

# Tuple iterators
@generated function nreduce(f::F, v::NTuple{N,Any}) where {N,F}
Base.@_inline_meta
Expand Down
Loading