[1/2] climate git commit: CLIMATE-736 - Update dataset_processor.write_netcdf_multiple_datasets_with_subregions

2016-01-30 Thread huikyole 
Repository: climate
Updated Branches:
  refs/heads/master e6fb4aa0b -> 44c189e85


CLIMATE-736 - Update 
dataset_processor.write_netcdf_multiple_datasets_with_subregions

- With this update, 
ocw.dataset_processor.write_netcdf_multiple_datasets_with_subregions can 
properly handle datasets on curvilinear grids.
This ticket is also a follow up of CLIMATE-732. There were some errors in 
ocw.dataset_processor.temporal_rebin.


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

Branch: refs/heads/master
Commit: a38041e35fdcb8f1902a467f8fa594d2b7cdd18c
Parents: b30e12b
Author: huikyole 
Authored: Sat Jan 30 11:54:28 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 11:54:28 2016 -0800

--
 ocw/dataset_processor.py | 37 ++---
 1 file changed, 22 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/a38041e3/ocw/dataset_processor.py
--
diff --git a/ocw/dataset_processor.py b/ocw/dataset_processor.py
index 40f6cc8..fee61bf 100755
--- a/ocw/dataset_processor.py
+++ b/ocw/dataset_processor.py
@@ -565,8 +565,9 @@ def 
write_netcdf_multiple_datasets_with_subregions(ref_dataset, ref_name,
 # Set attribute lenghts
 nobs = 1
 nmodel = len(model_dataset_array)
-lat_len = len(dataset.lats)
-lon_len = len(dataset.lons)
+lat_len, lon_len = dataset.values.shape[1:]
+lat_ndim = dataset.lats.ndim
+lon_ndim = dataset.lons.ndim
 time_len = len(dataset.times)
 
 if not subregions == None:
@@ -578,9 +579,15 @@ def 
write_netcdf_multiple_datasets_with_subregions(ref_dataset, ref_name,
 time_dim = out_file.createDimension('time', time_len)
 
 # Create variables and store the values
-lats = out_file.createVariable('lat', 'f8', ('y'))
+if lat_ndim ==2:
+lats = out_file.createVariable('lat', 'f8', ('y','x'))
+else:
+lats = out_file.createVariable('lat', 'f8', ('y'))
 lats[:] = dataset.lats
-lons = out_file.createVariable('lon', 'f8', ('x'))
+if lon_ndim ==2:
+lons = out_file.createVariable('lon', 'f8', ('y','x'))
+else:
+lons = out_file.createVariable('lon', 'f8', ('x'))
 lons[:] = dataset.lons
 times = out_file.createVariable('time', 'f8', ('time',))
 times.units = "days since %s" % dataset.times[0]
@@ -656,12 +663,12 @@ def temperature_unit_conversion(dataset):
 :returns: The dataset with (potentially) updated units.
 :rtype: :class:`dataset.Dataset`
 '''
-temperature_variables = ['temp','tas','tasmax','taxmin','T','t']
+temperature_variables = ['temp','tas','tasmax','taxmin','T','tg']
 variable = dataset.variable.lower()
 
 if any(sub_string in variable for sub_string in temperature_variables):
 dataset_units = dataset.units.lower()
-if dataset_units == 'c' or dataset_units == 'celcius':
+if dataset_units == 'c' or dataset_units == 'celsius':
 dataset.values = 273.15 + dataset.values
 dataset.units = 'K'
 
@@ -900,7 +907,7 @@ def _rcmes_calc_average_on_new_time_unit(data, dates, unit):
 new_data = ma.mean(data, axis=0)
 new_date = [dates[size(dates)/2]]
 if unit == 'annual':
-years = [d.year for d in target_dataset.times]
+years = [d.year for d in dates]
 years_sorted = np.unique(years)
 new_data = ma.zeros([years_sorted.size, ny, nx])
 it = 0
@@ -911,9 +918,9 @@ def _rcmes_calc_average_on_new_time_unit(data, dates, unit):
 new_date.append(datetime.datetime(year=year, month=7, day=2))
 it = it+1
 if unit == 'monthly':
-years = [d.year for d in target_dataset.times]
+years = [d.year for d in dates]
 years_sorted = np.unique(years)
-months = [d.month for d in target_dataset.times]
+months = [d.month for d in dates]
 months_sorted = np.unique(months)
 
 new_data = ma.zeros([years_sorted.size*months_sorted.size, ny, nx])
@@ -926,16 +933,16 @@ def _rcmes_calc_average_on_new_time_unit(data, dates, 
unit):
 new_date.append(datetime.datetime(year=year, month=month, 
day=15))
 it = it+1   
 if unit == 'daily':
-dates = [d.year*1.+d.month*100.+d.day for d in 
target_dataset.times] 
-dates_sorted = np.unique(dates)
+days = [d.year*1.+d.month*100.+d.day for d in dates] 
+days_sorted = np.unique(days)
 
-new_data = ma.zeros([dates_sorted.size, ny, nx])
+new_data =

[2/2] climate git commit: CLIMATE-736 - Update dataset_processor.write_netcdf_multiple_datasets_with_subregions

2016-01-30 Thread huikyole 
CLIMATE-736 - Update 
dataset_processor.write_netcdf_multiple_datasets_with_subregions

- With this update, 
ocw.dataset_processor.write_netcdf_multiple_datasets_with_subregions can 
properly handle datasets on curvilinear grids. This ticket is also a follow up 
of CLIMATE-732. Some errors in ocw.dataset_processor.temporal_rebin have been 
fixed.


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

Branch: refs/heads/master
Commit: 44c189e8545c26febe7b30c917ddffc33db95174
Parents: e6fb4aa a38041e
Author: huikyole 
Authored: Sat Jan 30 11:56:06 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 11:56:06 2016 -0800

--
 ocw/dataset_processor.py | 37 ++---
 1 file changed, 22 insertions(+), 15 deletions(-)
--

[2/4] climate git commit: Merge branch 'master' of https://github.com/apache/climate into CLIMATE-733

2016-01-30 Thread huikyole 
Merge branch 'master' of https://github.com/apache/climate into CLIMATE-733


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

Branch: refs/heads/master
Commit: 5dc1c3220afc4d635ba2a7c9520a4ed0ecd24e49
Parents: 1ee1b71 9474785
Author: huikyole 
Authored: Fri Jan 29 16:46:34 2016 -0800
Committer: huikyole 
Committed: Fri Jan 29 16:46:34 2016 -0800

--
 RCMES/test/test.py |  6 +--
 examples/knmi_to_cru31_full_bias.py|  6 +--
 examples/model_ensemble_to_rcmed.py|  8 +--
 examples/multi_model_taylor_diagram.py |  4 +-
 examples/simple_model_to_model_bias.py |  4 +-
 examples/taylor_diagram_example.py |  4 +-
 ocw/dataset_processor.py   | 83 +++--
 7 files changed, 84 insertions(+), 31 deletions(-)
--

[4/4] climate git commit: CLIMATE-733 - Update run_RCMES.py

2016-01-30 Thread huikyole 
CLIMATE-733 - Update run_RCMES.py

- customized names for latitudes and longitudes are allowed.
- daily or hourly data stored on user's local machine can be used for model 
evaluation.


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

Branch: refs/heads/master
Commit: 85178a402845f148789884910bf880bb57aa2553
Parents: c706df1 0b1b939
Author: huikyole 
Authored: Sat Jan 30 11:47:37 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 11:47:37 2016 -0800

--
 RCMES/run_RCMES.py | 41 +++--
 1 file changed, 27 insertions(+), 14 deletions(-)
--

[1/4] climate git commit: CLIMATE-733 - Update run_RCMES.py

2016-01-30 Thread huikyole 
Repository: climate
Updated Branches:
  refs/heads/master c706df1c6 -> 85178a402


CLIMATE-733 - Update run_RCMES.py

- customized names for latitudes and longitudes are allowed.
- daily or hourly data stored on user's local machine can be used for model 
evaluation.


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

Branch: refs/heads/master
Commit: 1ee1b71207447b2ad6c049046c291f894571171a
Parents: 0783163
Author: huikyole 
Authored: Fri Jan 29 16:45:35 2016 -0800
Committer: huikyole 
Committed: Fri Jan 29 16:45:35 2016 -0800

--
 RCMES/run_RCMES.py | 41 +++--
 1 file changed, 27 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/1ee1b712/RCMES/run_RCMES.py
--
diff --git a/RCMES/run_RCMES.py b/RCMES/run_RCMES.py
index 1054446..27a3e4b 100644
--- a/RCMES/run_RCMES.py
+++ b/RCMES/run_RCMES.py
@@ -59,11 +59,18 @@ max_lon = space_info['max_lon']
 
 """ Step 1: Load the reference data """
 ref_data_info = config['datasets']['reference']
+ref_lat_name = None
+ref_lon_name = None
+if ref_data_info['latitude_name'] in ref_data_info.keys():
+ref_lat_name = ref_data_info['latitude_name']
+if ref_data_info['longitude_name'] in ref_data_info.keys():
+ref_lon_name = ref_data_info['longitude_name']
 print 'Loading observation dataset:\n',ref_data_info
 ref_name = ref_data_info['data_name']
 if ref_data_info['data_source'] == 'local':
 ref_dataset = local.load_file(ref_data_info['path'],
-  ref_data_info['variable'], name=ref_name)
+  ref_data_info['variable'], name=ref_name,
+  lat_name=ref_lat_name, lon_name=ref_lon_name)
 elif ref_data_info['data_source'] == 'rcmed':
   ref_dataset = rcmed.parameter_dataset(ref_data_info['dataset_id'],
 ref_data_info['parameter_id'],
@@ -72,22 +79,30 @@ elif ref_data_info['data_source'] == 'rcmed':
 else:
 print ' '
 # TO DO: support ESGF
-
-ref_dataset =  dsp.normalize_dataset_datetimes(ref_dataset, 
temporal_resolution)
+if temporal_resolution == 'daily' or temporal_resolution == 'monthly':
+ref_dataset =  dsp.normalize_dataset_datetimes(ref_dataset, 
temporal_resolution)
 if 'multiplying_factor' in ref_data_info.keys():
 ref_dataset.values = ref_dataset.values*ref_data_info['multiplying_factor']
 
 """ Step 2: Load model NetCDF Files into OCW Dataset Objects """
 model_data_info = config['datasets']['targets']
+model_lat_name = None
+model_lon_name = None
+if model_data_info['latitude_name'] in model_data_info.keys():
+model_lat_name = model_data_info['latitude_name']
+if model_data_info['longitude_name'] in model_data_info.keys():
+model_lon_name = model_data_info['longitude_name']
 print 'Loading model datasets:\n',model_data_info
 if model_data_info['data_source'] == 'local':
 model_datasets, model_names = local.load_multiple_files(file_path = 
model_data_info['path'],
-variable_name 
=model_data_info['variable'])
+variable_name 
=model_data_info['variable'], 
+
lat_name=model_lat_name, lon_name=model_lon_name)
 else:
 print ' '
 # TO DO: support RCMED and ESGF
-for idata,dataset in enumerate(model_datasets):
-model_datasets[idata] = dsp.normalize_dataset_datetimes(dataset, 
temporal_resolution)
+if temporal_resolution == 'daily' or temporal_resolution == 'monthly':
+for idata,dataset in enumerate(model_datasets):
+model_datasets[idata] = dsp.normalize_dataset_datetimes(dataset, 
temporal_resolution)
 
 """ Step 3: Subset the data for temporal and spatial domain """
 # Create a Bounds object to use for subsetting
@@ -106,15 +121,13 @@ if ref_data_info['data_source'] == 'rcmed':
 max_lon = np.min([max_lon, ref_dataset.lons.max()])
 bounds = Bounds(min_lat, max_lat, min_lon, max_lon, start_time, end_time)
 
-if ref_dataset.lats.ndim !=2 and ref_dataset.lons.ndim !=2:
-ref_dataset = dsp.subset(bounds,ref_dataset)
-else:
-ref_dataset = dsp.temporal_slice(bounds.start, bounds.end, ref_dataset)
+ref_dataset = dsp.subset(bounds,ref_dataset)
+if ref_dataset.temporal_resolution() != temporal_resolution:
+ref_dataset = dsp.temporal_rebin(ref_dataset, temporal_resolution)
 for idata,dataset in enumerate(model_datasets):
-if dataset.lats.ndim !=2

[1/2] climate git commit: CLIMATE-735 - Update utils.decode_time_values

2016-01-30 Thread huikyole 
Repository: climate
Updated Branches:
  refs/heads/master 3fb6bc193 -> e6fb4aa0b


CLIMATE-735 - Update utils.decode_time_values

- With this update, it is possible to efficiently handle the netCDF files whose 
time unit ends with 'Z' character.


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

Branch: refs/heads/master
Commit: b30e12b86f48c09c7365730fd66f87136b340a67
Parents: 162a1ba
Author: huikyole 
Authored: Sat Jan 30 11:51:06 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 11:51:06 2016 -0800

--
 ocw/utils.py | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/b30e12b8/ocw/utils.py
--
diff --git a/ocw/utils.py b/ocw/utils.py
index 3c7beb0..7adb3ed 100755
--- a/ocw/utils.py
+++ b/ocw/utils.py
@@ -43,6 +43,8 @@ def decode_time_values(dataset, time_var_name):
 '''
 time_data = dataset.variables[time_var_name]
 time_format = time_data.units
+if time_format[-1].lower() == 'z':
+time_format = time_format[:-1]
 
 time_units = parse_time_units(time_format)
 time_base = parse_time_base(time_format)

[2/2] climate git commit: CLIMATE-735 - Update utils.decode_time_values

2016-01-30 Thread huikyole 
CLIMATE-735 - Update utils.decode_time_values

- With this update, it is possible to efficiently handle the netCDF files whose 
time unit ends with 'Z' character.


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

Branch: refs/heads/master
Commit: e6fb4aa0bb529b1f109bc9790d4a5c97ce234b04
Parents: 3fb6bc1 b30e12b
Author: huikyole 
Authored: Sat Jan 30 11:52:30 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 11:52:30 2016 -0800

--
 ocw/utils.py | 2 ++
 1 file changed, 2 insertions(+)
--

[1/2] climate git commit: CLIMATE-734 - Adjust size of the color bars in the map plot of biases

2016-01-30 Thread huikyole 
Repository: climate
Updated Branches:
  refs/heads/master 85178a402 -> 3fb6bc193


CLIMATE-734 - Adjust size of the color bars in the map plot of biases

- The height of colorbars in RCMES/metrics_and_plots.py has been changed to 
make the plots look nicer.


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

Branch: refs/heads/master
Commit: 162a1bacd38ef249b66b671ddc3b602c86357529
Parents: 0b1b939
Author: huikyole 
Authored: Sat Jan 30 11:40:33 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 11:40:33 2016 -0800

--
 RCMES/metrics_and_plots.py | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/162a1bac/RCMES/metrics_and_plots.py
--
diff --git a/RCMES/metrics_and_plots.py b/RCMES/metrics_and_plots.py
index 6e00b0f..848af9d 100644
--- a/RCMES/metrics_and_plots.py
+++ b/RCMES/metrics_and_plots.py
@@ -61,11 +61,15 @@ def Map_plot_bias_of_multiyear_climatology(obs_dataset, 
obs_name, model_datasets
 ax = fig.add_subplot(row,column,1)
 if map_projection == 'npstere':
 m = Basemap(ax=ax, projection ='npstere', boundinglat=lat_min, lon_0=0,
-resolution = 'l', fix_aspect=False)
+resolution = 'l', fix_aspect=True)
 else:
 m = Basemap(ax=ax, projection ='cyl', llcrnrlat = lat_min, urcrnrlat = 
lat_max,
-llcrnrlon = lon_min, urcrnrlon = lon_max, resolution = 'l', 
fix_aspect=False)
-lons, lats = np.meshgrid(obs_dataset.lons, obs_dataset.lats)
+llcrnrlon = lon_min, urcrnrlon = lon_max, resolution = 'l', 
fix_aspect=True)
+if obs_dataset.lons.ndim == 1 and obs_dataset.lats.ndim == 1:
+lons, lats = np.meshgrid(obs_dataset.lons, obs_dataset.lats)
+if obs_dataset.lons.ndim == 2 and obs_dataset.lats.ndim == 2:
+lons = obs_dataset.lons
+lats = obs_dataset.lats
 
 x,y = m(lons, lats)
 
@@ -74,7 +78,7 @@ def Map_plot_bias_of_multiyear_climatology(obs_dataset, 
obs_name, model_datasets
 m.drawstates(linewidth=0.5, color='w')
 max = m.contourf(x,y,obs_clim,levels = 
plotter._nice_intervals(obs_dataset.values, 10), extend='both',cmap='rainbow')
 ax.annotate('(a) \n' + obs_name,xy=(lon_min, lat_min))
-cax = fig.add_axes([0.02, 1.-float(1./row), 0.01, 1./row*0.6])
+cax = fig.add_axes([0.02, 1.-float(1./row)+1./row*0.25, 0.01, 1./row*0.5])
 plt.colorbar(max, cax = cax) 
 clevs = plotter._nice_intervals(rcm_bias, 11)
 for imodel in np.arange(len(model_datasets)):
@@ -82,17 +86,17 @@ def Map_plot_bias_of_multiyear_climatology(obs_dataset, 
obs_name, model_datasets
 ax = fig.add_subplot(row, column,2+imodel)
 if map_projection == 'npstere':
 m = Basemap(ax=ax, projection ='npstere', boundinglat=lat_min, 
lon_0=0,
-resolution = 'l', fix_aspect=False)
+resolution = 'l', fix_aspect=True)
 else:
 m = Basemap(ax=ax, projection ='cyl', llcrnrlat = lat_min, 
urcrnrlat = lat_max,
-llcrnrlon = lon_min, urcrnrlon = lon_max, resolution = 'l', 
fix_aspect=False)
+llcrnrlon = lon_min, urcrnrlon = lon_max, resolution = 'l', 
fix_aspect=True)
 m.drawcoastlines(linewidth=1)
 m.drawcountries(linewidth=1)
 m.drawstates(linewidth=0.5, color='w')
 max = m.contourf(x,y,rcm_bias[imodel,:],levels = clevs, extend='both', 
cmap='RdBu_r')
 ax.annotate('('+string_list[imodel+1]+')  \n 
'+model_names[imodel],xy=(lon_min, lat_min))
 
-cax = fig.add_axes([0.91, 0.1, 0.015, 0.8])
+cax = fig.add_axes([0.91, 0.5, 0.015, 0.4])
 plt.colorbar(max, cax = cax) 
 
 plt.subplots_adjust(hspace=0.01,wspace=0.05)

[1/3] climate git commit: CLIMATE-715 Adding a new demo tab along with the evaluate and result so that user can see the demo of the ocw in this tab

2016-01-30 Thread omkarr 
Repository: climate
Updated Branches:
  refs/heads/master 947478539 -> c706df1c6


CLIMATE-715 Adding a new demo tab along with the evaluate and result so that 
user can see the demo of the ocw in this tab


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

Branch: refs/heads/master
Commit: 8e150de857fb9c4ecb18ad569497a4f48643fd63
Parents: 4743021
Author: Omkar20895 
Authored: Thu Jan 28 23:51:24 2016 +0530
Committer: Omkar20895 
Committed: Thu Jan 28 23:51:24 2016 +0530

--
 ocw-ui/frontend/app/index.html  | 16 
 ocw-ui/frontend/app/scripts/app.js  |  4 
 ocw-ui/frontend/app/views/demo.html | 22 ++
 3 files changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/8e150de8/ocw-ui/frontend/app/index.html
--
diff --git a/ocw-ui/frontend/app/index.html b/ocw-ui/frontend/app/index.html
index 4d5996a..421c52d 100644
--- a/ocw-ui/frontend/app/index.html
+++ b/ocw-ui/frontend/app/index.html
@@ -143,5 +143,21 @@ under the License.
 
 
 
+
+
+
+  
+
+
+  Apache Open Climate Workbench Software . 
+  https://climate.apache.org/; target="_blank">About Us . 
https://issues.apache.org/jira/browse/CLIMATE/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel;
 target="_blank">Report an issue .
+  
+  Copyright © 2013 The Apache Software Foundation, Licensed under the 
+  
+  http://www.apache.org/licenses/LICENSE-2.0;>Apache License, 
Version 2.0.
+
+  
+
+  
   
 

http://git-wip-us.apache.org/repos/asf/climate/blob/8e150de8/ocw-ui/frontend/app/scripts/app.js
--
diff --git a/ocw-ui/frontend/app/scripts/app.js 
b/ocw-ui/frontend/app/scripts/app.js
index 8dca2dc..606d2cb 100644
--- a/ocw-ui/frontend/app/scripts/app.js
+++ b/ocw-ui/frontend/app/scripts/app.js
@@ -62,6 +62,10 @@ angular
   templateUrl: 'views/results.html',
   controller: 'ResultCtrl'
 })
