Fixes for 1499f9a #221
Merged
Fixes for 1499f9a #221
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
Commit 1499f9a introduced an unterminated #ifdef, probably as part of a mistaken conflict resolution. This commit fixes the build error by eliminating the #ifdef from M2ulPhyS::solveStep. The slurm "ready for restart" check appears in M2ulPhyS::solve (see line 1942) and so is not needed in M2ulPhyS::solveStep.
Whitespace edits to changes from 1499f9a
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.
1499f9a was inadvertently pushed directly to
mainwith build errors. This PR fixes them, specifically three issues:#ifdefinsrc/M2ulPhyS.cpptpsstill builds without gslib