merge pion <x> branch #326
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
use SRC_TYPE enum values everywhere and merge with etmc/master
Conflicts: prepare_source.c
…r filename to be empty
… 1, just like for volume sources
|
I've added support for differing propagator and source filenames. It seems to work fine now. I also fixed some apparent logic bugs in the process. |
| @@ -367,7 +367,7 @@ int main(int argc, char *argv[]) | |||
| if (g_dflgcr_flag) | |||
| init_blocks(nblocks_t, nblocks_x, nblocks_y, nblocks_z); | |||
|
|
|||
| if(SourceInfo.type == SRC_TYPE_VOL) { | |||
| if(SourceInfo.type == SRC_TYPE_VOL || SourceInfo.type == SRC_TYPE_PION_TS || SourceInfo.type == SRC_TYPE_GEN_PION_TS) { | |||
There was a problem hiding this comment.
I've added this because it seems that otherwise for pion_ts and gen_pion_ts, the inverter would run twelve times unless Indices was set manually to 0. Not sure why that was not the case when Max and @urbach did the inversions.
…ion for the PionTimeslice source type
|
I believe this is fine now. |
|
okay, seems alright, I'm pulling this in now |
|
Thanks! |
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.