Merge branch 'master' into mccsearch
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8fcd2a20 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8fcd2a20 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8fcd2a20 Branch: refs/heads/master Commit: 8fcd2a20eb12db233e81622f7c0771aad637f3e0 Parents: 587b203 7a0a7e2 Author: Lewis John McGibbney <[email protected]> Authored: Fri Oct 10 18:57:17 2014 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Fri Oct 10 18:57:17 2014 -0700 ---------------------------------------------------------------------- .gitignore | 13 + CHANGES.txt | 191 + DISCLAIMER.txt | 15 - KEYS | 106 + NOTICE.txt | 6 + README.md | 23 + doap_CLIMATE.rdf | 72 + docs/source/ocw/metrics.rst | 15 + easy-ocw/bootstrap.py | 262 - easy-ocw/buildout.cfg | 377 - easy-ocw/etc/dependencies.cfg | 84 - easy-ocw/install-osx.sh | 220 + easy-ocw/install-ubuntu-12_04.sh | 189 + easy-ocw/install.sh | 198 - easy-ocw/ocw-conda-dependencies.txt | 22 + easy-ocw/ocw-pip-dependencies.txt | 9 + examples/knmi_to_cru31_full_bias.py | 27 +- examples/simple_model_to_model_bias.py | 33 +- examples/simple_model_tstd.py | 89 + examples/taylor_diagram_example.py | 113 + obs4MIPs/INSTALLATION | 3 + obs4MIPs/README | 2 + obs4MIPs/Toolbox/ESGFexcel.py | 125 + .../examples/ECMWF/ecmwf_table_obs4MIPs.xls | Bin 10752 -> 55296 bytes obs4MIPs/obs4MIPs_process.py | 29 +- ocw-cli/ocw_cli.py | 848 + ocw-ui/backend/processing.py | 24 +- ocw-ui/backend/run_webservices.py | 30 +- ocw-ui/backend/tests/__init__.py | 8 +- ocw-ui/backend/tests/test_directory_helpers.py | 41 +- .../test_local_file_metadata_extractors.py | 8 +- ocw-ui/frontend/.bowerrc | 3 + ocw-ui/frontend/.editorconfig | 21 + ocw-ui/frontend/.gitattributes | 1 + ocw-ui/frontend/.gitignore | 5 + ocw-ui/frontend/.jshintrc | 24 + ocw-ui/frontend/.travis.yml | 6 + ocw-ui/frontend/Gruntfile.js | 412 + ocw-ui/frontend/app/.buildignore | 1 + ocw-ui/frontend/app/.htaccess | 543 + ocw-ui/frontend/app/404.html | 175 + ocw-ui/frontend/app/css/app.css | 108 - .../app/css/lib/bootstrap-responsive.min.css | 9 - ocw-ui/frontend/app/css/lib/bootstrap.min.css | 9 - .../frontend/app/css/lib/font-awesome.min.css | 403 - ocw-ui/frontend/app/css/lib/timeline.css | 169 - ocw-ui/frontend/app/favicon.ico | Bin 0 -> 4286 bytes ocw-ui/frontend/app/font/FontAwesome.otf | Bin 61896 -> 0 bytes .../frontend/app/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../frontend/app/font/fontawesome-webfont.svg | 399 - .../frontend/app/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../frontend/app/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes ocw-ui/frontend/app/img/globe.png | Bin 25857 -> 0 bytes .../app/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../frontend/app/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes ocw-ui/frontend/app/index.html | 244 +- ocw-ui/frontend/app/js/app.js | 91 - .../app/js/controllers/DatasetDisplayCtrl.js | 34 - .../app/js/controllers/DatasetSelectCtrl.js | 55 - .../app/js/controllers/ObservationSelectCtrl.js | 194 - .../app/js/controllers/ParameterSelectCtrl.js | 296 - .../app/js/controllers/RcmedSelectionCtrl.js | 133 - .../frontend/app/js/controllers/ResultCtrl.js | 38 - .../app/js/controllers/ResultDetailCtrl.js | 38 - .../frontend/app/js/controllers/SettingsCtrl.js | 24 - .../frontend/app/js/controllers/TimelineCtrl.js | 92 - .../frontend/app/js/controllers/WorldMapCtrl.js | 95 - .../app/js/directives/BootstrapModal.js | 71 - .../app/js/directives/BootstrapModalOpen.js | 39 - ocw-ui/frontend/app/js/directives/LeafletMap.js | 38 - ocw-ui/frontend/app/js/directives/OnBlur.js | 36 - .../js/directives/PredictiveFileBrowserInput.js | 308 - ocw-ui/frontend/app/js/directives/PreviewMap.js | 68 - ocw-ui/frontend/app/js/directives/Timeline.js | 44 - .../app/js/filters/ISODateToMiddleEndian.js | 48 - .../js/lib/angular-ui/angular-ui-0.4-tpls.js | 2 - .../js/lib/angular-ui/angular-ui-router.min.js | 7 - .../angular-ui/ui-bootstrap-tpls-0.5.0.min.js | 2 - .../app/js/lib/angular/angular-cookies.js | 183 - .../app/js/lib/angular/angular-cookies.min.js | 7 - .../app/js/lib/angular/angular-loader.js | 276 - .../app/js/lib/angular/angular-loader.min.js | 7 - .../app/js/lib/angular/angular-resource.js | 445 - .../app/js/lib/angular/angular-resource.min.js | 10 - .../app/js/lib/angular/angular-sanitize.js | 535 - .../app/js/lib/angular/angular-sanitize.min.js | 13 - ocw-ui/frontend/app/js/lib/angular/angular.js | 14733 --------- .../frontend/app/js/lib/angular/angular.min.js | 161 - ocw-ui/frontend/app/js/lib/angular/version.txt | 1 - .../frontend/app/js/lib/bootstrap/bootstrap.js | 2276 -- .../app/js/lib/bootstrap/bootstrap.min.js | 6 - .../frontend/app/js/lib/jquery/jquery-1.10.1.js | 9807 ------ .../jquery/jquery-ui/datepicker-wrapper/date.js | 125 - .../jquery/jquery-ui/jquery-ui-1.10.3.min.js | 12 - .../frontend/app/js/lib/leaflet/leaflet-0.5.js | 8 - .../app/js/lib/timeline/timeline-locales.js | 101 - .../app/js/lib/timeline/timeline-min.js | 199 - ocw-ui/frontend/app/js/lib/timeline/timeline.js | 6381 ---- .../app/js/services/EvaluationSettings.js | 47 - .../app/js/services/RegionSelectParams.js | 37 - .../js/services/SelectedDatasetInformation.js | 49 - ocw-ui/frontend/app/partials/main.html | 243 - ocw-ui/frontend/app/partials/modelSelect.html | 86 - .../frontend/app/partials/results.detail.html | 11 - ocw-ui/frontend/app/partials/results.html | 15 - ocw-ui/frontend/app/partials/results.list.html | 3 - .../app/partials/selectObservation.html | 58 - ocw-ui/frontend/app/partials/selectRcmed.html | 44 - ocw-ui/frontend/app/robots.txt | 3 + ocw-ui/frontend/app/scripts/app.js | 96 + .../app/scripts/controllers/datasetdisplay.js | 43 + .../app/scripts/controllers/datasetselect.js | 64 + ocw-ui/frontend/app/scripts/controllers/main.js | 36 + .../scripts/controllers/observationselect.js | 203 + .../app/scripts/controllers/parameterselect.js | 275 + .../app/scripts/controllers/rcmedselection.js | 144 + .../frontend/app/scripts/controllers/result.js | 47 + .../app/scripts/controllers/resultdetail.js | 46 + .../app/scripts/controllers/settings.js | 34 + .../app/scripts/controllers/timeline.js | 103 + .../app/scripts/controllers/worldmap.js | 104 + .../app/scripts/directives/bootstrapmodal.js | 79 + .../scripts/directives/bootstrapmodalopen.js | 43 + .../app/scripts/directives/leafletmap.js | 46 + .../frontend/app/scripts/directives/onblur.js | 38 + .../directives/predictivefilebrowserinput.js | 316 + .../app/scripts/directives/previewmap.js | 76 + .../frontend/app/scripts/directives/timeline.js | 54 + .../scripts/filters/isodatetomiddleendian.js | 55 + .../app/scripts/services/evaluationsettings.js | 56 + .../app/scripts/services/regionselectparams.js | 46 + .../services/selecteddatasetinformation.js | 57 + ocw-ui/frontend/app/styles/main.css | 129 + ocw-ui/frontend/app/views/main.html | 270 + ocw-ui/frontend/app/views/modelselect.html | 87 + ocw-ui/frontend/app/views/results.html | 34 + ocw-ui/frontend/app/views/resultsdetail.html | 30 + ocw-ui/frontend/app/views/resultslist.html | 21 + .../frontend/app/views/selectobservation.html | 80 + ocw-ui/frontend/app/views/selectrcmed.html | 40 + ocw-ui/frontend/bower.json | 25 + ocw-ui/frontend/config/karma-e2e.conf.js | 40 - ocw-ui/frontend/config/karma.conf.js | 48 - ocw-ui/frontend/package.json | 45 + ocw-ui/frontend/scripts/e2e-test.sh | 27 - ocw-ui/frontend/scripts/test.sh | 27 - ocw-ui/frontend/scripts/web-server.js | 313 - ocw-ui/frontend/test/.jshintrc | 36 + ocw-ui/frontend/test/e2e/runner.html | 28 - ocw-ui/frontend/test/e2e/scenarios.js | 63 - ocw-ui/frontend/test/karma.conf.js | 86 + .../frontend/test/lib/angular/angular-mocks.js | 1764 -- .../test/lib/angular/angular-scenario.js | 26195 ----------------- ocw-ui/frontend/test/lib/angular/version.txt | 1 - .../test/spec/controllers/datasetdisplay.js | 59 + .../test/spec/controllers/datasetselect.js | 54 + ocw-ui/frontend/test/spec/controllers/main.js | 41 + .../test/spec/controllers/observationselect.js | 122 + .../test/spec/controllers/parameterselect.js | 136 + .../test/spec/controllers/rcmedselection.js | 145 + ocw-ui/frontend/test/spec/controllers/result.js | 37 + .../test/spec/controllers/resultdetail.js | 37 + .../frontend/test/spec/controllers/settings.js | 37 + .../frontend/test/spec/controllers/timeline.js | 37 + .../frontend/test/spec/controllers/worldmap.js | 57 + .../test/spec/directives/bootstrapmodal.js | 33 + .../test/spec/directives/bootstrapmodalopen.js | 33 + .../frontend/test/spec/directives/leafletmap.js | 33 + ocw-ui/frontend/test/spec/directives/onblur.js | 50 + .../directives/predictivefilebrowserinput.js | 33 + .../frontend/test/spec/directives/previewmap.js | 53 + .../frontend/test/spec/directives/timeline.js | 33 + .../test/spec/filters/isodatetomiddleendian.js | 76 + .../test/spec/services/evaluationsettings.js | 44 + .../test/spec/services/regionselectparams.js | 44 + .../spec/services/selecteddatasetinformation.js | 92 + .../unit/controllers/DatasetDisplayCtrlTest.js | 65 - .../unit/controllers/DatasetSelectCtrlTest.js | 51 - .../controllers/ObservationSelectCtrlTest.js | 151 - .../unit/controllers/ParameterSelectCtrlTest.js | 269 - .../unit/controllers/RcmedSelectionCtrlTest.js | 161 - .../test/unit/controllers/SettingsCtrlTest.js | 47 - .../test/unit/controllers/WorldMapCtrlTest.js | 48 - .../test/unit/directives/BootstrapModalTest.js | 41 - .../frontend/test/unit/directives/OnBlurTest.js | 42 - .../test/unit/directives/PreviewMapTest.js | 46 - .../unit/filters/ISODateToMiddleEndianTest.js | 67 - .../unit/services/EvaluationSettingsTest.js | 40 - .../unit/services/RegionSelectParamsTest.js | 41 - .../services/SelectedDatasetInfomationTest.js | 90 - ocw-vm/Vagrantfile | 17 + ocw-vm/init-ocw-vm.sh | 103 + ocw/data_source/local.py | 116 +- ocw/data_source/rcmed.py | 6 +- ocw/dataset.py | 41 + ocw/dataset_processor.py | 81 +- ocw/evaluation.py | 17 + ocw/metrics.py | 82 +- ocw/plotter.py | 311 +- ocw/tests/__init__.py | 0 ocw/tests/test_dap.py | 6 +- ocw/tests/test_metrics.py | 101 +- ocw/tests/test_utils.py | 61 +- ocw/utils.py | 107 +- rcmet/src/main/vm/build/Vagrantfile | 110 - .../main/vm/src/cookbooks/apache2/README.rdoc | 78 - .../src/cookbooks/apache2/attributes/default.rb | 77 - .../apache2/definitions/apache_conf.rb | 25 - .../apache2/definitions/apache_module.rb | 43 - .../apache2/definitions/apache_site.rb | 40 - .../cookbooks/apache2/definitions/web_app.rb | 49 - .../default/apache2_module_conf_generate.pl | 41 - .../main/vm/src/cookbooks/apache2/metadata.json | 497 - .../main/vm/src/cookbooks/apache2/metadata.rb | 197 - .../vm/src/cookbooks/apache2/recipes/default.rb | 191 - .../cookbooks/apache2/recipes/god_monitor.rb | 33 - .../src/cookbooks/apache2/recipes/mod_alias.rb | 22 - .../cookbooks/apache2/recipes/mod_auth_basic.rb | 20 - .../apache2/recipes/mod_auth_digest.rb | 20 - .../apache2/recipes/mod_auth_openid.rb | 59 - .../cookbooks/apache2/recipes/mod_authn_file.rb | 20 - .../apache2/recipes/mod_authnz_ldap.rb | 20 - .../apache2/recipes/mod_authz_default.rb | 20 - .../apache2/recipes/mod_authz_groupfile.rb | 20 - .../cookbooks/apache2/recipes/mod_authz_host.rb | 20 - .../cookbooks/apache2/recipes/mod_authz_user.rb | 20 - .../cookbooks/apache2/recipes/mod_autoindex.rb | 22 - .../vm/src/cookbooks/apache2/recipes/mod_cgi.rb | 20 - .../vm/src/cookbooks/apache2/recipes/mod_dav.rb | 20 - .../cookbooks/apache2/recipes/mod_dav_svn.rb | 22 - .../cookbooks/apache2/recipes/mod_deflate.rb | 22 - .../vm/src/cookbooks/apache2/recipes/mod_dir.rb | 22 - .../vm/src/cookbooks/apache2/recipes/mod_env.rb | 20 - .../cookbooks/apache2/recipes/mod_expires.rb | 20 - .../src/cookbooks/apache2/recipes/mod_fcgid.rb | 46 - .../cookbooks/apache2/recipes/mod_headers.rb | 20 - .../src/cookbooks/apache2/recipes/mod_ldap.rb | 20 - .../cookbooks/apache2/recipes/mod_log_config.rb | 24 - .../src/cookbooks/apache2/recipes/mod_mime.rb | 22 - .../apache2/recipes/mod_negotiation.rb | 22 - .../src/cookbooks/apache2/recipes/mod_php5.rb | 32 - .../src/cookbooks/apache2/recipes/mod_proxy.rb | 22 - .../cookbooks/apache2/recipes/mod_proxy_ajp.rb | 20 - .../apache2/recipes/mod_proxy_balancer.rb | 20 - .../apache2/recipes/mod_proxy_connect.rb | 20 - .../cookbooks/apache2/recipes/mod_proxy_http.rb | 20 - .../src/cookbooks/apache2/recipes/mod_python.rb | 22 - .../cookbooks/apache2/recipes/mod_rewrite.rb | 20 - .../cookbooks/apache2/recipes/mod_setenvif.rb | 22 - .../vm/src/cookbooks/apache2/recipes/mod_ssl.rb | 42 - .../src/cookbooks/apache2/recipes/mod_status.rb | 22 - .../src/cookbooks/apache2/recipes/mod_wsgi.rb | 27 - .../apache2/templates/default/a2dismod.erb | 22 - .../apache2/templates/default/a2dissite.erb | 29 - .../apache2/templates/default/a2enmod.erb | 37 - .../apache2/templates/default/a2ensite.erb | 38 - .../apache2/templates/default/apache2.conf.erb | 230 - .../apache2/templates/default/apache2.god.erb | 19 - .../apache2/templates/default/charset.erb | 6 - .../apache2/templates/default/default-site.erb | 57 - .../templates/default/mod_auth_openid.rb.erb | 12 - .../apache2/templates/default/mods/README | 2 - .../templates/default/mods/alias.conf.erb | 24 - .../templates/default/mods/authopenid.load.erb | 1 - .../templates/default/mods/autoindex.conf.erb | 101 - .../templates/default/mods/deflate.conf.erb | 16 - .../apache2/templates/default/mods/dir.conf.erb | 5 - .../templates/default/mods/fcgid.conf.erb | 10 - .../templates/default/mods/mime.conf.erb | 191 - .../templates/default/mods/negotiation.conf.erb | 18 - .../templates/default/mods/proxy.conf.erb | 19 - .../templates/default/mods/setenvif.conf.erb | 28 - .../apache2/templates/default/mods/ssl.conf.erb | 72 - .../templates/default/mods/status.conf.erb | 16 - .../apache2/templates/default/port_apache.erb | 2 - .../apache2/templates/default/ports.conf.erb | 6 - .../apache2/templates/default/security.erb | 50 - .../apache2/templates/default/web_app.conf.erb | 43 - .../src/cookbooks/apt/files/default/apt-cacher | 9 - .../cookbooks/apt/files/default/apt-cacher.conf | 144 - .../apt/files/default/apt-proxy-v2.conf | 50 - .../src/main/vm/src/cookbooks/apt/metadata.json | 37 - rcmet/src/main/vm/src/cookbooks/apt/metadata.rb | 11 - .../main/vm/src/cookbooks/apt/recipes/cacher.rb | 42 - .../vm/src/cookbooks/apt/recipes/default.rb | 33 - .../main/vm/src/cookbooks/apt/recipes/proxy.rb | 34 - .../src/cookbooks/build-essential/CHANGELOG.md | 15 - .../src/cookbooks/build-essential/CONTRIBUTING | 29 - .../vm/src/cookbooks/build-essential/LICENSE | 201 - .../vm/src/cookbooks/build-essential/README.md | 124 - .../build-essential/attributes/default.rb | 33 - .../src/cookbooks/build-essential/metadata.json | 37 - .../src/cookbooks/build-essential/metadata.rb | 12 - .../build-essential/recipes/default.rb | 79 - .../main/vm/src/cookbooks/python/CHANGELOG.md | 21 - .../main/vm/src/cookbooks/python/CONTRIBUTING | 29 - rcmet/src/main/vm/src/cookbooks/python/LICENSE | 201 - .../src/main/vm/src/cookbooks/python/README.md | 176 - .../src/cookbooks/python/attributes/default.rb | 42 - .../main/vm/src/cookbooks/python/metadata.json | 42 - .../main/vm/src/cookbooks/python/metadata.rb | 18 - .../vm/src/cookbooks/python/providers/pip.rb | 167 - .../cookbooks/python/providers/virtualenv.rb | 68 - .../vm/src/cookbooks/python/recipes/default.rb | 23 - .../vm/src/cookbooks/python/recipes/package.rb | 58 - .../main/vm/src/cookbooks/python/recipes/pip.rb | 41 - .../vm/src/cookbooks/python/recipes/source.rb | 52 - .../src/cookbooks/python/recipes/virtualenv.rb | 25 - .../vm/src/cookbooks/python/resources/pip.rb | 27 - .../cookbooks/python/resources/virtualenv.rb | 27 - .../cookbooks/vagrant_main/recipes/default.rb | 56 - .../templates/default/project.conf.erb | 3 - .../templates/default/rcmet.conf.erb | 3 - .../main/vm/src/scripts/ncl/wget-download.sh | 263 - rcmet/src/main/webapp/.htaccess | 45 - .../webapp/classes/RCMETWizardTask.class.php | 125 - .../main/webapp/classes/WizardTask.class.php | 55 - rcmet/src/main/webapp/config.ini | 66 - rcmet/src/main/webapp/hooks.php | 83 - rcmet/src/main/webapp/index.php | 48 - rcmet/src/main/webapp/scripts/dirlist.php | 25 - rcmet/src/main/webapp/scripts/plotView.php | 13 - rcmet/src/main/webapp/scripts/plots.php | 35 - rcmet/src/main/webapp/scripts/rcmed.php | 23 - .../bootstrap/css/bootstrap-responsive.css | 1040 - .../bootstrap/css/bootstrap-responsive.min.css | 9 - .../webapp/static/bootstrap/css/bootstrap.css | 5624 ---- .../static/bootstrap/css/bootstrap.min.css | 9 - .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../bootstrap/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes .../webapp/static/bootstrap/js/bootstrap.js | 2027 -- .../webapp/static/bootstrap/js/bootstrap.min.js | 6 - .../main/webapp/static/css/balance/balance.css | 16 - .../main/webapp/static/css/blueprint/LICENSE | 22 - .../src/main/webapp/static/css/blueprint/ie.css | 29 - .../main/webapp/static/css/blueprint/print.css | 23 - .../main/webapp/static/css/blueprint/screen.css | 252 - .../static/css/jquery-ui-1.7.1.custom.css | 404 - rcmet/src/main/webapp/static/css/site.css | 19 - rcmet/src/main/webapp/static/css/style.css | 102 - .../src/main/webapp/static/img/hexabump-bg.png | Bin 218 -> 0 bytes rcmet/src/main/webapp/static/img/rcmes-logo.png | Bin 36578 -> 0 bytes rcmet/src/main/webapp/static/img/wrm-badge.png | Bin 36578 -> 0 bytes .../main/webapp/static/js/jquery-1.4.2.min.js | 154 - .../main/webapp/static/js/jquery-1.8.0.min.js | 2 - .../static/js/jquery-ui-1.7.1.custom.min.js | 298 - rcmet/src/main/webapp/views/common/footer.php | 17 - rcmet/src/main/webapp/views/common/header.php | 35 - rcmet/src/main/webapp/views/errors/404.php | 5 - rcmet/src/main/webapp/views/index.php | 42 - rcmet/src/main/webapp/views/wizard/help.php | 17 - rcmet/src/main/webapp/views/wizard/init.php | 32 - rcmet/src/main/webapp/views/wizard/step.php | 26 - .../webapp/views/wizard/steps/generatePlots.php | 125 - .../views/wizard/steps/selectLatLonVars.php | 63 - .../views/wizard/steps/selectMetricOptions.php | 49 - .../views/wizard/steps/selectModelFiles.php | 75 - .../views/wizard/steps/selectModelVar.php | 53 - .../wizard/steps/selectObservationalData.php | 86 - .../views/wizard/steps/selectOptionalTasks.php | 45 - .../views/wizard/steps/selectPlotOptions.php | 42 - .../webapp/views/wizard/steps/selectRegrid.php | 58 - .../views/wizard/steps/selectTimeRange.php | 83 - .../views/wizard/steps/selectTimeVars.php | 52 - 364 files changed, 8504 insertions(+), 86767 deletions(-) ----------------------------------------------------------------------
