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.

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

Strain weakening #91

Merged
merged 30 commits into from
Jan 25, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0a8e72b
init commit - not tested
aelligp Jan 21, 2024
48d3e7e
add `@stain_plastic`
aelligp Jan 22, 2024
899d60d
add accumulated plastic strain struct
aelligp Jan 22, 2024
ed84888
Merge branch 'main' into pa-strain_weakening
albert-de-montserrat Jan 23, 2024
32824b2
fix type of EII
albert-de-montserrat Jan 23, 2024
cd41b1b
no need to cache ε_pl
albert-de-montserrat Jan 23, 2024
7779185
dont cache plastic strain rate
albert-de-montserrat Jan 23, 2024
69e6948
fix up and add comments
albert-de-montserrat Jan 23, 2024
f20e375
format
albert-de-montserrat Jan 23, 2024
0b6b900
minor updates
albert-de-montserrat Jan 23, 2024
c9be929
accumulate tensor kernel
albert-de-montserrat Jan 23, 2024
a6b639e
pass plastic strain tensors to stress kernels
albert-de-montserrat Jan 23, 2024
4b318b7
softening kernels
albert-de-montserrat Jan 23, 2024
1a597f7
add plastic strain tensors
albert-de-montserrat Jan 23, 2024
cc27310
Merge branch 'main' into pa-strain_weakening
albert-de-montserrat Jan 23, 2024
8e1785d
fix plastic_params
albert-de-montserrat Jan 23, 2024
5a1f78b
fix compute_dτ_pl
albert-de-montserrat Jan 23, 2024
85c939a
format
albert-de-montserrat Jan 23, 2024
869dab7
fixup
albert-de-montserrat Jan 23, 2024
3c89b1b
fix ambiguities
albert-de-montserrat Jan 23, 2024
78d0d46
reset plastic strain
albert-de-montserrat Jan 23, 2024
4c276f9
shear band with softening
albert-de-montserrat Jan 24, 2024
7704471
update shear band 2d app
albert-de-montserrat Jan 24, 2024
95bcb65
bump GeoParams
albert-de-montserrat Jan 24, 2024
1f61cc7
add softening benchmark; fix minor typo
aelligp Jan 24, 2024
b9ffe31
plastic strain @gernerated function
albert-de-montserrat Jan 24, 2024
3b27508
remove old commented code
albert-de-montserrat Jan 24, 2024
37990ea
format and fix project.toml again
albert-de-montserrat Jan 24, 2024
48607fd
fix compats
albert-de-montserrat Jan 24, 2024
53605f8
update
albert-de-montserrat Jan 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
Prev Previous commit
Next Next commit
update shear band 2d app
  • Loading branch information
albert-de-montserrat committed Jan 24, 2024
commit 77044717499d06e0826aed19f315c214fae84dbf
11 changes: 5 additions & 6 deletions miniapps/benchmarks/stokes2D/shear_band/ShearBand2D.jl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function main(igg; nx=64, ny=64, figdir="model_figs")
ϕ = ϕ,
η_vp = η_reg,
Ψ = 0,
# softening_C = soft_C
softening_C = soft_C
)
rheology = (
# Low density phase
Expand Down Expand Up @@ -121,7 +121,7 @@ function main(igg; nx=64, ny=64, figdir="model_figs")

# Time loop
t, it = 0.0, 0
tmax = 3.5
tmax = 5
τII = Float64[]
sol = Float64[]
ttot = Float64[]
Expand Down Expand Up @@ -189,10 +189,9 @@ function main(igg; nx=64, ny=64, figdir="model_figs")
return nothing
end

N = 64
n = N + 2
nx = n - 2
ny = n - 2
n = 128
nx = n
ny = n
figdir = "ShearBands2D_softening"
igg = if !(JustRelax.MPI.Initialized())
IGG(init_global_grid(nx, ny, 1; init_MPI = true)...)
Expand Down
Loading