You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by hu...@apache.org on 2015/08/01 00:29:39 UTC
[1/2] climate git commit: Fix the ensemble calculation
Repository: climate
Updated Branches:
refs/heads/master d55b8ae98 -> e9dda95d3
Fix the ensemble calculation
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/9411152e
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/9411152e
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/9411152e
Branch: refs/heads/master
Commit: 9411152efa3eaef538acb96d13657ac7af9b8540
Parents: 83d83ba
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Thu Jul 30 17:15:45 2015 -0700
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Thu Jul 30 17:15:45 2015 -0700
----------------------------------------------------------------------
ocw/dataset_processor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/9411152e/ocw/dataset_processor.py
----------------------------------------------------------------------
diff --git a/ocw/dataset_processor.py b/ocw/dataset_processor.py
index 984e142..50353f7 100755
--- a/ocw/dataset_processor.py
+++ b/ocw/dataset_processor.py
@@ -186,7 +186,7 @@ def ensemble(datasets):
"""
_check_dataset_shapes(datasets)
dataset_values = [dataset.values for dataset in datasets]
- ensemble_values = np.mean(dataset_values, axis=0)
+ ensemble_values = ma.mean(dataset_values, axis=0)
# Build new dataset object from the input datasets and the ensemble values and return it
ensemble_dataset = ds.Dataset(datasets[0].lats,
[2/2] climate git commit: Merge branch 'CLIMATE-650'
Posted by hu...@apache.org.
Merge branch 'CLIMATE-650'
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/e9dda95d
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/e9dda95d
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/e9dda95d
Branch: refs/heads/master
Commit: e9dda95d36fc0cd485ad33e015d19de7b63a8071
Parents: d55b8ae 9411152
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Fri Jul 31 15:29:32 2015 -0700
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Fri Jul 31 15:29:32 2015 -0700
----------------------------------------------------------------------
ocw/dataset_processor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/e9dda95d/ocw/dataset_processor.py
----------------------------------------------------------------------