Change order of parse options function #112
Merged
Conversation
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
victorsacek
pushed a commit
that referenced
this pull request
Apr 13, 2023
* 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR just invert the parse order of params and options.
This change is being made in order to make it easy to merge RP#106.
In future versions, command line options will be removed completely and will not be supported.
NOTE: This change assumes a default (hard coded) upper limit for the number of layers: 100000. This limitation will be removed since we drop support to command line options, specifically
-seedrelated options.