[cmor] 02/22: Merge tag 'upstream/3.1.2' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Dec 20 11:10:35 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 a72bd6a5bd6c3b5eada8d2879babf45d734380cc
Merge: 079bd86 dade5ad
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Sep 12 08:17:52 2016 +0100
Merge tag 'upstream/3.1.2' into debian/master
Lib/CV_experiments.json | 974 +-
Lib/__init__.py | 19 +-
Lib/convertCSVFile.py | 28 +-
Lib/{CV_experiments.json => experiments_id.json} | 957 +-
Lib/pywrapper.py | 120 +-
LibCV/CMIP6Validator.py | 267 +
LibCV/__init__.py | 4 +
LibCV/cfchecker/__init__.py | 21 +
LibCV/cfchecker/cfchecks.py | 2653 ++++
LibCV/cmor_const.py | 37 +
LibCV/pywrapper.py | 342 +
Makefile.in | 3 +
README.md | 6 +-
RELEASE-NOTES | 5 +-
Src/_cmormodule.c | 250 +-
Src/_controlvocabulary.c | 476 +
Src/cmor.c | 123 +-
Src/cmor_CV.c | 355 +-
Src/cmor_axes.c | 5 +-
Src/cmor_cfortran_interface.c | 7 +-
Src/cmor_fortran_interface.f90 | 18 +
Src/cmor_grids.c | 7 +-
Src/cmor_tables.c | 4 +-
Src/cmor_variables.c | 35 +-
Tables | 1 -
Test/CMIP6schema.py | 25 -
Test/__init__.py | 0
Test/all_tests.py | 10 +
Test/climatology_test.c | 6 +-
Test/climatology_test_code.f90 | 8 +-
Test/cmor_speed_and_compression.json | 1 -
Test/ipcc_test_code.c | 6 +-
Test/ipcc_test_code.f90 | 6 +-
Test/ipcc_test_code.json | 7 +-
Test/jamie_hybrid_height.json | 1 -
Test/jamie_positive.json | 1 -
Test/karls.json | 1 -
Test/karls_test.f90 | 8 +-
Test/main_prog.f90 | 6 +-
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/ta_4D_r.asc | 7 +-
Test/test1.f90 | 9 +-
Test/test1.json | 21 +-
Test/test2.f90 | 6 +-
Test/test2.json | 10 +-
Test/test3.f90 | 6 +-
Test/test4.f90 | 6 +-
Test/test_any_from_asc.json | 1 -
Test/test_any_from_asc_d.json | 1 -
Test/test_cmor_grid_time_varying.f90 | 8 +-
...ables.json => test_cmor_grid_time_varying.json} | 0
Test/test_compression.json | 1 -
Test/test_dimensionless.f90 | 49 +-
Test/test_doc.json | 5 +-
Test/test_fortran_example_00.f90 | 6 +-
Test/test_grid.json | 1 -
Test/test_lon_gt_360.json | 1 -
Test/test_lon_thro_360.json | 1 -
Test/test_lots_of_variables.json | 1 -
Test/test_python_1D_var.json | 1 -
Test/test_python_2Gb_file.json | 1 -
Test/test_python_2Gb_file.py | 4 +-
Test/test_python_2Gb_slice.json | 1 -
Test/test_python_2Gb_slice.py | 4 +-
Test/test_python_3hr.json | 1 -
Test/test_python_CMIP6_CV_HISTORY.json | 1 -
Test/test_python_CMIP6_CV_HISTORY.py | 131 +-
...json => test_python_CMIP6_CV_baddirectory.json} | 3 +-
Test/test_python_CMIP6_CV_baddirectory.py | 70 +
Test/test_python_CMIP6_CV_badgridgr.json | 1 -
Test/test_python_CMIP6_CV_badgridgr.py | 149 +-
Test/test_python_CMIP6_CV_badgridlabel.json | 1 -
Test/test_python_CMIP6_CV_badgridlabel.py | 158 +-
Test/test_python_CMIP6_CV_badgridresolution.json | 1 -
Test/test_python_CMIP6_CV_badgridresolution.py | 150 +-
Test/test_python_CMIP6_CV_badgridresolution2.json | 1 -
Test/test_python_CMIP6_CV_badgridresolution2.py | 145 +-
Test/test_python_CMIP6_CV_badinstitution.json | 1 -
Test/test_python_CMIP6_CV_badinstitution.py | 73 +-
Test/test_python_CMIP6_CV_badinstitutionID.json | 1 -
Test/test_python_CMIP6_CV_badinstitutionID.py | 138 +-
...est_python_CMIP6_CV_badinstitutionIDNotSet.json | 1 -
.../test_python_CMIP6_CV_badinstitutionIDNotSet.py | 143 +-
Test/test_python_CMIP6_CV_badsource.json | 1 -
Test/test_python_CMIP6_CV_badsource.py | 77 +-
Test/test_python_CMIP6_CV_badsourceid.json | 1 -
Test/test_python_CMIP6_CV_badsourceid.py | 144 +-
Test/test_python_CMIP6_CV_badsourcetype.json | 1 -
Test/test_python_CMIP6_CV_badsourcetype.py | 146 +-
.../test_python_CMIP6_CV_badsourcetypeCHEMAER.json | 1 -
Test/test_python_CMIP6_CV_badsourcetypeCHEMAER.py | 147 +-
Test/test_python_CMIP6_CV_badsourcetypeCHMAER.json | 1 -
...test_python_CMIP6_CV_badsourcetypeRequired.json | 1 -
Test/test_python_CMIP6_CV_badsourcetypeRequired.py | 147 +-
Test/test_python_CMIP6_CV_badvariant.json | 1 -
Test/test_python_CMIP6_CV_badvariant.py | 147 +-
Test/test_python_CMIP6_CV_externalvariables.json | 2 +-
Test/test_python_CMIP6_CV_externalvariables.py | 96 +-
Test/test_python_CMIP6_CV_furtherinfourl.json | 3 +-
Test/test_python_CMIP6_CV_furtherinfourl.py | 140 +-
Test/test_python_CMIP6_CV_fxtable.py | 131 +-
.../test_python_CMIP6_CV_longrealizationindex.json | 1 -
Test/test_python_CMIP6_CV_longrealizationindex.py | 148 +-
Test/test_python_CMIP6_CV_nomipera.json | 1 -
Test/test_python_CMIP6_CV_nomipera.py | 151 +-
Test/test_python_CMIP6_CV_trackingNoprefix.py | 156 +-
Test/test_python_CMIP6_CV_trackingprefix.py | 156 +-
Test/test_python_CMIP6_driving.json | 1 -
Test/test_python_CMIP6_driving.py | 91 +-
Test/test_python_CMIP6_experimentID.json | 20 +-
Test/test_python_CMIP6_experimentID.py | 91 +-
Test/test_python_CMIP6_no_driving.json | 95 -
Test/test_python_CMIP6_no_driving.py | 15 -
Test/test_python_CMIP6_wrong_activity.json | 21 +-
Test/test_python_CMIP6_wrong_activity.py | 95 +-
Test/test_python_YYYMMDDHH_exp_fmt.json | 1 -
Test/test_python_alastair_1.json | 1 -
Test/test_python_alastair_1.py | 7 +-
Test/test_python_appending.json | 1 -
Test/test_python_appending.py | 6 +-
Test/test_python_bounds_request.json | 1 -
Test/test_python_cfmip_site_axis_test.json | 1 -
Test/test_python_common.py | 4 +-
Test/test_python_direct_calls.json | 1 -
Test/test_python_direct_calls.py | 6 +-
Test/test_python_free_wrapping_issue.json | 1 -
Test/test_python_free_wrapping_issue.py | 8 +-
Test/test_python_grid_and_ocn_sigma.json | 1 -
Test/test_python_jamie.json | 1 -
Test/test_python_jamie_10.json | 1 -
Test/test_python_jamie_10.py | 4 +-
Test/test_python_jamie_11.json | 1 -
Test/test_python_jamie_12.json | 1 -
Test/test_python_jamie_2.json | 1 -
Test/test_python_jamie_3.json | 1 -
Test/test_python_jamie_4.json | 1 -
Test/test_python_jamie_6.json | 1 -
Test/test_python_jamie_7.json | 1 -
Test/test_python_jamie_7.py | 4 +-
Test/test_python_jamie_8.json | 1 -
Test/test_python_jamie_8.py | 2 +-
Test/test_python_jamie_9.json | 1 -
Test/test_python_jamie_9.py | 4 +-
Test/test_python_jamie_site_surface.json | 1 -
Test/test_python_joerg_1.json | 1 -
Test/test_python_joerg_10.json | 17 +-
Test/test_python_joerg_11.json | 1 -
Test/test_python_joerg_12.json | 1 -
Test/test_python_joerg_2.json | 1 -
Test/test_python_joerg_2.py | 6 +-
Test/test_python_joerg_3.json | 1 -
Test/test_python_joerg_4.json | 1 -
Test/test_python_joerg_6.json | 1 -
Test/test_python_joerg_7.json | 1 -
Test/test_python_joerg_8.json | 1 -
Test/test_python_joerg_tim2_clim_02.json | 1 -
Test/test_python_max_variables.json | 1 -
Test/test_python_max_variables.py | 4 +-
Test/test_python_max_variables_2.py | 4 +-
Test/test_python_memory_check.json | 1 -
Test/test_python_new_tables.json | 1 -
Test/test_python_obs4MIPs.json | 1 -
Test/test_python_open_close_cmor_multiple.json | 1 -
Test/test_python_open_close_cmor_multiple.py | 4 +-
...test_doc.json => test_python_polar_stereo.json} | 32 +-
Test/test_python_polar_stereo.py | 86 +
Test/test_python_region.json | 1 -
Test/test_python_reverted_lats.json | 1 -
Test/test_python_user_interface_00.json | 1 -
Test/test_python_user_interface_00.py | 2 +-
Test/test_python_user_interface_01.json | 1 -
Test/test_python_user_interface_03.json | 1 -
Test/test_sigma.f90 | 14 +-
Test/test_singleton.f90 | 6 +-
Test/test_site_ts.json | 1 -
Test/test_sophie.f90 | 6 +-
Test/test_station_data.f90 | 6 +-
TestTables/CMIP6_3hr.json | 4088 +++---
TestTables/CMIP6_6hrLev.json | 3772 +++---
TestTables/CMIP6_6hrPlev.json | 3914 +++---
TestTables/CMIP6_6hrPlevpt.json | 4095 +++---
TestTables/CMIP6_Amon.json | 5349 ++++----
TestTables/CMIP6_AmonAdj.json | 3586 +++---
TestTables/CMIP6_CCMI1_hourly.json | 2380 ----
TestTables/CMIP6_CCMI1_monthly.json | 2341 ----
TestTables/CMIP6_CORDEX_day.json | 2155 +---
TestTables/CMIP6_CV.json | 985 +-
TestTables/CMIP6_LImon.json | 4539 +++----
TestTables/CMIP6_Lmon.json | 4956 ++++----
TestTables/CMIP6_Oclim.json | 4214 ++++---
TestTables/CMIP6_Oday.json | 3506 +++---
TestTables/CMIP6_Omon.json | 8776 ++++++-------
TestTables/{CMIP6_Omon.json => CMIP6_Omonbad.json} | 8750 ++++++-------
TestTables/CMIP6_Oyr.json | 6116 ++++-----
TestTables/CMIP6_SImon.json | 5603 +++++----
TestTables/CMIP6_aerannual.json | 3736 +++---
TestTables/CMIP6_aerdaily.json | 3980 +++---
TestTables/CMIP6_aerfixed.json | 3584 +++---
TestTables/CMIP6_aerhourly.json | 3636 +++---
TestTables/CMIP6_aermonthly.json | 6556 +++++-----
TestTables/CMIP6_aero.json | 5550 ++++----
TestTables/CMIP6_cf3hr.json | 3856 +++---
TestTables/CMIP6_cfDay.json | 4528 +++----
TestTables/CMIP6_cfMon.json | 5788 ++++-----
TestTables/CMIP6_cfsites.json | 3487 -----
TestTables/CMIP6_day.json | 4536 +++----
TestTables/CMIP6_em3hr.json | 3771 +++---
TestTables/CMIP6_em3hrpt.json | 3760 +++---
TestTables/CMIP6_emDay.json | 6440 +++++-----
TestTables/CMIP6_emDayZ.json | 3650 +++---
TestTables/CMIP6_emFx.json | 3695 +++---
TestTables/CMIP6_emMon.json | 12597 +++++++++++--------
TestTables/CMIP6_emMonZ.json | 3990 +++---
TestTables/CMIP6_emSubhr.json | 4117 +++---
TestTables/CMIP6_emYr.json | 4627 +++----
TestTables/CMIP6_expt_list_062116.csv | 1 +
TestTables/CMIP6_fx.json | 3896 +++---
TestTables/CMIP6_grids.json | 16 +
configure | 38 +-
configure.ac | 7 +-
include/cmor.h | 17 +-
include/cmor_func_def.h | 14 +-
include/cmor_locale.h | 2 +-
run_tests.py | 6 +
setup.py.in | 23 +-
230 files changed, 97385 insertions(+), 92281 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