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 2017/03/08 17:17:42 UTC

[1/2] climate git commit: CLIMATE-900 - Debugging temporal subset

Repository: climate
Updated Branches:
  refs/heads/master 1ecb29555 -> 7741c0af6


CLIMATE-900 - Debugging temporal subset

-ocw.dataset_processor.temporal_subset has been updated.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/7c171058
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7c171058
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7c171058

Branch: refs/heads/master
Commit: 7c171058a56cbd50b4aa3f57ce8e0b2ff9643be7
Parents: 1ecb295
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Mar 8 09:10:55 2017 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Mar 8 09:10:55 2017 -0800

----------------------------------------------------------------------
 ocw/dataset_processor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/7c171058/ocw/dataset_processor.py
----------------------------------------------------------------------
diff --git a/ocw/dataset_processor.py b/ocw/dataset_processor.py
index 98e6899..b113bc7 100755
--- a/ocw/dataset_processor.py
+++ b/ocw/dataset_processor.py
@@ -77,7 +77,7 @@ def temporal_subset(target_dataset, month_start, month_end,
     if average_each_year:
         nmonth = len(month_index)
         ntime = new_dataset.times.size
-        nyear = ntime // nmonth
+        nyear = ntime/nmonth
         averaged_time = []
         ny, nx = target_dataset.values.shape[1:]
         averaged_values = ma.zeros([nyear, ny, nx])


[2/2] climate git commit: Merge branch 'CLIMATE-900'

Posted by hu...@apache.org.
Merge branch 'CLIMATE-900'


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/7741c0af
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7741c0af
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7741c0af

Branch: refs/heads/master
Commit: 7741c0af64f032e9cc01dfa1cbe294ffb0d597e9
Parents: 1ecb295 7c17105
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Mar 8 09:17:29 2017 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Mar 8 09:17:29 2017 -0800

----------------------------------------------------------------------
 ocw/dataset_processor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------