You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by go...@apache.org on 2017/12/02 08:24:17 UTC
[1/4] climate git commit: CLIMATE-797 Fix attribute error when
dataset has no mask attribute
Repository: climate
Updated Branches:
refs/heads/master 2d30ef8ed -> 8cf58f88f
CLIMATE-797 Fix attribute error when dataset has no mask attribute
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/41412cae
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/41412cae
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/41412cae
Branch: refs/heads/master
Commit: 41412caea5c9330ccbec28f4130ced89361789f8
Parents: 7d6f5ae
Author: Michael Anderson <mi...@Michaels-iMac.local>
Authored: Mon Nov 27 19:21:14 2017 -0500
Committer: Michael Anderson <mi...@Michaels-iMac.local>
Committed: Mon Nov 27 19:21:14 2017 -0500
----------------------------------------------------------------------
ocw/dataset_processor.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/41412cae/ocw/dataset_processor.py
----------------------------------------------------------------------
diff --git a/ocw/dataset_processor.py b/ocw/dataset_processor.py
index 160ffb7..cf2e90e 100755
--- a/ocw/dataset_processor.py
+++ b/ocw/dataset_processor.py
@@ -867,9 +867,13 @@ def mask_missing_data(dataset_array):
mask_array = np.zeros(dataset_array[0].values.shape)
for dataset in dataset_array:
- index = np.where(dataset.values.mask == True)
- if index[0].size > 0:
- mask_array[index] = 1
+ # CLIMATE-797 - Not every array passed in will be a masked array.
+ # For those that are, action based on the mask passed in.
+ # For those that are not, take no action (else AttributeError).
+ if hasattr(dataset.values, 'mask'):
+ index = np.where(dataset.values.mask == True)
+ if index[0].size > 0:
+ mask_array[index] = 1
masked_array = []
for dataset in dataset_array:
dataset.values = ma.array(dataset.values, mask=mask_array)
[2/4] climate git commit: Merge branch 'master' into CLIMATE-797
Posted by go...@apache.org.
Merge branch 'master' into CLIMATE-797
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/706ae2df
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/706ae2df
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/706ae2df
Branch: refs/heads/master
Commit: 706ae2dfb497178abae0c3dd995894a707bd1025
Parents: 41412ca 6979331
Author: MichaelArthurAnderson <mi...@gmail.com>
Authored: Thu Nov 30 20:29:03 2017 -0500
Committer: GitHub <no...@github.com>
Committed: Thu Nov 30 20:29:03 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/4] climate git commit: Merge branch 'CLIMATE-797' of
https://github.com/MichaelArthurAnderson/climate
Posted by go...@apache.org.
Merge branch 'CLIMATE-797' of https://github.com/MichaelArthurAnderson/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8cf58f88
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8cf58f88
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8cf58f88
Branch: refs/heads/master
Commit: 8cf58f88fef22a3f50623f0af13b0cda899c4ffb
Parents: 2d30ef8 3e17f5c
Author: Alex <ag...@users.noreply.github.com>
Authored: Sat Dec 2 00:18:49 2017 -0800
Committer: Alex <ag...@users.noreply.github.com>
Committed: Sat Dec 2 00:18:49 2017 -0800
----------------------------------------------------------------------
ocw/dataset_processor.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/4] climate git commit: Merge branch 'master' into CLIMATE-797
Posted by go...@apache.org.
Merge branch 'master' into CLIMATE-797
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/3e17f5cd
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/3e17f5cd
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/3e17f5cd
Branch: refs/heads/master
Commit: 3e17f5cd88ab3eabf232a8589d783289ae064d66
Parents: 706ae2d 6979331
Author: MichaelArthurAnderson <mi...@gmail.com>
Authored: Thu Nov 30 20:30:04 2017 -0500
Committer: GitHub <no...@github.com>
Committed: Thu Nov 30 20:30:04 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------