Merge David's code into staggered-merge#479
Open
clarkedavida wants to merge 43 commits intopaboyle:feature/staggered-mergefrom
Open
Merge David's code into staggered-merge#479clarkedavida wants to merge 43 commits intopaboyle:feature/staggered-mergefrom
clarkedavida wants to merge 43 commits intopaboyle:feature/staggered-mergefrom
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
To start, I am trying to merge my force code into staggered-merge. My expectation is this won't interfere with what Curtis wants to put in, since almost everything I changed is contained within my current header file. There is a small change I made to StaggeredImpl.h to get the outer product to work for my use-case. (I think this was a change Peter suggested when I was first trying to get this to work--I don't remember.) Also I changed some of my generalShift machinery in GeneralLocalStencil.h, which I think should be fine since I expect no one is using that besides me.