[cmor-tables] 30/83: Merge branch 'devel'
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cmor-tables.
commit 6af8dd410ff126299794ccfb9e98ab19ccfe4c93
Merge: b57f5e3 339c736
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Wed Jun 9 18:47:24 2010 -0700
Merge branch 'devel'
Conflicts:
RELEASE-NOTES
.gitignore | 1 +
Doc/IPCC_output_requirements.htm | 3381 ----
Doc/IPCC_output_requirements.pdf | Bin 111256 -> 0 bytes
Doc/cmor_users_guide.doc | Bin 358912 -> 0 bytes
Doc/cmor_users_guide.htm | 16371 -------------------
Doc/cmor_users_guide.pdf | Bin 551997 -> 0 bytes
Doc/cmor_users_guide_files/filelist.xml | 5 -
Doc/cmor_users_guide_files/header.htm | 122 -
Doc/standard_output.html | 5561 -------
Doc/standard_output.pdf | Bin 107820 -> 0 bytes
Doc/standard_output_updates.htm | 256 -
INSTALL | 105 -
Lib/__init__.py | 9 -
Lib/check_CMOR_compliant.py | 1622 --
Lib/cmor_const.py | 41 -
Lib/git2svn.py | 31 -
Lib/pywrapper.py | 904 -
Lib/table_generator.py | 29 +-
Makefile.in | 225 -
RELEASE-NOTES | 118 +-
Src/_cmormodule.c | 771 -
Src/cdTime/Makefile.in | 98 -
Src/cdTime/cdRegTrfm.c | 139 -
Src/cdTime/cdTimeConv.c | 1110 --
Src/cdTime/cdUtil.c | 46 -
Src/cdTime/fcdTimeConv.c | 118 -
Src/cdTime/reg_trfm.c | 962 --
Src/cdTime/timeArith.c | 179 -
Src/cdTime/timeConv.c | 396 -
Src/cmor.c | 3810 -----
Src/cmor_axes.c | 1554 --
Src/cmor_cfortran_interface.c | 481 -
Src/cmor_fortran_interface.f90 | 7805 ---------
Src/cmor_grids.c | 733 -
Src/cmor_md5.c | 309 -
Src/cmor_tables.c | 409 -
Src/cmor_variables.c | 1646 --
Tables/CMIP5_3hr | 154 +-
Tables/CMIP5_6hrLev | 42 +-
Tables/CMIP5_6hrPlev | 34 +-
Tables/CMIP5_Amon | 340 +-
Tables/{CMIP5_Limon => CMIP5_LImon} | 36 +-
Tables/CMIP5_Lmon | 40 +-
Tables/{CMIP5_Oimon => CMIP5_OImon} | 18 +-
Tables/CMIP5_Oclim | 24 +-
Tables/CMIP5_Omon | 184 +-
Tables/CMIP5_Oyr | 24 +-
Tables/CMIP5_aero | 2 +-
Tables/CMIP5_cf3hr | 262 +-
Tables/CMIP5_cfDay | 218 +-
Tables/CMIP5_cfMon | 24 +-
Tables/CMIP5_cfOff | 2 +-
Tables/CMIP5_cfSites | 316 +-
Tables/CMIP5_day | 272 +-
Tables/CMIP5_fx | 46 +-
Tables/md5s | 2 +-
Tables_csv/add_dims2.txt | 22 +-
Tables_csv/add_dims2_notime.txt | 20 +-
Test/3D_txy.input | 1 -
Test/3D_txy_split_lon.input | 1 -
Test/3D_xty_split_lon.input | 1 -
Test/CMIP5_Amon_YYYYMMDDHH | 2080 ---
Test/CMIP5_Amons | 10929 -------------
Test/CMIP5_cf3hr.txt | 230 -
Test/CMIP5_cf3hr_0.txt | 185 -
Test/CMIP5_cf3hr_1.txt | 185 -
Test/CMOR_SAMPLE_TABLE | 860 -
Test/Curts_table | 761 -
Test/IPCC_table_A1 | 2364 ---
Test/IPCC_table_A3 | 545 -
Test/IPCC_test_table_A | 1023 --
Test/IPCC_test_table_As | 14624 -----------------
Test/IPCC_test_table_Grids | 192 -
Test/IPCC_test_table_O | 287 -
Test/IPCC_test_table_S | 691 -
Test/Sophie_Table | 1021 --
Test/alejandro.txt | 1 -
Test/alejandro_1.txt | 1 -
Test/alejandro_2.txt | 1 -
Test/check_results.py | 51 -
Test/climatology_test_code.f90 | 371 -
Test/climatology_test_table_A | 296 -
Test/cmor_speed_and_compression.py | 161 -
Test/cmor_speed_and_compression_01.py | 151 -
Test/cmor_speed_and_compression_02.py | 184 -
Test/in_files.py | 31 -
Test/ipcc_test_code.c | 446 -
Test/ipcc_test_code.f90 | 591 -
Test/jamie_hybrid_height.py | 68 -
Test/jamie_positive.py | 55 -
Test/karls_test.f90 | 639 -
Test/main_prog.f90 | 511 -
Test/mytest.f90 | 182 -
Test/mytest_3d_i_2.f90 | 194 -
Test/mytest_3d_r.f90 | 182 -
Test/mytest_3d_r_2.f90 | 196 -
Test/mytest_4d_d_big_array_2.f90 | 207 -
Test/mytest_4d_d_big_array_3.f90 | 207 -
Test/mytest_4d_d_big_array_4.f90 | 206 -
Test/mytest_4d_d_big_array_5.f90 | 204 -
Test/mytest_4d_r.f90 | 189 -
Test/mytest_4d_r_big_array.f90 | 204 -
Test/nc2asc.py | 84 -
Test/noinput | 2 -
Test/old_cmor_tables/climatology_test_code.f90 | 355 -
Test/old_cmor_tables/ipcc_test_code.f90 | 550 -
Test/old_cmor_tables/karls_test.f90 | 604 -
Test/old_cmor_tables/main_prog.f90 | 472 -
Test/old_cmor_tables/mytest.f90 | 182 -
Test/old_cmor_tables/mytest_3d_i_2.f90 | 194 -
Test/old_cmor_tables/mytest_3d_r.f90 | 182 -
Test/old_cmor_tables/mytest_3d_r_2.f90 | 196 -
Test/old_cmor_tables/mytest_4d_d_big_array_2.f90 | 204 -
Test/old_cmor_tables/mytest_4d_d_big_array_3.f90 | 204 -
Test/old_cmor_tables/mytest_4d_d_big_array_4.f90 | 203 -
Test/old_cmor_tables/mytest_4d_d_big_array_5.f90 | 201 -
Test/old_cmor_tables/mytest_4d_r.f90 | 185 -
Test/old_cmor_tables/mytest_4d_r_big_array.f90 | 202 -
Test/old_cmor_tables/rewrite_harvardf_data.f90 | 113 -
Test/old_cmor_tables/test1.f90 | 473 -
Test/old_cmor_tables/test2.f90 | 477 -
Test/old_cmor_tables/test3.f90 | 481 -
Test/old_cmor_tables/test4.f90 | 475 -
Test/old_cmor_tables/test_3h.f90 | 580 -
Test/old_cmor_tables/test_any_from_asc.f90 | 348 -
Test/old_cmor_tables/test_any_from_asc_d.f90 | 348 -
Test/old_cmor_tables/test_any_from_asc_i.f90 | 348 -
Test/old_cmor_tables/test_cmor_grid_alejandro.f90 | 166 -
Test/old_cmor_tables/test_dimensionless.f90 | 549 -
Test/old_cmor_tables/test_fortran_example_00.f90 | 481 -
Test/old_cmor_tables/test_fortran_example_01.f90 | 334 -
Test/old_cmor_tables/test_fortran_example_02.f90 | 376 -
Test/old_cmor_tables/test_lots_of_variables.f90 | 343 -
Test/old_cmor_tables/test_region.f90 | 335 -
.../test_shrt_exp_nm_set_att_initi.f90 | 343 -
Test/old_cmor_tables/test_sigma.f90 | 551 -
Test/old_cmor_tables/test_singleton.f90 | 594 -
Test/old_cmor_tables/test_sophie.f90 | 483 -
Test/old_cmor_tables/test_station_data.f90 | 380 -
Test/old_cmor_tables/wegner_test.f90 | 447 -
Test/omonxyztst.f90 | 473 -
Test/out_files.py | 493 -
Test/python_test_table_A | 2388 ---
Test/rewrite_harvardf_data.f90 | 125 -
Test/speed_test_table_A | 2131 ---
Test/ta_3D_r_2.asc | 22 -
Test/ta_4D_r.asc | 23 -
Test/tas.asc | 17 -
Test/tas_3D_noreorder.input | 1 -
Test/tas_3D_xty_-180_180.asc | 19 -
Test/tas_3d_r.asc | 17 -
Test/tas_harvardf.txt | 4385 -----
Test/tas_mytest_3d_i.asc | 19 -
Test/tas_mytest_3d_i.input | 1 -
Test/tas_mytest_noreorder.asc | 19 -
Test/tas_mytest_reorder.asc | 19 -
Test/tas_mytest_reorder_split_lon.asc | 19 -
Test/test1.f90 | 511 -
Test/test2.f90 | 513 -
Test/test3.f90 | 517 -
Test/test4.f90 | 514 -
Test/test_3h.f90 | 585 -
Test/test_any_from_asc.f90 | 352 -
Test/test_any_from_asc_d.f90 | 352 -
Test/test_any_from_asc_i.f90 | 350 -
Test/test_checker_works.py | 1767 --
Test/test_cmor_grid_alejandro.f90 | 167 -
Test/test_compression.py | 63 -
Test/test_dimensionless.f90 | 588 -
Test/test_fortran_example_00.f90 | 517 -
Test/test_fortran_example_01.f90 | 335 -
Test/test_fortran_example_02.f90 | 376 -
Test/test_grid.c | 242 -
Test/test_lots_of_variables.c | 350 -
Test/test_lots_of_variables.f90 | 344 -
Test/test_python_1D_var.py | 36 -
Test/test_python_2Gb_file.py | 48 -
Test/test_python_2Gb_slice.py | 51 -
Test/test_python_YYYMMDDHH_exp_fmt.py | 38 -
Test/test_python_appending.py | 92 -
Test/test_python_bounds_request.py | 59 -
Test/test_python_common.py | 164 -
Test/test_python_direct_calls.py | 120 -
Test/test_python_fx.py | 46 -
Test/test_python_grid_and_ocn_sigma.py | 159 -
Test/test_python_index_coord.py | 44 -
Test/test_python_jamie.py | 39 -
Test/test_python_jamie_2.py | 43 -
Test/test_python_jamie_3.py | 46 -
Test/test_python_jamie_3hr.py | 51 -
Test/test_python_jamie_4.py | 48 -
Test/test_python_jamie_6.py | 169 -
Test/test_python_jamie_7.py | 87 -
Test/test_python_joerg_1.py | 106 -
Test/test_python_joerg_2.py | 83 -
Test/test_python_joerg_3.py | 149 -
Test/test_python_max_variables.py | 90 -
Test/test_python_max_variables_2.py | 96 -
Test/test_python_memory_check.py | 131 -
Test/test_python_new_tables.py | 41 -
Test/test_python_open_close_cmor_multiple.py | 59 -
Test/test_python_region.py | 33 -
Test/test_python_reverted_lats.py | 63 -
Test/test_python_user_interface_00.py | 131 -
Test/test_python_user_interface_01.py | 95 -
Test/test_python_user_interface_03.py | 104 -
Test/test_region.f90 | 336 -
Test/test_shrt_exp_nm_set_att_initi.f90 | 346 -
Test/test_sigma.f90 | 583 -
Test/test_singleton.f90 | 631 -
Test/test_sophie.f90 | 509 -
Test/test_station_data.f90 | 402 -
Test/wegner_test.f90 | 447 -
compile_line.txt.in | 5 -
config.guess | 1463 --
config.sub | 1579 --
configure | 5760 -------
configure.ac | 368 -
data/tas_sample.nc | Bin 403952 -> 0 bytes
get_git_version.sh | 7 -
include/cdTime/cddrs.h | 151 -
include/cdTime/cddrsint.h | 107 -
include/cdTime/cdms.h | 319 -
include/cdTime/cdms.inc | 57 -
include/cdTime/cdmsint.h | 588 -
include/cdTime/cdmsint_new.h | 1063 --
include/cdTime/cdrra.h | 43 -
include/cdTime/cdunif.h | 175 -
include/cdTime/cdunifint.h | 383 -
include/cdTime/cdunifpp/cdunifpp.h | 1086 --
include/cdTime/cdunifpp/cdunifpp_frename.h | 68 -
include/cdTime/cdunifpp/crayio.h | 396 -
include/cdTime/cdunifpp/util.h | 251 -
include/cdTime/cdunifpp/vardef.h | 67 -
include/cdTime/cfortran.h | 2369 ---
include/cdTime/drscdf.h | 272 -
include/cdTime/drsdef.h | 203 -
include/cdTime/fcddrs.h | 219 -
include/cdTime/gaussLats.h | 232 -
include/cdTime/grads.h | 1100 --
include/cdTime/gx.h | 442 -
include/cdTime/isdb.h | 104 -
include/cmor.h | 288 -
include/cmor_func_def.h | 102 -
include/cmor_md5.h | 30 -
install-sh | 323 -
setup.py.in | 67 -
show_git.c | 11 -
248 files changed, 1065 insertions(+), 149005 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor-tables.git
More information about the debian-science-commits
mailing list