Update erdc master #1
Merged
Conversation
This file contains hidden or 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
adds yaml file for proteus on stampede
Conflicts: examples/proteus.garnet.gnu.yaml pkgs/pythreejs.yaml
…into stable/proteus
updated chrono and gmsh pkgs source
re-updated chrono commit
modified: examples/proteus.linux2.yaml modified: pkgs/h5py.yaml modified: pkgs/julia.yaml modified: pkgs/numpy/numpy.yaml modified: pkgs/openblas.yaml modified: pkgs/py.yaml new file: pkgs/pybind11.yaml modified: pkgs/pytables/pytables.yaml modified: pkgs/pytest-cov.yaml modified: pkgs/pytest.yaml modified: pkgs/python/python.yaml modified: pkgs/scipy/scipy.yaml
Milad-Rakhsha
pushed a commit
to Milad-Rakhsha/hashstack
that referenced
this pull request
Dec 31, 2018
Stable/proteus
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.
No description provided.