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.

Sign up for GitHub

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

Jump to bottom

fix setGrid #193

Merged
merged 7 commits into from
Nov 16, 2017
Merged

fix setGrid #193

merged 7 commits into from
Nov 16, 2017

Conversation

dnadeau4
Copy link
Contributor

@dnadeau4 dnadeau4 commented Nov 15, 2017 •
edited by durack1
Loading

Fix CDAT/cdat#1738 - squeeze
Fix #41 - squeeze
Fix CDAT/cdutil#2 - squeeze

@dnadeau4 dnadeau4 added this to the 3.0 milestone Nov 15, 2017
@dnadeau4
Copy link
Contributor Author

CDAT/cdat#1707

durack1
durack1 reviewed Nov 16, 2017
View reviewed changes
Lib/MV2.py Outdated
@@ -340,6 +340,14 @@ def _conv_axis_arg(axis):
axis = 0
return axis

def squeeze(x):
"squeze array"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

squeze -> squeeze

durack1
durack1 reviewed Nov 16, 2017
View reviewed changes
Lib/hgrid.py
@@ -676,7 +676,7 @@ def isClose(self, g):
def checkAxes(self, axes):
"""Return 1 iff every element of self.getAxisList() is in the list 'axes'."""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iff -> if

@doutriaux1 doutriaux1 merged commit 5d21511 into master Nov 16, 2017
@doutriaux1 doutriaux1 deleted the issue_1707_curvsetaxis branch November 16, 2017 05:37
@chaosphere2112 chaosphere2112 mentioned this pull request Nov 16, 2017
Open
doutriaux1 added a commit that referenced this pull request Nov 16, 2017
@doutriaux1
Revert "fix setGrid (#193)"
3ab3bb7 
This reverts commit 5d21511.
@doutriaux1 doutriaux1 mentioned this pull request Nov 16, 2017
Merged
doutriaux1 added a commit that referenced this pull request Nov 16, 2017
@doutriaux1
Revert "fix setGrid" (#194)
b51bb30 
* add truedivide and floordivide to MV2

* fix iff->if in documentation

* fix ci machines

* flake8

* Revert "add truedivide and floordivide to MV2 (#192)"

This reverts commit e011a61.

* Revert "fix setGrid (#193)"

This reverts commit 5d21511.

* oin correct netcdf libs
@doutriaux1 doutriaux1 restored the issue_1707_curvsetaxis branch November 30, 2017 01:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@durack1 durack1 durack1 left review comments

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@dnadeau4 @durack1 @doutriaux1