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

Friction options clean #15

Open
wants to merge 193 commits into
base: fix_stresses_elasticity
Choose a base branch
from
Open

Friction options clean #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
3d40b30
Update VEP implementation
anne-glerum Sep 30, 2021
99818de
Fix merge leftovers
anne-glerum Jul 14, 2023
fee58d6
Output full stress in visu pp
anne-glerum Jul 15, 2023
15a6655
Add includes
anne-glerum Jul 15, 2023
05fabe7
Rm include
anne-glerum Jul 18, 2023
8b72684
Fix shear stress pp
anne-glerum Jul 24, 2023
1f0a04a
Make sure particle update occurs at start timestep
anne-glerum Jul 25, 2023
bbe2203
Fix Assert
anne-glerum Jul 25, 2023
7e08332
Do not during particle update before t1
anne-glerum Jul 25, 2023
a874f22
Add Assert to visu plugins
anne-glerum Jul 25, 2023
b5ba07a
Check that composition particle property is not used
anne-glerum Aug 8, 2023
1ea99dc
Only compute stress tensor residuals when elasticity is on
anne-glerum Aug 8, 2023
52b6a0e
Fix after merge
anne-glerum Sep 27, 2023
7c6fbf5
Address two review comments
anne-glerum Sep 27, 2023
86344e8
Check that ve_stress_xx exists before asking field nr
anne-glerum Sep 28, 2023
c9414a8
Rm removed pp from prm files
anne-glerum Sep 28, 2023
824e2cb
Fix tests
anne-glerum Oct 8, 2023
30df10c
Merge branch 'main' into fix_stresses_elasticity
gassmoeller Oct 10, 2023
9309f36
added friction rheology
EstherHeck Jan 19, 2021
7167675
modified repeat timestep to faster decrease dt-size
EstherHeck Jan 19, 2021
3eb383a
added compute_current_edot_ii in material-utilities
EstherHeck Jan 19, 2021
a56f8bb
friction options are taken into account from visco_plastic
EstherHeck Jan 19, 2021
c4e905c
changed critical slip distance from double to function input
EstherHeck Jan 19, 2021
6dc3d38
found wrong } from rebasing
EstherHeck Jan 27, 2021
ea8cb50
RSF in plasticadditional outputs - needs some more work
EstherHeck Jan 27, 2021
7d4132d
deleted ifs that sent me errors
EstherHeck Jan 27, 2021
0716818
added more info to function error
EstherHeck Feb 5, 2021
3731389
consider min SR for radiation damping
EstherHeck Feb 9, 2021
8ff7808
regularized RSF only with positive a
EstherHeck Feb 9, 2021
2945f40
added *2 in radiation damping, fixed arcsinh-friction, moved elastic …
EstherHeck Feb 9, 2021
5e5671d
started on new yield mechanism
EstherHeck Feb 11, 2021
4cb35a7
included current_edot_ii in plastic additional outputs
EstherHeck Feb 11, 2021
4cf092f
comments and citations for new yield option tresca
EstherHeck Feb 12, 2021
73a88f3
outcommented assert for yield case with elasticity, ran make indent
EstherHeck Feb 12, 2021
ebdf8e9
assume always yielding in fault for tresca yield mechanism
EstherHeck Feb 12, 2021
8c8f64b
use friction coefficient in tresca yield case
EstherHeck Feb 12, 2021
92381bf
added prints to find composition error
EstherHeck Feb 18, 2021
9c50dbb
index variables for fault and theta computed within parse_parameters
EstherHeck Feb 19, 2021
5163a9a
resolved fault and theta index problems
EstherHeck Feb 22, 2021
02db156
RDT within fault stength for tresca
EstherHeck Feb 24, 2021
1a30a06
addressed all of Annes comments about friction_options.h, renamed
EstherHeck Feb 26, 2021
6439b3a
addressed some comits from Anne
EstherHeck Feb 26, 2021
76aad16
adressed all easy comments from Anne
EstherHeck Feb 26, 2021
9732902
introduced parameter use_always_yielding
EstherHeck Feb 27, 2021
9144d57
rearranged compute_dependent_friction to avoid code duplication
EstherHeck Feb 27, 2021
14b2a2b
documentation and removable of outdated check for dynamic rfiction an…
EstherHeck Feb 27, 2021
158a94c
assert for correct tan/atan conversion
EstherHeck Feb 27, 2021
690dddf
FrictionAdditionalOutputs working and documentation things
EstherHeck Feb 27, 2021
79ddf1d
last changes after Annes review, assertthrow for friction nan or inf
EstherHeck Mar 10, 2021
534e174
return something after switch to get rid of compile warning
EstherHeck Mar 10, 2021
12d4025
added steady-state friction as a friction option, but not sure if I t…
EstherHeck Mar 11, 2021
f04a68f
added parameter whether to cut edot_ii after RDT or not
EstherHeck Mar 15, 2021
7432dfa
for a<=0 still take into account contrib from b
EstherHeck Mar 15, 2021
90e55b6
use constant not actual velocity in stst friction
EstherHeck Mar 18, 2021
20173b1
remove wrong )
EstherHeck Mar 18, 2021
8bc0f23
limit theta_old to >=0)
EstherHeck Mar 24, 2021
014697b
limit old theta to >= 1e-50
EstherHeck Mar 24, 2021
f668ac8
steady-state RSF now also within use_theta, though not sure if it sho…
EstherHeck Mar 24, 2021
c818358
added effective friction factor in steady state RSF and made indent
EstherHeck Mar 24, 2021
613e3f8
reintroduction of theta_increment to limit it so the new theta in rea…
EstherHeck Mar 24, 2021
7a719a0
made single parameter point out of point_a and point_b
EstherHeck Mar 25, 2021
8758b8b
documentation and improvement for steady-state RSF, theta now changes…
EstherHeck Mar 25, 2021
bbebb11
prototype particle property theta builds
EstherHeck Mar 31, 2021
8f199a9
make friction assert more informative
EstherHeck Apr 1, 2021
c88a02c
not cut old theta, particle property theta working
EstherHeck Apr 1, 2021
341a8f3
reduced effective friction factor to one function and made it pf/sig_…
EstherHeck Apr 8, 2021
6114217
added effective friction factor in regularized RSF for a=0, made indent
EstherHeck Apr 13, 2021
87478db
compute RDT when using tresca yield option
EstherHeck Apr 16, 2021
b6203a1
adjusted error message for effective friction factor >=0 and <1
EstherHeck Apr 20, 2021
78eb4da
add prints, no cut old theta, do cut current theta and increment
EstherHeck Apr 16, 2021
1a04d66
print neg theta on particle
EstherHeck Apr 16, 2021
3c4720a
do cut old theta and increment, not cut current theta
EstherHeck Apr 16, 2021
63ab105
not cut theta increment
EstherHeck Apr 16, 2021
f16c11f
do cut old, current, and increment theta
EstherHeck Apr 16, 2021
1928281
outcomment asserts that inhibit iterated advection
EstherHeck Apr 20, 2021
0130dda
also print if theta is positive
EstherHeck Apr 21, 2021
afcd390
esle to else
EstherHeck Apr 21, 2021
0f543e1
print the position where theta is negative
EstherHeck Apr 23, 2021
0bebb80
made theta = old_theta for very low strain rates, also print zero the…
EstherHeck Apr 30, 2021
9e91a29
only compute theta when inside fault material, and only update theta …
EstherHeck Apr 30, 2021
c2d7f3f
make prints more informative: Zero and dt
EstherHeck Apr 30, 2021
bc3c8c3
only compute theta when in fault material of >50% volume, same for go…
EstherHeck May 7, 2021
ff029bf
make an input parameter whether to print negative/Zero theta
EstherHeck May 11, 2021
f43ba77
friction options are taken into account from visco_plastic
EstherHeck Jan 19, 2021
88bac1b
added Lapusta time step files
EstherHeck Feb 24, 2021
5c1d119
WIP to get all params needed
EstherHeck Feb 26, 2021
7795344
a function to compute delta_theta_max
EstherHeck Mar 1, 2021
9082c45
Lapusta time step builds
EstherHeck Mar 9, 2021
5c9eea9
segmentation fault error when trying to get the component mask in the…
EstherHeck Mar 9, 2021
ec3a7b1
all four Lapusta timestep criteria added. Still some todos and runtim…
EstherHeck Mar 9, 2021
d34cb60
compiling but not running, moved delta_theta_max function to visco_pl…
EstherHeck Mar 10, 2021
ce31354
assert for inf or nan delta_theta_max
EstherHeck Mar 10, 2021
ae976cb
something in the check prints
EstherHeck Mar 10, 2021
80f4be1
still not working. Cannot call rheology function from material model.
EstherHeck Mar 15, 2021
ba4cc13
Lapusta time step does not through error anymore
EstherHeck Mar 16, 2021
1ca89d4
if min healing dt <= 0 make it very large
EstherHeck Mar 17, 2021
640fd12
dont let volume_fractions become negative
EstherHeck Mar 18, 2021
7a9437d
uncomment min healing time step to see if Lapusta only does not work …
EstherHeck Mar 19, 2021
abf9758
made it work again after rebase
EstherHeck Mar 19, 2021
5ac9619
all lapusta timesteps taken into account, some cleaning up
EstherHeck Apr 7, 2021
5139049
assertthrow for negative theta in min healing timestep function
EstherHeck Apr 8, 2021
bd2f57e
Lapusta timestep length written to screen
EstherHeck Apr 13, 2021
473403a
if min helaing dt negative, dont use it
EstherHeck Apr 20, 2021
738b2a0
return largest number for healing dt if it is <= 1e-50
EstherHeck Apr 21, 2021
268631a
make it work after rebase
EstherHeck May 11, 2021
49b981e
make it compile after rebase with master, make indent
EstherHeck May 11, 2021
1a06072
added an RSF convection time step. Made indent
EstherHeck Jun 8, 2021
1dd3b18
adressed Annes quick Lapusta time step review. Deleted two folders in…
EstherHeck Jun 10, 2021
d536550
adressed Annes quick Lapusta time step review
EstherHeck Jun 10, 2021
d08be65
time in point values set to higher precision when RSF is used. Made i…
EstherHeck Jun 10, 2021
388c687
only take higher CFL number if velocity is significantly (100) lower
EstherHeck Jun 15, 2021
f175b8e
only take higher CFL number if velocity is higher (5 times)
EstherHeck Jun 15, 2021
33b488f
take the right logic for when to increase CFL number
EstherHeck Jun 15, 2021
b8f874f
lapusta tiestep only computed within fault. Made indent
EstherHeck Jun 15, 2021
5e0945e
introduced only temporarily important parameter to use min time step …
EstherHeck Jun 15, 2021
1c99e5d
only compute theta on particle if initial fault value > 0.5
EstherHeck Jun 16, 2021
91164cd
fixed double bool mistake
EstherHeck Jun 16, 2021
344db19
fix exception for theta on particle - fault not initial fault
EstherHeck Jun 16, 2021
f21d601
try the other way to ask for fault index on particle
EstherHeck Jun 18, 2021
74f451a
Part 1: update comments and todos, go through logic
EstherHeck Jun 23, 2021
4b2e5a8
Part 2: update comments and todos, go through logic
EstherHeck Jun 24, 2021
b5e8f8f
Part 3 (last part): update comments and todos, go through logic
EstherHeck Jun 24, 2021
07a3cc9
refined theta prints
EstherHeck Jun 28, 2021
279c793
also print particle ID for checking the theta values
EstherHeck Jun 29, 2021
7da961c
more and reworked prints for theta, made indent
EstherHeck Jun 29, 2021
41534b9
lots of changes in the theta printing and ONE IMPORTANT change in the…
EstherHeck Jul 1, 2021
8bdcf3f
compute_theta_reaction terms now updates theta correctly again
EstherHeck Jul 1, 2021
2116953
asserts for current/old theta <= 0 wherever used
EstherHeck Jul 1, 2021
bba04ee
renamed "quasi static strain rate" parameter to "RSF reference slip r…
EstherHeck Jul 5, 2021
417faa8
todo for default for critical slip distance function
EstherHeck Jul 5, 2021
2ab7f0c
corrected error message for old theta
EstherHeck Jul 5, 2021
712958b
provisoricly moved effective friction factor from friction to pressure
EstherHeck Jul 5, 2021
1b9560d
added effective friction factor to lapusta timesteps delta_theta_max,…
EstherHeck Jul 6, 2021
2cfa13f
overwrite stresses on particles with particle value
EstherHeck Jul 5, 2021
cf0d7bf
dont print stress values to screen
EstherHeck Jul 6, 2021
53c202a
ran make indent
EstherHeck Jul 7, 2021
ef18435
added "1-" to the get_effective_friction_factor function to ensure th…
EstherHeck Jul 7, 2021
55fc46c
also put the "1-" into the assertthrow...
EstherHeck Jul 7, 2021
cc7f63b
make 1 to 0 - undo a mistake and crudely make lapusta hopefully work
EstherHeck Jul 7, 2021
8aedc4b
print infos for min vep relaxation time step
EstherHeck Jul 29, 2021
27b731c
removal of the prints in the lapusta time step and add comments
EstherHeck Aug 18, 2021
642bd96
moved RDT into drucker prager yield stress
EstherHeck Aug 18, 2021
ab6bcb9
fixed assert
EstherHeck Aug 19, 2021
a4a56cf
removed outdated parameter cut_edot_ii after RDT
EstherHeck Aug 19, 2021
2ec2e1e
print yield stress current stress viscosity to check if it converges
EstherHeck Aug 30, 2021
30b839b
outcomment printing for vep relaxation time step
EstherHeck Aug 30, 2021
2032849
add prints for different yield stresses
EstherHeck Aug 31, 2021
ba266dd
removed unecessary parameter print_thetas, made indent
EstherHeck Aug 31, 2021
5df5fc1
removed unused function
EstherHeck Aug 31, 2021
2a31745
modified stress prints, removed unused variable
EstherHeck Aug 31, 2021
61606bc
refine print
EstherHeck Sep 1, 2021
795e06a
do something with prints
EstherHeck Sep 6, 2021
90e68d1
hopefully fix the issue that critical slip distance function must be …
EstherHeck Sep 14, 2021
0b172ec
Fixed: RSF parameter function now only need to be specified if RSF is…
EstherHeck Sep 23, 2021
4429fd5
remove deprecated parameter effective_friction_factor and clean up do…
EstherHeck Sep 23, 2021
eec0df5
removed deprecated todos
EstherHeck Sep 23, 2021
7734ade
restructuring of lapusta timestep
EstherHeck Sep 14, 2021
93397b1
fixed critical slip distance assert
EstherHeck Sep 23, 2021
cfe4c66
go through parameter texts
EstherHeck Sep 24, 2021
009d54e
made indent
EstherHeck Sep 24, 2021
ac078c8
somment on units for theta
EstherHeck Sep 28, 2021
9cb6bfd
deleted all cutting of theta except for within compute_theta and on p…
EstherHeck Sep 29, 2021
07c047d
make an input list for what compositions should use RSF
EstherHeck Oct 5, 2021
dae6618
Add TODOs
anne-glerum Sep 30, 2021
349e948
Update TODOs based on discussion and reviews
anne-glerum Oct 4, 2021
e5d2e8b
Update TODOs
anne-glerum Oct 13, 2021
af26f5a
Add reaction_rates
anne-glerum Oct 22, 2021
28ef83d
Update according to App E
anne-glerum Oct 28, 2021
d77b6b8
Add ReactionRates
anne-glerum Oct 29, 2021
e291b7f
Update fill_reaction_terms
anne-glerum Oct 29, 2021
cb0e577
Update parse_parameters
anne-glerum Oct 29, 2021
bc6a0d2
Update calculate_isostrain_viscosities
anne-glerum Oct 29, 2021
da2639a
Assert no plastic damper
anne-glerum Oct 29, 2021
6babfcd
Update comments
anne-glerum Oct 29, 2021
4416958
Fix 2 bugs
anne-glerum Oct 29, 2021
fbd85f8
Add pp to output the min and max of the stress components
anne-glerum Nov 1, 2021
ea2cc30
fix a debug-runtime error about the RSF-mask
EstherHeck Feb 7, 2022
966a2db
work on friction/theta asserts
EstherHeck Feb 7, 2022
1280e05
Fix precision statistiscs
anne-glerum Apr 20, 2022
ce47e05
rename variables after rebase etc
EstherHeck May 12, 2022
60544f3
get old theta correctly - using elastic stresses as an example
EstherHeck May 13, 2022
b6fc3d9
WIP get old theta correctly, building with errors
EstherHeck May 17, 2022
7409a56
get old theta correctly - no build error left
EstherHeck May 18, 2022
c6b3a6f
tested that old_theta correct and fixed runtime errors after merge
EstherHeck May 18, 2022
eb5568a
only compute RSF if in RSF material and small other things
EstherHeck May 22, 2022
ff7f53d
work on Annes comments
EstherHeck May 28, 2022
4acc04b
cut theta instead of assert
EstherHeck May 28, 2022
681d902
resolve segmentation fault error with checking that not in bg field
EstherHeck May 28, 2022
69cc51e
uncomment stress_averaging and remove stress_averaging time_scale_fac…
EstherHeck Jun 10, 2022
f73152a
uncomment atan assert
EstherHeck Aug 1, 2022
310d2e8
cleaning up after rebase onto PR4370 on 29th nov 2023 commit 30df10c.…
EstherHeck Nov 30, 2023
fd6cd50
made indent and resolved first build errors
EstherHeck Dec 1, 2023
c78764d
found two typos
EstherHeck Dec 5, 2023
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
16 changes: 0 additions & 16 deletions benchmarks/advection/README.md
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions benchmarks/advection/doc/advection.md
View file
Open in desktop

This file was deleted.

Binary file removed benchmarks/advection/doc/drop.png
View file
Open in desktop
Binary file not shown.
Binary file removed benchmarks/advection/doc/rotate_shape.png
View file
Open in desktop
Binary file not shown.
13 changes: 0 additions & 13 deletions benchmarks/advection/drop_ev.prm
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions benchmarks/advection/drop_supg.prm
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions benchmarks/advection/rotate_shape_ev.prm
View file
Open in desktop

This file was deleted.

119 changes: 0 additions & 119 deletions benchmarks/advection/rotate_shape_supg.prm
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions benchmarks/annulus/doc/annulus.md
View file
Open in desktop

This file was deleted.

Binary file removed benchmarks/annulus/doc/density.png
View file
Open in desktop
Binary file not shown.
Loading