Merge master into #30 #39
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
Arguments for open_mfdataset() now match signature in xarray master branch
Timing information is not consistent between processes and therefore cannot be concatenated.
- Make _BOUT_TIMING_VARIABLES all-uppercase as it is a global constant. - Remove attempt to test that some timing variables have been added to a test dataset before removing them.
Drop timing info dumped by BOUT v4.3
_trim was missing a required argument.
Since _trim is a private method, and in the only place it is used all the arguments are passed, it is clearer not to handle default arguments.
In BOUT++ there are always the same number of guard cells and boundary cells in a given direction, so do not need to specify the number of boundary cells separately.
|
Hello @johnomotani! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found: There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻 Comment last updated at 2019-07-23 08:17:38 UTC |
Codecov Report
@@ Coverage Diff @@
## keep_guard_cells #39 +/- ##
====================================================
+ Coverage 51.27% 51.62% +0.35%
====================================================
Files 6 6
Lines 275 277 +2
Branches 56 56
====================================================
+ Hits 141 143 +2
Misses 123 123
Partials 11 11
Continue to review full report at Codecov.
|
TomNicholas
approved these changes
Jul 25, 2019
| @@ -155,62 +156,65 @@ def _arrange_for_concatenation(filepaths, nxpe=1, nype=1): | |||
| return paths_grid, concat_dims | |||
|
|
|||
|
|
|||
| def _trim(ds, ghosts, guards={}, keep_guards={}, nxpe=1, nype=1): | |||
| def _trim(ds, *, guards, keep_boundaries, nxpe, nype): | |||
There was a problem hiding this comment.
I did not actually know you could do this!
johnomotani
pushed a commit
that referenced
this pull request
Dec 11, 2019
Merge master into #30 to fix conflicts in making boundary cells optional
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.
I've had a go at merging master to fix the merge conflicts in #30 and implement the suggestions from the comments.