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

add missing command to build mandyoc #110

Merged
merged 1 commit into from
Mar 31, 2023
Merged

add missing command to build mandyoc #110

merged 1 commit into from
Mar 31, 2023

Conversation

rafaelmds
Copy link
Contributor

Fixes #107

This PR just add the make all call in the chain of commands to build Mandyoc, in the Dockerfile.

@rafaelmds rafaelmds merged commit dde063a into main Mar 31, 2023
@rafaelmds rafaelmds deleted the fix-dockerfile branch March 31, 2023 00:16
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mandyoc is not beeing build in Dockerfile
1 participant