[cmor] 12/22: Merge tag 'upstream/3.2.0' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Dec 20 11:10:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit af77ef3b03c86c3c553df2a5191b53fb6db6157d
Merge: d65060a 40e9913
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Nov 24 12:56:57 2016 +0000
Merge tag 'upstream/3.2.0' into debian/master
INSTALL | 4 +-
README.md | 4 +-
RELEASE-NOTES | 1 +
Src/cmor.c | 769 +-
Src/cmor_CV.c | 199 +-
Src/cmor_tables.c | 167 +-
Src/cmor_variables.c | 95 +-
Test/all_tests.py | 1 +
Test/{ipcc_test_code.json => baddirectory.json} | 38 +-
Test/climatology_test_code.f90 | 8 +-
Test/cmor_speed_and_compression.py | 5 +-
Test/cmor_speed_and_compression_01.py | 5 +-
Test/cmor_speed_and_compression_03.py | 5 +-
...{ipcc_test_code.json => common_user_input.json} | 36 +-
Test/ipcc_test_code.c | 2 +-
Test/ipcc_test_code.f90 | 2 +-
Test/ipcc_test_code.json | 4 +-
Test/jamie_hybrid_height.py | 2 +-
Test/jamie_positive.py | 2 +-
Test/karls_test.f90 | 2 +-
Test/main_prog.f90 | 2 +-
Test/mytest.f90 | 2 +-
Test/mytest_3d_i_2.f90 | 2 +-
Test/mytest_3d_r.f90 | 2 +-
Test/mytest_3d_r_2.f90 | 2 +-
Test/mytest_4d_d_big_array_2.f90 | 2 +-
Test/mytest_4d_d_big_array_3.f90 | 2 +-
Test/mytest_4d_d_big_array_4.f90 | 2 +-
Test/mytest_4d_d_big_array_5.f90 | 2 +-
Test/mytest_4d_r.f90 | 2 +-
Test/mytest_4d_r_big_array.f90 | 2 +-
Test/omonxyztst.f90 | 2 +-
Test/python_test_table_A | 34 +-
Test/rewrite_harvardf_data.f90 | 2 +-
Test/test1.f90 | 2 +-
Test/test2.f90 | 2 +-
Test/test3.f90 | 2 +-
Test/test4.f90 | 2 +-
Test/test_3h.f90 | 2 +-
Test/test_any_from_asc.f90 | 2 +-
Test/test_any_from_asc_d.f90 | 2 +-
Test/test_any_from_asc_i.f90 | 2 +-
Test/test_cmor_grid_alejandro.f90 | 2 +-
Test/test_cmor_grid_time_varying.f90 | 2 +-
Test/test_compression.py | 2 +-
Test/test_dimensionless.f90 | 2 +-
Test/test_doc.py | 2 +-
Test/test_fortran_example_00.f90 | 2 +-
Test/test_fortran_example_01.f90 | 2 +-
Test/test_grid.c | 2 +-
Test/test_lon_gt_360.py | 2 +-
Test/test_lon_thro_360.py | 2 +-
Test/test_lots_of_variables.c | 2 +-
Test/test_lots_of_variables.f90 | 2 +-
Test/test_python_1D_var.py | 2 +-
Test/test_python_2Gb_file.py | 2 +-
Test/test_python_2Gb_slice.py | 4 +-
Test/test_python_3hr.py | 2 +-
Test/test_python_CMIP6_CV_HISTORY.json | 2 +-
Test/test_python_CMIP6_CV_HISTORY.py | 6 +-
Test/test_python_CMIP6_CV_baddirectory.json | 4 +-
Test/test_python_CMIP6_CV_baddirectory.py | 7 +-
Test/test_python_CMIP6_CV_badgridgr.json | 2 +-
Test/test_python_CMIP6_CV_badgridgr.py | 9 +-
Test/test_python_CMIP6_CV_badgridlabel.json | 2 +-
Test/test_python_CMIP6_CV_badgridlabel.py | 8 +-
Test/test_python_CMIP6_CV_badgridresolution.json | 2 +-
Test/test_python_CMIP6_CV_badgridresolution.py | 4 +-
Test/test_python_CMIP6_CV_badgridresolution2.json | 2 +-
Test/test_python_CMIP6_CV_badgridresolution2.py | 9 +-
Test/test_python_CMIP6_CV_badinstitution.json | 4 +-
Test/test_python_CMIP6_CV_badinstitution.py | 22 +-
Test/test_python_CMIP6_CV_badinstitutionID.json | 4 +-
Test/test_python_CMIP6_CV_badinstitutionID.py | 9 +-
...est_python_CMIP6_CV_badinstitutionIDNotSet.json | 4 +-
.../test_python_CMIP6_CV_badinstitutionIDNotSet.py | 7 +-
Test/test_python_CMIP6_CV_badsource.json | 2 +-
Test/test_python_CMIP6_CV_badsource.py | 7 +-
Test/test_python_CMIP6_CV_badsourceid.py | 7 +-
Test/test_python_CMIP6_CV_badsourcetype.json | 4 +-
Test/test_python_CMIP6_CV_badsourcetype.py | 8 +-
.../test_python_CMIP6_CV_badsourcetypeCHEMAER.json | 4 +-
Test/test_python_CMIP6_CV_badsourcetypeCHEMAER.py | 9 +-
Test/test_python_CMIP6_CV_badsourcetypeCHMAER.json | 4 +-
...test_python_CMIP6_CV_badsourcetypeRequired.json | 7 +-
Test/test_python_CMIP6_CV_badsourcetypeRequired.py | 13 +-
Test/test_python_CMIP6_CV_badvariant.json | 2 +-
Test/test_python_CMIP6_CV_badvariant.py | 10 +-
Test/test_python_CMIP6_CV_externalvariables.json | 2 +-
Test/test_python_CMIP6_CV_externalvariables.py | 8 +-
Test/test_python_CMIP6_CV_furtherinfourl.json | 2 +-
Test/test_python_CMIP6_CV_furtherinfourl.py | 63 +-
Test/test_python_CMIP6_CV_fxtable.json | 2 +-
Test/test_python_CMIP6_CV_fxtable.py | 9 +-
.../test_python_CMIP6_CV_longrealizationindex.json | 2 +-
Test/test_python_CMIP6_CV_longrealizationindex.py | 11 +-
Test/test_python_CMIP6_CV_nomipera.json | 2 +-
Test/test_python_CMIP6_CV_nomipera.py | 8 +-
Test/test_python_CMIP6_CV_trackingNoprefix.json | 4 +-
Test/test_python_CMIP6_CV_trackingNoprefix.py | 7 +-
Test/test_python_CMIP6_CV_trackingprefix.json | 2 +-
Test/test_python_CMIP6_CV_trackingprefix.py | 63 +-
Test/test_python_CMIP6_driving.py | 2 +-
Test/test_python_CMIP6_experimentID.py | 3 +-
Test/test_python_CMIP6_wrong_activity.py | 3 +-
Test/test_python_YYYMMDDHH_exp_fmt.py | 2 +-
Test/test_python_alastair_1.py | 2 +-
Test/test_python_appending.py | 2 +-
Test/test_python_bounds_request.py | 2 +-
Test/test_python_cfmip_site_axis_test.py | 2 +-
Test/test_python_direct_calls.json | 20 +-
Test/test_python_direct_calls.py | 3 +-
Test/test_python_free_wrapping_issue.py | 2 +-
Test/test_python_grid_and_ocn_sigma.py | 2 +-
Test/test_python_jamie.py | 2 +-
Test/test_python_jamie_10.py | 2 +-
Test/test_python_jamie_12.py | 2 +-
Test/test_python_jamie_2.py | 2 +-
Test/test_python_jamie_3.py | 2 +-
Test/test_python_jamie_4.py | 2 +-
Test/test_python_jamie_6.py | 2 +-
Test/test_python_jamie_7.py | 2 +-
Test/test_python_jamie_8.py | 4 +-
Test/test_python_jamie_9.py | 2 +-
Test/test_python_joerg_1.py | 2 +-
Test/test_python_joerg_10.py | 2 +-
Test/test_python_joerg_11.py | 2 +-
Test/test_python_joerg_12.py | 2 +-
Test/test_python_joerg_2.py | 2 +-
Test/test_python_joerg_3.py | 4 +-
Test/test_python_joerg_4.py | 2 +-
Test/test_python_joerg_5.py | 2 +-
Test/test_python_joerg_6.py | 2 +-
Test/test_python_joerg_7.py | 2 +-
Test/test_python_joerg_8.py | 2 +-
Test/test_python_joerg_tim2_clim_02.py | 4 +-
Test/test_python_max_variables.py | 2 +-
Test/test_python_max_variables_2.py | 2 +-
Test/test_python_memory_check.py | 2 +-
Test/test_python_new_tables.py | 2 +-
Test/test_python_obs4MIPs.py | 4 +-
Test/test_python_open_close_cmor_multiple.py | 2 +-
Test/test_python_polar_stereo.py | 2 +-
Test/test_python_region.py | 2 +-
Test/test_python_reverted_lats.py | 2 +-
Test/test_python_singleton_string.py | 2 +-
Test/test_python_user_interface_00.py | 3 +-
Test/test_python_user_interface_01.py | 2 +-
Test/test_python_user_interface_03.py | 5 +-
Test/test_region.f90 | 2 +-
Test/test_shrt_exp_nm_set_att_initi.f90 | 2 +-
Test/test_sigma.f90 | 2 +-
Test/test_singleton.f90 | 2 +-
Test/test_singleton_5D_tas.f90 | 2 +-
Test/test_site_ts.py | 2 +-
Test/test_sophie.f90 | 2 +-
Test/test_station_data.f90 | 2 +-
TestTables/CMIP6_3hr.json | 2737 +------
TestTables/CMIP6_6hrLev.json | 2553 +-----
TestTables/CMIP6_6hrPlev.json | 2733 +------
TestTables/CMIP6_6hrPlevpt.json | 2896 +------
TestTables/CMIP6_Amon.json | 3515 ++------
TestTables/CMIP6_AmonAdj.json | 2493 +-----
TestTables/CMIP6_Amon_json_hfls | 898 +-
TestTables/CMIP6_CV.json | 8556 ++++++++++++++------
TestTables/CMIP6_LIfxant.json | 2513 +-----
TestTables/CMIP6_LIfxgre.json | 2491 +-----
TestTables/CMIP6_LImon.json | 3005 +------
TestTables/CMIP6_LImonant.json | 2863 +------
TestTables/CMIP6_LImongre.json | 2875 +------
TestTables/CMIP6_LIyrant.json | 2896 +------
TestTables/CMIP6_LIyrgre.json | 2908 +------
TestTables/CMIP6_Lmon.json | 3261 +-------
TestTables/CMIP6_Oclim.json | 2861 +------
TestTables/CMIP6_Oday.json | 2523 +-----
TestTables/CMIP6_Ofx.json | 2523 +-----
TestTables/CMIP6_Omon.json | 6219 +++++---------
TestTables/CMIP6_Omonbad.json | 2 +-
TestTables/CMIP6_Oyr.json | 3835 ++-------
TestTables/CMIP6_SIday.json | 2502 +-----
TestTables/CMIP6_SImon.json | 3776 ++-------
TestTables/CMIP6_aerdaily.json | 2673 +-----
TestTables/CMIP6_aerfixed.json | 2477 +-----
TestTables/CMIP6_aerhourly.json | 2481 +-----
TestTables/CMIP6_aermonthly.json | 4413 ++--------
TestTables/CMIP6_aero.json | 1 -
TestTables/CMIP6_cf3hr.json | 750 +-
TestTables/CMIP6_cf3hr_0.json | 2 +-
TestTables/CMIP6_cf3hr_1.json | 2 +-
TestTables/CMIP6_cf3hr_2.json | 2 +-
TestTables/CMIP6_cfDay.json | 3014 +------
TestTables/CMIP6_cfMon.json | 3695 ++-------
TestTables/CMIP6_cfOff.json | 172 +-
TestTables/CMIP6_cfSites.json | 3009 +------
.../{CMIP6_emDaypt.json => CMIP6_coordinate.json} | 218 +-
TestTables/CMIP6_day.json | 3030 +------
TestTables/CMIP6_em1hr.json | 2687 +-----
TestTables/CMIP6_em1hrclimmon.json | 104 +-
TestTables/CMIP6_em3hr.json | 3080 ++-----
TestTables/CMIP6_em3hrpt.json | 2684 +-----
TestTables/CMIP6_emDay.json | 4270 +++-------
TestTables/CMIP6_emDayZ.json | 2608 +-----
TestTables/CMIP6_emDaypt.json | 2491 +-----
TestTables/CMIP6_emFx.json | 2599 +-----
TestTables/CMIP6_emMon.json | 8446 ++++++++-----------
TestTables/CMIP6_emMonZ.json | 2946 +------
TestTables/CMIP6_emMonpt.json | 36 +-
TestTables/CMIP6_emSubhr.json | 2949 +------
TestTables/CMIP6_emYr.json | 2667 +-----
TestTables/CMIP6_formula_terms.json | 142 +
TestTables/CMIP6_fx.json | 2581 +-----
TestTables/CMIP6_grids.json | 4 +-
configure | 18 +-
configure.ac | 2 +-
include/cmor.h | 27 +-
include/cmor_func_def.h | 4 +-
scripts/Pre-PARE.py | 275 +
scripts/createCMIP6CV.py | 17 +-
setup.py.in | 37 +-
219 files changed, 23517 insertions(+), 118503 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list