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/07/15 07:08:24 UTC
[11/12] climate git commit: Strange text lines have been removed
Strange text lines have been removed
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8641bdbb
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8641bdbb
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8641bdbb
Branch: refs/heads/master
Commit: 8641bdbbcb9a874031434e6ea9745bc71729fe20
Parents: c5bf582
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Tue Jul 14 21:59:53 2015 -0700
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Tue Jul 14 21:59:53 2015 -0700
----------------------------------------------------------------------
ocw/utils.py | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/8641bdbb/ocw/utils.py
----------------------------------------------------------------------
diff --git a/ocw/utils.py b/ocw/utils.py
index 6ef0366..bb5ed37 100755
--- a/ocw/utils.py
+++ b/ocw/utils.py
@@ -321,7 +321,6 @@ def calc_climatology_monthly(dataset):
)
raise ValueError(error)
else:
-<<<<<<< HEAD
values = reshape_monthly_to_annually(dataset).mean(axis=0)
# A year can commence from any month
@@ -344,6 +343,3 @@ def calc_time_series(dataset):
t_series.append(dataset.values[t,:,:].mean())
return t_series
-=======
- return reshape_monthly_to_annually(dataset).mean(axis=0)
->>>>>>> 1340036ff488decfcefd6cd46c0c17bf2dfe13a8