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

strain softening #106

Merged
merged 42 commits into from
Apr 13, 2023
Merged

strain softening #106

merged 42 commits into from
Apr 13, 2023

Commits on Mar 9, 2023

  1. strain softening from interfaces.txt working for cohesion and frictio… 

    …n angle but not for weakening seed
    @jamisonassuncao
    jamisonassuncao committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    1cc975f View commit details
    Browse the repository at this point in the history

  2. read weakening_seed from interfaces.txt and if negative, use initial … 

    …random strain
    @jamisonassuncao
    jamisonassuncao committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    f84a85a View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. calc_visc checks if strain softenins is from interfaces.txt or comman… 

    …d line; corrected where 'p' was used insted of 'layer_array[p]'
    @jamisonassuncao
    jamisonassuncao committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    90c2396 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2023

  1. small if correction

    @jamisonassuncao
    jamisonassuncao committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    51ccb85 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. fixed problem where interfaces.txt required strain softening paramete… 

    …rs regardless of the strain softening input
    @jamisonassuncao
    jamisonassuncao committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    7fc2274 View commit details
    Browse the repository at this point in the history

  2. uses weakening_min as weakening_seed if no parameters are given in th… 

    …e interfaces.txt file; also uses Beaumont values for cohesion and friction angle
    @jamisonassuncao
    jamisonassuncao committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4a94c21 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. small changes

    @jamisonassuncao
    jamisonassuncao committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    1ffdf59 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. add missing 'make all' command to build mandyoc image (#110)

    @rafaelmds
    rafaelmds committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    dde063a View commit details
    Browse the repository at this point in the history

  2. fix typo in line break character (#111)

    @rafaelmds
    rafaelmds committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    c7b811d View commit details
    Browse the repository at this point in the history

  3. change order of parse options function (#112)

    @rafaelmds
    rafaelmds committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    6029915 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2023

  1. strain softening from interfaces.txt working for cohesion and frictio… 

    …n angle but not for weakening seed
    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    ae5d56c View commit details
    Browse the repository at this point in the history

  2. read weakening_seed from interfaces.txt and if negative, use initial … 

    …random strain
    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    c2b489c View commit details
    Browse the repository at this point in the history

  3. calc_visc checks if strain softenins is from interfaces.txt or comman… 

    …d line; corrected where 'p' was used insted of 'layer_array[p]'
    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    74bff6d View commit details
    Browse the repository at this point in the history

  4. small if correction

    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    ea7933a View commit details
    Browse the repository at this point in the history

  5. fixed problem where interfaces.txt required strain softening paramete… 

    …rs regardless of the strain softening input
    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    68b04dd View commit details
    Browse the repository at this point in the history

  6. uses weakening_min as weakening_seed if no parameters are given in th… 

    …e interfaces.txt file; also uses Beaumont values for cohesion and friction angle
    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    3cb3ddf View commit details
    Browse the repository at this point in the history

  7. small changes

    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    b8313cb View commit details
    Browse the repository at this point in the history

  8. fixed previous issues where the interfaces files was read incorrectly… 

    … and changed code to fit the parse_options() commign before the reader()
    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    aa5bc76 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'strain-softening' of https://github.com/ggciag/mandyoc … 

    …into strain-softening
    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    1802f39 View commit details
    Browse the repository at this point in the history

  10. calc_visc conflict solving

    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    c9dc35e View commit details
    Browse the repository at this point in the history

  11. solved conflict with SMSwarm_3d.cpp

    @jamisonassuncao
    jamisonassuncao committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    96b259e View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. fix check of number of layers read from seed command and interfaces f… 

    …ile (#114)
    @rafaelmds
    rafaelmds committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    d0e90ac View commit details
    Browse the repository at this point in the history

  2. strain softening from interfaces.txt working for cohesion and frictio… 

    …n angle but not for weakening seed
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    cc722d8 View commit details
    Browse the repository at this point in the history

  3. read weakening_seed from interfaces.txt and if negative, use initial … 

    …random strain
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    5bed887 View commit details
    Browse the repository at this point in the history

  4. calc_visc checks if strain softenins is from interfaces.txt or comman… 

    …d line; corrected where 'p' was used insted of 'layer_array[p]'
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    f2259d5 View commit details
    Browse the repository at this point in the history

  5. small if correction

    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    fca5895 View commit details
    Browse the repository at this point in the history

  6. fixed problem where interfaces.txt required strain softening paramete… 

    …rs regardless of the strain softening input
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    e766367 View commit details
    Browse the repository at this point in the history

  7. uses weakening_min as weakening_seed if no parameters are given in th… 

    …e interfaces.txt file; also uses Beaumont values for cohesion and friction angle
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    1470938 View commit details
    Browse the repository at this point in the history

  8. small changes

    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    0df5729 View commit details
    Browse the repository at this point in the history

  9. fixed previous issues where the interfaces files was read incorrectly… 

    … and changed code to fit the parse_options() commign before the reader()
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    7eae1d8 View commit details
    Browse the repository at this point in the history

  10. strain softening from interfaces.txt working for cohesion and frictio… 

    …n angle but not for weakening seed
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    90d5e04 View commit details
    Browse the repository at this point in the history

  11. read weakening_seed from interfaces.txt and if negative, use initial … 

    …random strain
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    74dfd1a View commit details
    Browse the repository at this point in the history

  12. calc_visc checks if strain softenins is from interfaces.txt or comman… 

    …d line; corrected where 'p' was used insted of 'layer_array[p]'
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    dba714f View commit details
    Browse the repository at this point in the history

  13. small if correction

    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    fd028f3 View commit details
    Browse the repository at this point in the history

  14. fixed problem where interfaces.txt required strain softening paramete… 

    …rs regardless of the strain softening input
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    353e56f View commit details
    Browse the repository at this point in the history

  15. solved small conflict

    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    026675b View commit details
    Browse the repository at this point in the history

  16. Merge branch 'strain-softening' of https://github.com/ggciag/mandyoc … 

    …into strain-softening
    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    11c8915 View commit details
    Browse the repository at this point in the history

  17. fixed weakening arrays construction

    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    7ec985e View commit details
    Browse the repository at this point in the history

  18. default weakening start value is 0.0

    @jamisonassuncao
    jamisonassuncao committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    82b0cfd View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. Update src/reader.cpp to truncate friction angle values 

    Co-authored-by: Rafael Silva <rafaelmds@users.noreply.github.com>
    @jamisonassuncao @rafaelmds
    jamisonassuncao and rafaelmds committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    2d7391c View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. set default weakening_seed to be set by rand_r()

    @jamisonassuncao
    jamisonassuncao committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    4c2814c View commit details
    Browse the repository at this point in the history

  2. documentation + reference changing

    @jamisonassuncao
    jamisonassuncao committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    35db50d View commit details
    Browse the repository at this point in the history