+.state('demo', {
+  url: '/demo',
+  templateUrl: 'views/demo.html'
+})
 .state('results.list', {
   // parent: 'results',
   url: '',

http://git-wip-us.apache.org/repos/asf/climate/blob/8e150de8/ocw-ui/frontend/app/views/demo.html
--
diff --git a/ocw-ui/frontend/app/views/demo.html 
b/ocw-ui/frontend/app/views/demo.html
new file mode 100644
index 000..412a18c
--- /dev/null
+++ b/ocw-ui/frontend/app/views/demo.html
@@ -0,0 +1,22 @@
+
+
+  https://www.youtube.com/embed/wjUbifVeqa8?autoplay=0;>
+  
+

[2/2] climate git commit: CLIMATE-737 - Debugging dataset_processor.temporal_rebin

2016-01-30 Thread huikyole 
CLIMATE-737 - Debugging dataset_processor.temporal_rebin

- temporal_rebin's keyword, time_unit, is replaced by temporal_resolution.


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

Branch: refs/heads/master
Commit: adf9ccd35fc97c787332479f9b81d82db566b7c1
Parents: 44c189e 4e44df9
Author: huikyole 
Authored: Sat Jan 30 17:56:41 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 17:56:41 2016 -0800

--
 ocw/dataset_processor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[1/2] climate git commit: CLIMATE-737 - Debugging dataset_processor.temporal_rebin

2016-01-30 Thread huikyole 
Repository: climate
Updated Branches:
  refs/heads/master 44c189e85 -> adf9ccd35


CLIMATE-737 - Debugging dataset_processor.temporal_rebin

-temporal_rebin's keyword, time_unit, is replaced by temporal_resolution.


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

Branch: refs/heads/master
Commit: 4e44df9c706300b4c503f7647c7a74c522fc8c7d
Parents: 44c189e
Author: huikyole 
Authored: Sat Jan 30 17:54:16 2016 -0800
Committer: huikyole 
Committed: Sat Jan 30 17:54:16 2016 -0800

--
 ocw/dataset_processor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/4e44df9c/ocw/dataset_processor.py
--
diff --git a/ocw/dataset_processor.py b/ocw/dataset_processor.py
index fee61bf..8ee5962 100755
--- a/ocw/dataset_processor.py
+++ b/ocw/dataset_processor.py
@@ -104,7 +104,7 @@ def temporal_subset(month_start, month_end, target_dataset, 
average_each_year=Fa
 
 return new_dataset
 
-def temporal_rebin(target_dataset, time_unit): 
+def temporal_rebin(target_dataset, temporal_resolution): 
 """ Rebin a Dataset to a new temporal resolution
 
 :param target_dataset: Dataset object that needs temporal rebinned
@@ -119,7 +119,7 @@ def temporal_rebin(target_dataset, time_unit):
 # Decode the temporal resolution into a string format that 
 # _rcmes_calc_average_on_new_time_unit_K() can understand
 
-binned_values, binned_dates = 
_rcmes_calc_average_on_new_time_unit(target_dataset.values, 
target_dataset.times, time_unit)
+binned_values, binned_dates = 
_rcmes_calc_average_on_new_time_unit(target_dataset.values, 
target_dataset.times, temporal_resolution)
 binned_dates = np.array(binned_dates)
 new_dataset = ds.Dataset(target_dataset.lats, 
  target_dataset.lons,