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 2018/01/22 14:32:48 UTC
[2/3] climate git commit: Merge branch 'master' into CLIMATE-942
Merge branch 'master' into CLIMATE-942
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/1131112a
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/1131112a
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/1131112a
Branch: refs/heads/master
Commit: 1131112acae979cb5d0c58bd6942fe7380179a0e
Parents: fd9ad3d 1373563
Author: MichaelArthurAnderson <mi...@gmail.com>
Authored: Tue Jan 16 21:43:59 2018 -0500
Committer: GitHub <no...@github.com>
Committed: Tue Jan 16 21:43:59 2018 -0500
----------------------------------------------------------------------
docs/source/conf.py | 9 +
docs/source/index.rst | 1 +
docs/source/ocw/statistical_downscaling.rst | 8 +
examples/GPM_WRF24_JPDF_comparison.py | 26 +++
examples/draw_climatology_map_MISR_AOD.py | 26 +++
examples/esgf_integration_example.py | 15 ++
examples/knmi_to_cru31_full_bias.py | 32 ++++
examples/model_ensemble_to_rcmed.py | 32 ++++
examples/multi_model_evaluation.py | 36 ++++
examples/multi_model_taylor_diagram.py | 51 ++++++
examples/podaac_integration_example.py | 21 +++
examples/simple_model_to_model_bias.py | 29 ++++
examples/simple_model_tstd.py | 24 +++
examples/subregions_portrait_diagram.py | 144 +++++++++++-----
examples/subregions_rectangular_boundaries.py | 73 +++++---
examples/subset_TRMM_data_for_NCA_regions.py | 25 ++-
examples/taylor_diagram_example.py | 31 ++++
examples/temperature_trends_over_CONUS.py | 71 +++++---
examples/time_series_with_regions.py | 172 ++++++++++++-------
ocw-ui/backend/processing.py | 12 +-
ocw-ui/backend/rcmed_helpers.py | 71 ++++----
ocw-ui/backend/run_webservices.py | 37 +++-
.../app/scripts/controllers/parameterselect.js | 13 +-
.../app/scripts/controllers/rcmedselection.js | 4 +-
.../directives/predictivefilebrowserinput.js | 25 ++-
.../app/scripts/services/evaluationsettings.js | 2 +-
ocw-ui/frontend/package.json | 22 ++-
ocw-ui/frontend/test/karma.conf.js | 43 ++++-
.../test/spec/controllers/rcmedselection.js | 8 +-
ocw/dataset.py | 3 +-
ocw/dataset_loader.py | 17 +-
ocw/dataset_processor.py | 10 +-
ocw/plotter.py | 81 +++++++--
ocw/statistical_downscaling.py | 51 ++++--
ocw/utils.py | 16 +-
35 files changed, 958 insertions(+), 283 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/1131112a/ocw-ui/backend/processing.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/1131112a/ocw-ui/frontend/app/scripts/controllers/parameterselect.js
----------------------------------------------------------------------
diff --cc ocw-ui/frontend/app/scripts/controllers/parameterselect.js
index 6514203,a2554f4..12bd65b
--- a/ocw-ui/frontend/app/scripts/controllers/parameterselect.js
+++ b/ocw-ui/frontend/app/scripts/controllers/parameterselect.js
@@@ -27,9 -27,9 +27,10 @@@
* Controller of the ocwUiApp
*/
angular.module('ocwUiApp')
- .controller('ParameterSelectCtrl', ['$rootScope', '$scope', '$http', '$timeout',
+ .controller('ParameterSelectCtrl', ['$rootScope', '$scope', '$http', '$timeout', '$location',
'selectedDatasetInformation', 'regionSelectParams', 'evaluationSettings',
- function($rootScope, $scope, $http, $timeout, selectedDatasetInformation, regionSelectParams, evaluationSettings) {
+ function($rootScope, $scope, $http, $timeout, $location, selectedDatasetInformation, regionSelectParams, evaluationSettings) {
++
$scope.datasets = selectedDatasetInformation.getDatasets();
// The min/max lat/lon values from the selected datasets