-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* strain softening from interfaces.txt working for cohesion and friction angle but not for weakening seed * read weakening_seed from interfaces.txt and if negative, use initial random strain * calc_visc checks if strain softenins is from interfaces.txt or command line; corrected where 'p' was used insted of 'layer_array[p]' * small if correction * fixed problem where interfaces.txt required strain softening parameters regardless of the strain softening input * uses weakening_min as weakening_seed if no parameters are given in the interfaces.txt file; also uses Beaumont values for cohesion and friction angle * small changes * add missing 'make all' command to build mandyoc image (#110) * fix typo in line break character (#111) * change order of parse options function (#112) * strain softening from interfaces.txt working for cohesion and friction angle but not for weakening seed * read weakening_seed from interfaces.txt and if negative, use initial random strain * calc_visc checks if strain softenins is from interfaces.txt or command line; corrected where 'p' was used insted of 'layer_array[p]' * small if correction * fixed problem where interfaces.txt required strain softening parameters regardless of the strain softening input * uses weakening_min as weakening_seed if no parameters are given in the interfaces.txt file; also uses Beaumont values for cohesion and friction angle * small changes * fixed previous issues where the interfaces files was read incorrectly and changed code to fit the parse_options() commign before the reader() * calc_visc conflict solving * solved conflict with SMSwarm_3d.cpp * fix check of number of layers read from seed command and interfaces file (#114) * strain softening from interfaces.txt working for cohesion and friction angle but not for weakening seed * read weakening_seed from interfaces.txt and if negative, use initial random strain * calc_visc checks if strain softenins is from interfaces.txt or command line; corrected where 'p' was used insted of 'layer_array[p]' * small if correction * fixed problem where interfaces.txt required strain softening parameters regardless of the strain softening input * uses weakening_min as weakening_seed if no parameters are given in the interfaces.txt file; also uses Beaumont values for cohesion and friction angle * small changes * fixed previous issues where the interfaces files was read incorrectly and changed code to fit the parse_options() commign before the reader() * strain softening from interfaces.txt working for cohesion and friction angle but not for weakening seed * read weakening_seed from interfaces.txt and if negative, use initial random strain * calc_visc checks if strain softenins is from interfaces.txt or command line; corrected where 'p' was used insted of 'layer_array[p]' * small if correction * fixed problem where interfaces.txt required strain softening parameters regardless of the strain softening input * solved small conflict * fixed weakening arrays construction * default weakening start value is 0.0 * Update src/reader.cpp to truncate friction angle values Co-authored-by: Rafael Silva <rafaelmds@users.noreply.github.com> * set default weakening_seed to be set by rand_r() * documentation + reference changing --------- Co-authored-by: Rafael Silva <rafaelmds@users.noreply.github.com>
- Loading branch information
1 parent
8ce1f00
commit 66afb7c
Showing
11 changed files
with
330 additions
and
214 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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,19 @@ | ||
C 1.0 1.0 1.0 | ||
rho 3000.0 3000.0 3000.0 | ||
H 0.0 0.0 0.0 | ||
A 0.0 0.0 0.0 | ||
n 0.0 0.0 0.0 | ||
Q 0.0 0.0 0.0 | ||
V 0.0 0.0 0.0 | ||
weakeing_seed 1.0 -1.0 0.5 | ||
cohesion_min 5.0e6 5.0e6 5.0e6 | ||
cohesion_max 30.0e7 5.0e6 1.0e7 | ||
friction_angle_min 0.0 0.2 10.0 | ||
friction_angle_max 0.0 20.0 10.0 | ||
y_1(x_0) y_2(x_0) | ||
y_1(x_1) y_2(x_1) | ||
y_1(x_2) y_2(x_2) | ||
y_1(x_3) y_2(x_3) | ||
y_1(x_4) y_2(x_4) | ||
y_1(x_5) y_2(x_5) | ||
y_1(x_6) y_2(x_6) |
This file contains 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 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 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.