[cmor] 01/02: Merge tag 'upstream/3.2.3' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed May 3 14:22:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit 009842033a5276454c6f60e759258d0ab48dd302
Merge: bc94425 8220f2e
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Apr 20 11:38:32 2017 +0100
Merge tag 'upstream/3.2.3' into debian/master
INSTALL | 4 +-
Lib/pywrapper.py | 6 +-
{scripts => LibCV/PrePARE}/PrePARE.py | 76 +-
LibCV/PrePARE/__init__.py | 1 +
LibCV/__init__.py | 2 +-
LibCV/cmor_const.py | 1 +
LibCV/pywrapper.py | 56 +-
Makefile.in | 201 +-
README.md | 7 +-
RELEASE-NOTES | 1 +
Src/_cmormodule.c | 41 +-
Src/_controlvocabulary.c | 93 +-
Src/cmor.c | 847 +-
Src/cmor_CV.c | 1167 ++-
Src/cmor_axes.c | 8 +-
Src/cmor_grids.c | 457 +-
Src/cmor_tables.c | 97 +-
Src/cmor_variables.c | 113 +-
Test/_cmor_stub.py | 2 +
Test/all_tests.py | 1 +
Test/check_results.py | 58 +-
Test/cmor_speed_and_compression.py | 197 +-
Test/cmor_speed_and_compression_01.py | 86 +-
Test/cmor_speed_and_compression_02.py | 259 +-
Test/cmor_speed_and_compression_03.py | 163 +-
Test/common_user_input.json | 24 +-
...mon_user_input.json => common_user_input2.json} | 4 +-
...r_input.json => common_user_inputNOBOUNDS.json} | 4 +-
...user_input.json => common_user_input_NOID.json} | 6 +-
...on_user_input.json => common_user_input_a.json} | 4 +-
Test/common_user_input_b.json | 73 +
Test/in_files.py | 56 +-
Test/jamie_hybrid_height.py | 59 +-
Test/jamie_positive.py | 46 +-
Test/nc2asc.py | 89 +-
Test/out_files.py | 180 +-
Test/speed_test_table_A | 5 +-
Test/test_checker_works.py | 2723 +++--
Test/test_chunking.py | 64 +
Test/test_compression.py | 61 +-
Test/test_dimensionless.f90 | 4 +-
Test/test_doc.py | 40 +-
Test/test_grid_stub_jamie.py | 143 +-
Test/test_lon_gt_360.py | 54 +-
Test/test_lon_thro_360.py | 64 +-
Test/test_non_monotonic_climo_bonds_ok.py | 62 +-
Test/test_python_1D_var.py | 14 +-
Test/test_python_2Gb_file.py | 81 +-
Test/test_python_2Gb_slice.py | 59 +-
Test/test_python_3hr.py | 37 -
Test/test_python_CMIP6_CV_HISTORY.py | 6 +-
Test/test_python_CMIP6_CV_baddirectory.py | 6 +-
Test/test_python_CMIP6_CV_badgridgr.py | 10 +-
Test/test_python_CMIP6_CV_badgridlabel.py | 13 +-
Test/test_python_CMIP6_CV_badgridresolution.py | 11 +-
Test/test_python_CMIP6_CV_badgridresolution2.py | 98 -
Test/test_python_CMIP6_CV_badinstitution.py | 14 +-
Test/test_python_CMIP6_CV_badinstitutionID.json | 2 +-
Test/test_python_CMIP6_CV_badinstitutionID.py | 28 +-
.../test_python_CMIP6_CV_badinstitutionIDNotSet.py | 22 +-
Test/test_python_CMIP6_CV_badsource.py | 20 +-
Test/test_python_CMIP6_CV_badsourceid.py | 17 +-
Test/test_python_CMIP6_CV_badsourcetype.py | 26 +-
.../test_python_CMIP6_CV_badsourcetypeCHEMAER.json | 9 +-
Test/test_python_CMIP6_CV_badsourcetypeCHEMAER.py | 28 +-
Test/test_python_CMIP6_CV_badsourcetypeRequired.py | 29 +-
Test/test_python_CMIP6_CV_badvariant.py | 17 +-
Test/test_python_CMIP6_CV_externalvariables.py | 22 +-
Test/test_python_CMIP6_CV_forcemultipleparent.py | 151 +
...on.py => test_python_CMIP6_CV_forcenoparent.py} | 26 +-
...tion.py => test_python_CMIP6_CV_forceparent.py} | 35 +-
Test/test_python_CMIP6_CV_furtherinfourl.py | 74 +-
Test/test_python_CMIP6_CV_fxtable.py | 23 +-
Test/test_python_CMIP6_CV_longrealizationindex.py | 18 +-
Test/test_python_CMIP6_CV_nomipera.py | 19 +-
...ion.py => test_python_CMIP6_CV_parentmipera.py} | 32 +-
...n.py => test_python_CMIP6_CV_parentsourceid.py} | 31 +-
....py => test_python_CMIP6_CV_parenttimeunits.py} | 36 +-
... => test_python_CMIP6_CV_parentvariantlabel.py} | 32 +-
...=> test_python_CMIP6_CV_sub_experimentIDbad.py} | 33 +-
...y => test_python_CMIP6_CV_sub_experiment_id.py} | 33 +-
...y => test_python_CMIP6_CV_sub_experimentbad.py} | 34 +-
...> test_python_CMIP6_CV_sub_experimentnotset.py} | 36 +-
Test/test_python_CMIP6_CV_trackingNoprefix.py | 13 +-
Test/test_python_CMIP6_CV_trackingprefix.py | 48 +-
Test/test_python_CMIP6_driving.py | 11 +-
Test/test_python_CMIP6_experimentID.py | 11 +-
Test/test_python_CMIP6_projections.py | 112 +
Test/test_python_CMIP6_wrong_activity.py | 11 +-
Test/test_python_YYYMMDDHH_exp_fmt.py | 42 +-
Test/test_python_alastair_1.py | 99 +-
Test/test_python_appending.py | 94 +-
Test/test_python_bad_date.py | 111 +-
Test/test_python_bentley_01.py | 81 +-
Test/test_python_bounds_request.py | 65 +-
Test/test_python_cfmip_site_axis_test.py | 135 +-
Test/test_python_clim_bounds.py | 70 +-
Test/test_python_clim_bounds_02.py | 93 +-
Test/test_python_clim_bounds_03.py | 99 +-
Test/test_python_clim_bounds_04.py | 99 +-
Test/test_python_common.py | 228 +-
Test/test_python_direct_calls.py | 213 +-
Test/test_python_free_wrapping_issue.py | 131 +-
Test/test_python_grid_and_ocn_sigma.py | 225 +-
Test/test_python_index_coord.py | 70 +-
Test/test_python_jamie.py | 40 +-
Test/test_python_jamie_10.py | 52 +-
Test/test_python_jamie_11.py | 156 -
Test/test_python_jamie_12.py | 55 +-
Test/test_python_jamie_2.py | 39 +-
Test/test_python_jamie_3.py | 36 +-
Test/test_python_jamie_3hr.py | 58 +-
Test/test_python_jamie_4.py | 36 +-
Test/test_python_jamie_6.py | 247 +-
Test/test_python_jamie_7.py | 101 +-
Test/test_python_jamie_8.py | 101 +-
Test/test_python_jamie_9.py | 54 +-
Test/test_python_jamie_site_surface.py | 53 +-
Test/test_python_joerg_1.py | 92 +-
Test/test_python_joerg_10.py | 121 +-
Test/test_python_joerg_11.py | 89 +-
Test/test_python_joerg_12.py | 91 +-
Test/test_python_joerg_2.py | 66 +-
Test/test_python_joerg_3.py | 215 +-
Test/test_python_joerg_4.py | 106 +-
Test/test_python_joerg_5.py | 22 +-
Test/test_python_joerg_6.py | 19 +-
Test/test_python_joerg_7.py | 65 +-
Test/test_python_joerg_8.py | 89 +-
Test/test_python_joerg_9.py | 138 +-
Test/test_python_joerg_tim2_clim.py | 71 +-
Test/test_python_joerg_tim2_clim_02.py | 57 +-
Test/test_python_max_variables.py | 94 +-
Test/test_python_max_variables_2.py | 113 +-
Test/test_python_memory_check.py | 84 +-
Test/test_python_new_tables.py | 52 +-
Test/test_python_obs4MIPs.py | 34 +-
Test/test_python_open_close_cmor_multiple.py | 120 +-
Test/test_python_polar_stereo.py | 94 +-
Test/test_python_region.py | 44 +-
Test/test_python_reverted_lats.py | 107 +-
.../test_python_singleton_anywhere_in_table_def.py | 137 +-
Test/test_python_singleton_string.py | 115 +-
Test/test_python_stephanie_6hrPlev_minutes.py | 68 +-
Test/test_python_toomany_tables.py | 123 +
Test/test_python_user_interface_00.py | 162 +-
Test/test_python_user_interface_01.py | 99 +-
Test/test_python_user_interface_03.py | 93 +-
Test/test_site_ts.py | 57 +-
Test/test_sophie.f90 | 6 +-
Test/test_time_gap_multi_write.py | 84 +-
Test/test_time_gap_single_write1.py | 77 +-
Test/test_time_gap_single_write2.py | 76 +-
TestTables/CMIP5_3hr | 814 --
TestTables/CMIP5_6hrLev | 612 --
TestTables/CMIP5_Amon | 2387 -----
TestTables/CMIP5_Lmon | 1665 ---
TestTables/CMIP5_Omon | 4658 ---------
TestTables/CMIP5_cf3hr | 2736 -----
TestTables/CMIP5_cfMon | 2756 -----
TestTables/CMIP5_cfSites | 2365 -----
TestTables/CMIP5_day | 1274 ---
TestTables/CMIP5_fx | 665 --
TestTables/CMIP5_grids | 319 -
TestTables/CMIP6_3hr.json | 38 +-
TestTables/CMIP6_6hrLev.json | 78 +-
TestTables/CMIP6_6hrPlev.json | 214 +-
.../{CMIP6_6hrPlevpt.json => CMIP6_6hrPlevPt.json} | 266 +-
.../{CMIP6_aerdaily.json => CMIP6_AERday.json} | 84 +-
.../{CMIP6_aerfixed.json => CMIP6_AERfx.json} | 35 +-
.../{CMIP6_aerhourly.json => CMIP6_AERhr.json} | 30 +-
.../{CMIP6_aermonthly.json => CMIP6_AERmon.json} | 856 +-
TestTables/CMIP6_AERmonZ.json | 307 +
TestTables/CMIP6_Amon.json | 158 +-
TestTables/CMIP6_AmonAdj.json | 86 -
TestTables/CMIP6_Amon_json_hfls | 6 +-
TestTables/{CMIP6_cf3hr.json => CMIP6_CF3hr.json} | 224 +-
TestTables/{CMIP6_cfDay.json => CMIP6_CFday.json} | 54 +-
TestTables/{CMIP6_cfMon.json => CMIP6_CFmon.json} | 24 +-
TestTables/{CMIP6_Amon.json => CMIP6_CFsubhr.json} | 986 +-
.../{CMIP6_cfOff.json => CMIP6_CFsubhrOff.json} | 12 +-
TestTables/CMIP6_CORDEX_day.json | 1 -
TestTables/CMIP6_CV.json | 10116 +++++++++++--------
TestTables/CMIP6_CV_minimal.json | 8 -
TestTables/{CMIP6_em1hr.json => CMIP6_E1hr.json} | 84 +-
...P6_em1hrclimmon.json => CMIP6_E1hrClimMon.json} | 10 +-
TestTables/CMIP6_E3hr.json | 341 +
TestTables/{CMIP6_em3hr.json => CMIP6_E3hrPt.json} | 664 +-
TestTables/CMIP6_E6hrZ.json | 52 +
TestTables/{CMIP6_emDay.json => CMIP6_Eday.json} | 1029 +-
TestTables/{CMIP6_emDayZ.json => CMIP6_EdayZ.json} | 65 +-
TestTables/CMIP6_Efx.json | 256 +
TestTables/{CMIP6_emMon.json => CMIP6_Emon.json} | 1401 +--
TestTables/{CMIP6_emMonZ.json => CMIP6_EmonZ.json} | 488 +-
.../{CMIP6_emSubhr.json => CMIP6_Esubhr.json} | 44 +-
TestTables/{CMIP6_emYr.json => CMIP6_Eyr.json} | 116 +-
.../{CMIP6_LIfxgre.json => CMIP6_IfxAnt.json} | 28 +-
.../{CMIP6_LIfxant.json => CMIP6_IfxGre.json} | 28 +-
.../{CMIP6_LImongre.json => CMIP6_ImonAnt.json} | 158 +-
.../{CMIP6_LImonant.json => CMIP6_ImonGre.json} | 158 +-
.../{CMIP6_LIyrant.json => CMIP6_IyrAnt.json} | 132 +-
.../{CMIP6_LIyrgre.json => CMIP6_IyrGre.json} | 132 +-
TestTables/CMIP6_LImon.json | 70 +-
TestTables/CMIP6_Lmon.json | 92 +-
TestTables/CMIP6_Oclim.json | 22 +-
TestTables/CMIP6_Oday.json | 39 +-
TestTables/CMIP6_Odec.json | 426 +
TestTables/CMIP6_Ofx.json | 103 +-
TestTables/CMIP6_Omon.json | 3923 ++++---
TestTables/CMIP6_Omonbad.json | 4 +-
TestTables/CMIP6_Oyr.json | 402 +-
TestTables/CMIP6_SIday.json | 109 +-
TestTables/CMIP6_SImon.json | 279 +-
TestTables/CMIP6_aerannual.json | 1 -
TestTables/CMIP6_badOmon.json | 5825 -----------
TestTables/CMIP6_cf3hr_0.json | 6 +-
TestTables/CMIP6_cf3hr_1.json | 6 +-
TestTables/CMIP6_cf3hr_2.json | 6 +-
TestTables/CMIP6_cfSites.json | 647 --
TestTables/CMIP6_chunking.json | 39 +
TestTables/CMIP6_configure.json | 5 -
TestTables/CMIP6_coordinate.json | 308 +-
...nate.json => CMIP6_coordinateTESTNOBOUNDS.json} | 12 +-
TestTables/CMIP6_day.json | 243 +-
TestTables/CMIP6_em3hrpt.json | 375 -
TestTables/CMIP6_emDaypt.json | 52 -
TestTables/CMIP6_emFx.json | 171 -
TestTables/CMIP6_emMonpt.json | 35 -
TestTables/CMIP6_excerpts.json | 295 -
TestTables/CMIP6_expt_list_042716-1.csv | 1 -
TestTables/CMIP6_expt_list_062116.csv | 1 -
TestTables/CMIP6_fx.json | 90 +-
TestTables/CMIP6_grids.json | 10 +-
TestTables/md5s | 1 -
{Test => TestTables}/python_test_table_A | 13 +-
configure | 18 +-
configure.ac | 2 +-
include/cdTime/cfortran.h | 136 +-
include/cmor.h | 47 +-
include/cmor_func_def.h | 26 +-
include/cmor_locale.h | 2 +-
run_tests.py | 2 +-
run_tests2.py | 40 +
scripts/conda_upload.sh | 36 +
scripts/createCMIP6CV.py | 36 +-
setup.py.in | 18 +-
246 files changed, 23293 insertions(+), 44761 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