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

[yt-4.0] Merging with master #2164

Merged
merged 190 commits into from
Mar 1, 2019
Merged

[yt-4.0] Merging with master #2164

merged 190 commits into from
Mar 1, 2019

Conversation

ngoldbaum
Copy link
Member

Once again trying to merge with master. Will push to this until I can get the tests passing.

matthewturk and others added 30 commits August 24, 2018 14:27
brittonsmith and others added 21 commits February 10, 2019 08:57
[enhancement] Add relativistic component to cosmology calculations
1. Blocks were being read in the incorrect row/column ordering, which wasn't noticable with cubic blocks.
2. Handle root block splitting with one block in a dimension
Adding option to rotate arrows in the EPS writer
ensure the global namespace in the plugins file is preserved
make FortranFile open files in binary mode. closes yt-project#2147
.travis.yml Outdated Show resolved Hide resolved
@matthewturk
Copy link
Member

@ngoldbaum -- do you want detailed review on this, or is test-passing sufficient?

@ngoldbaum
Copy link
Member Author

The tests passing should be sufficient. If you're worried take a look at the merge commit and the last couple of commits, the rest was all reviewed when it went on master.

@ngoldbaum
Copy link
Member Author

Should be good to go now :) OK to merge?

@matthewturk matthewturk merged commit 14a64bd into yt-project:yt-4.0 Mar 1, 2019
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.