Merge trilinos/develop into e3sm-project/develop #114
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
Note that this isn't 100% true. It looks like the Tpetra dependency comes in with ROL (which is optional), and the Teko dependency comes in with Tempus + ROL (which are optional). Given the discussion here: trilinos#12799, we're going to make them both required dependencies for now to get past these combinatoric which-packages-are-enabled build issues. Also added some required test dependencies that I discovered while configuring the tests.
Inappropriate to assert that NOX_ENABLE_Epetra is defined from within Piro if we may not be using NOX or Epetra. This is probably left over from when Epetra was a required dependency. Now, check for NOX and Epetra being enabled instead as part of the nicer if() conditional below.
…teko Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Piro: Fix Piro when Teko and Tpetra are not explicitly enabled.' PR Author: sebrowne
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.
Created by Github action