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

Adding Axom as a TPL #24

Merged
merged 2 commits into from
Aug 26, 2020
Merged

Adding Axom as a TPL #24

merged 2 commits into from
Aug 26, 2020

Conversation

mdavis36
Copy link
Collaborator

Summary

This PR adds Axom as a TPL for use of the Sidre module within Spheral. Conduit is a required TPL for building the Sidre module so this PR also adds Conduit.

A clean build has been performed and all tests have passed.

Copy link
Collaborator

@jmikeowen jmikeowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@mdavis36 mdavis36 merged commit d52fc61 into develop Aug 26, 2020
@mdavis36 mdavis36 deleted the feature/cmake-add-axom-sidre branch August 26, 2020 18:26
jmikeowen pushed a commit that referenced this pull request Nov 24, 2020
* commit 'c3fd7f8e417a79c151a1d7119488f7d3a1444169':
  Fixing a restart bug in the new Collins strength model.
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.

3 participants