[netcdf-libcf] 05/06: Merge tag 'upstream/1.0_beta10'
Bas Couwenberg
sebastic at xs4all.nl
Sat Jan 24 18:08:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository netcdf-libcf.
commit 95da3fb8f903bb90a4405679bf61a001b1c5436a
Merge: cc9428a ddd7394
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jan 17 18:52:35 2015 +0100
Merge tag 'upstream/1.0_beta10'
Upstream version 1.0~beta10
Makefile.am | 42 +-
Makefile.in | 270 +-
aclocal.m4 | 6649 +---
config.h.in => cf_config.h | 140 +-
config.h.in => cf_config.h.in | 43 +-
cfcheck/Makefile.am | 69 -
cfcheck/cfcheck.c | 87 -
cfcheck/tst_cfcheck.sh | 21 -
compile | 6 +-
config.guess | 196 +-
config.sub | 43 +-
configure | 35153 ++++++++-----------
configure.ac | 413 +-
doc/Makefile.am | 43 -
doc/Makefile.in | 722 -
doc/defines.texi | 62 -
doc/libcf.info | 3232 --
doc/libcf.pdf | Bin 185174 -> 0 bytes
doc/libcf.ps | 4275 ---
doc/libcf.texi | 3185 --
doc/mdate-sh | 205 -
doc/stamp-vti | 4 -
doc/texinfo.tex | 9291 -----
doc/version.texi | 4 -
examples/Makefile.am | 54 +
{gridspec/tools/shared => examples}/Makefile.in | 249 +-
examples/ex2.c | 239 +
examples/ex3.c | 278 +
examples/ex_create_cube_grids.c | 94 +
examples/ex_create_lonlat.c | 60 +
examples/ex_create_static_data.c | 94 +
examples/ex_create_time_data.c | 137 +
examples/ex_fortran_interface.f90 | 77 +
examples/ex_subset.c | 244 +
examples/examples.h | 117 +
examples/exparinterp.c | 248 +
gridspec/Makefile.am | 8 -
gridspec/shared/Makefile.am | 6 -
gridspec/shared/Makefile.in | 574 -
gridspec/shared/mosaic/Makefile.am | 71 -
gridspec/shared/mosaic/constant.h | 38 -
gridspec/shared/mosaic/create_xgrid.c | 1106 -
gridspec/shared/mosaic/create_xgrid.h | 43 -
gridspec/shared/mosaic/gradient_c2l.c | 435 -
gridspec/shared/mosaic/gradient_c2l.h | 17 -
gridspec/shared/mosaic/interp.c | 152 -
gridspec/shared/mosaic/interp.h | 14 -
gridspec/shared/mosaic/mosaic_util.c | 531 -
gridspec/shared/mosaic/mosaic_util.h | 34 -
gridspec/shared/mosaic/read_mosaic.c | 700 -
gridspec/shared/mosaic/read_mosaic.h | 15 -
gridspec/tools/Makefile.am | 12 -
gridspec/tools/Makefile.in | 672 -
gridspec/tools/fregrid/Makefile.am | 66 -
gridspec/tools/fregrid/Makefile.in | 571 -
gridspec/tools/fregrid/fregrid.c | 410 -
gridspec/tools/get_data.sh | 27 -
gridspec/tools/make_coupler_mosaic/Makefile.am | 67 -
gridspec/tools/make_coupler_mosaic/Makefile.in | 572 -
.../make_coupler_mosaic/make_coupler_mosaic.c | 206 -
gridspec/tools/make_hgrid/Makefile.am | 75 -
gridspec/tools/make_hgrid/make_hgrid.c | 340 -
gridspec/tools/make_hgrid/run_tests.in | 36 -
gridspec/tools/make_mosaic/Makefile.am | 73 -
gridspec/tools/make_mosaic/Makefile.in | 575 -
gridspec/tools/make_mosaic/make_mosaic.c | 177 -
gridspec/tools/make_topog/Makefile.am | 70 -
gridspec/tools/make_topog/make_topog.c | 324 -
gridspec/tools/make_topog/run_tests.in | 21 -
gridspec/tools/make_vgrid/Makefile.am | 72 -
gridspec/tools/make_vgrid/make_vgrid.c | 133 -
gridspec/tools/make_vgrid/run_tests.in | 13 -
gridspec/tools/shared/Makefile.am | 76 -
gridspec/tools/shared/bilinear_interp.c | 1137 -
gridspec/tools/shared/bilinear_interp.h | 10 -
gridspec/tools/shared/conserve_interp.c | 675 -
gridspec/tools/shared/conserve_interp.h | 13 -
.../tools/shared/create_conformal_cubic_grid.c | 816 -
gridspec/tools/shared/create_gnomonic_cubic_grid.c | 908 -
gridspec/tools/shared/create_grid_from_file.c | 179 -
gridspec/tools/shared/create_hgrid.h | 41 -
gridspec/tools/shared/create_lonlat_grid.c | 407 -
gridspec/tools/shared/create_vgrid.c | 43 -
gridspec/tools/shared/create_vgrid.h | 11 -
gridspec/tools/shared/fregrid_util.c | 1785 -
gridspec/tools/shared/fregrid_util.h | 30 -
gridspec/tools/shared/make_boundary_contact.c | 483 -
gridspec/tools/shared/make_boundary_contact.h | 7 -
gridspec/tools/shared/make_xgrid_contact.c | 227 -
gridspec/tools/shared/make_xgrid_contact.h | 4 -
gridspec/tools/shared/mpp.c | 230 -
gridspec/tools/shared/mpp.h | 25 -
gridspec/tools/shared/mpp_domain.c | 534 -
gridspec/tools/shared/mpp_domain.h | 50 -
gridspec/tools/shared/mpp_io.c | 1075 -
gridspec/tools/shared/mpp_io.h | 54 -
gridspec/tools/shared/tool_util.c | 3554 --
gridspec/tools/shared/tool_util.h | 62 -
gridspec/tools/shared/topog.c | 544 -
gridspec/tools/shared/topog.h | 14 -
gridspec/tools/test.sh | 45 -
gridspec/tools/test_all.sh | 47 -
gridspec_api/Makefile.am | 8 +
{gridspec => gridspec_api}/Makefile.in | 113 +-
gridspec_api/axis/Makefile.am | 28 +
.../make_hgrid => gridspec_api/axis}/Makefile.in | 286 +-
gridspec_api/axis/nccf_add_axis_att.c | 28 +
gridspec_api/axis/nccf_axis.h | 75 +
gridspec_api/axis/nccf_def_axis.c | 155 +
gridspec_api/axis/nccf_def_axis_from_file.c | 93 +
gridspec_api/axis/nccf_free_axis.c | 41 +
gridspec_api/axis/nccf_get_axis_datapointer.c | 28 +
gridspec_api/axis/nccf_inq_axis_datatype.c | 28 +
gridspec_api/axis/nccf_inq_axis_len.c | 28 +
gridspec_api/axis/nccf_inq_axis_name.c | 30 +
gridspec_api/axis/nccf_put_axis.c | 31 +
gridspec_api/axis/tst_axis.c | 55 +
gridspec_api/coord/Makefile.am | 48 +
.../make_hgrid => gridspec_api/coord}/Makefile.in | 342 +-
gridspec_api/coord/nccf_add_coord_att.c | 27 +
gridspec_api/coord/nccf_coord.h | 106 +
gridspec_api/coord/nccf_def_coord.c | 151 +
gridspec_api/coord/nccf_def_coord_from_axes.c | 105 +
gridspec_api/coord/nccf_def_coord_from_file.c | 59 +
gridspec_api/coord/nccf_free_coord.c | 47 +
gridspec_api/coord/nccf_get_coord_data_pointer.c | 22 +
gridspec_api/coord/nccf_inq_coord_bound.c | 42 +
gridspec_api/coord/nccf_inq_coord_bound_slice.c | 103 +
gridspec_api/coord/nccf_inq_coord_dimnames.c | 29 +
gridspec_api/coord/nccf_inq_coord_dims.c | 30 +
gridspec_api/coord/nccf_inq_coord_name.c | 24 +
gridspec_api/coord/nccf_inq_coord_ndims.c | 25 +
gridspec_api/coord/nccf_inq_coord_units.c | 32 +
gridspec_api/coord/nccf_is_coord.c | 164 +
gridspec_api/coord/nccf_put_coord.c | 34 +
gridspec_api/coord/tst_1d_boundary_slice.c | 61 +
gridspec_api/coord/tst_bound1.c | 147 +
gridspec_api/coord/tst_lon.c | 98 +
gridspec_api/coord/tst_lonlat.c | 63 +
gridspec_api/coord/tst_lonlat_from_axes.c | 70 +
gridspec_api/data/Makefile.am | 38 +
.../make_vgrid => gridspec_api/data}/Makefile.in | 315 +-
gridspec_api/data/nccf_add_data_att.c | 42 +
gridspec_api/data/nccf_data.h | 94 +
gridspec_api/data/nccf_def_data.c | 143 +
gridspec_api/data/nccf_def_data_from_file.c | 78 +
gridspec_api/data/nccf_free_data.c | 44 +
gridspec_api/data/nccf_get_data_pointer.c | 36 +
gridspec_api/data/nccf_inq_data_dims.c | 35 +
gridspec_api/data/nccf_inq_data_gridid.c | 24 +
gridspec_api/data/nccf_inq_data_ndims.c | 29 +
gridspec_api/data/nccf_inq_data_type.c | 25 +
gridspec_api/data/nccf_put_data.c | 40 +
gridspec_api/data/nccf_set_data.c | 101 +
gridspec_api/data/nccf_set_data.h | 62 +
gridspec_api/data/tst_nccf_def_SD_from_grid.c | 89 +
gridspec_api/data/tst_statdata.c | 91 +
gridspec_api/data/tst_timedata.c | 120 +
gridspec_api/global/Makefile.am | 23 +
{cfcheck => gridspec_api/global}/Makefile.in | 275 +-
gridspec_api/global/nccf_add_global_att.c | 89 +
gridspec_api/global/nccf_def_global.c | 49 +
gridspec_api/global/nccf_def_global_from_file.c | 51 +
gridspec_api/global/nccf_free_global.c | 35 +
gridspec_api/global/nccf_global.h | 60 +
gridspec_api/global/nccf_inq_global_att.c | 32 +
gridspec_api/global/nccf_inq_global_attval.c | 52 +
gridspec_api/global/nccf_inq_global_natts.c | 35 +
gridspec_api/global/nccf_put_global.c | 99 +
gridspec_api/global/tst_global.c | 74 +
gridspec_api/grid/Makefile.am | 30 +
.../make_topog => gridspec_api/grid}/Makefile.in | 327 +-
gridspec_api/grid/nccf_def_grid.c | 88 +
gridspec_api/grid/nccf_def_grid_from_file.c | 112 +
gridspec_api/grid/nccf_detect_grid_periodicity.c | 45 +
gridspec_api/grid/nccf_free_grid.c | 55 +
gridspec_api/grid/nccf_get_grid_mask_pointer.c | 23 +
gridspec_api/grid/nccf_grid.h | 77 +
gridspec_api/grid/nccf_inq_grid_coordids.c | 38 +
gridspec_api/grid/nccf_inq_grid_coordnames.c | 42 +
gridspec_api/grid/nccf_inq_grid_name.c | 35 +
gridspec_api/grid/nccf_inq_grid_ndims.c | 32 +
gridspec_api/grid/nccf_inq_grid_periodicity.c | 36 +
gridspec_api/grid/nccf_put_grid.c | 88 +
gridspec_api/grid/nccf_save_grid_scrip.c | 231 +
gridspec_api/grid/nccf_set_grid_validmask.c | 43 +
gridspec_api/grid/tst_1d_grid.c | 107 +
gridspec_api/grid/tst_bipolar_tripolar_grid.c | 114 +
gridspec_api/grid/tst_cubesphere_makegrid.c | 97 +
gridspec_api/grid/tst_struct_grid_latlon.c | 129 +
gridspec_api/host/Makefile.am | 63 +
{src => gridspec_api/host}/Makefile.in | 546 +-
gridspec_api/host/nccf_add_host_file.c | 136 +
gridspec_api/host/nccf_def_host.c | 78 +
gridspec_api/host/nccf_def_host_data.c | 132 +
gridspec_api/host/nccf_def_host_from_file.c | 321 +
gridspec_api/host/nccf_free_host.c | 114 +
gridspec_api/host/nccf_host.h | 153 +
gridspec_api/host/nccf_inq_host_gridfilename.c | 35 +
gridspec_api/host/nccf_inq_host_gridname.c | 32 +
gridspec_api/host/nccf_inq_host_mosaicfilename.c | 26 +
gridspec_api/host/nccf_inq_host_ngrids.c | 33 +
gridspec_api/host/nccf_inq_host_nstatdatafiles.c | 32 +
gridspec_api/host/nccf_inq_host_ntimedatafiles.c | 32 +
gridspec_api/host/nccf_inq_host_ntimeslices.c | 32 +
gridspec_api/host/nccf_inq_host_statdataids.c | 40 +
gridspec_api/host/nccf_inq_host_statfileindex.c | 71 +
gridspec_api/host/nccf_inq_host_statfilename.c | 43 +
gridspec_api/host/nccf_inq_host_struct_grid_ids.c | 39 +
gridspec_api/host/nccf_inq_host_timedataids.c | 41 +
gridspec_api/host/nccf_inq_host_timefileindex.c | 73 +
gridspec_api/host/nccf_inq_host_timefilename.c | 43 +
gridspec_api/host/nccf_put_host.c | 183 +
.../host/tst_cube_sphere_multi_dims_in_file.c | 498 +
gridspec_api/host/tst_cube_sphere_multi_var.c | 366 +
gridspec_api/host/tst_get_host_three_tile.c | 113 +
gridspec_api/host/tst_nccf_add_host.c | 46 +
gridspec_api/host/tst_nccf_def_host.c | 43 +
gridspec_api/host/tst_nccf_def_host_from_file.c | 28 +
gridspec_api/host/tst_real_data_case.c | 226 +
gridspec_api/host/tst_three_tile_cubed_sphere.c | 373 +
gridspec_api/libcf_gridspec.h | 18 +
gridspec_api/mosaic/Makefile.am | 92 +
{src => gridspec_api/mosaic}/Makefile.in | 641 +-
.../mosaic/copy_grid_for_bogus_data_files.sh | 28 +
gridspec_api/mosaic/nccf_add_mosaic_att.c | 27 +
gridspec_api/mosaic/nccf_compute_mosaic_contacts.c | 315 +
gridspec_api/mosaic/nccf_def_mosaic.c | 87 +
gridspec_api/mosaic/nccf_def_mosaic_from_file.c | 146 +
gridspec_api/mosaic/nccf_free_mosaic.c | 105 +
gridspec_api/mosaic/nccf_inq_mosaic_contactmap.c | 35 +
gridspec_api/mosaic/nccf_inq_mosaic_coordnames.c | 37 +
gridspec_api/mosaic/nccf_inq_mosaic_gridids.c | 27 +
gridspec_api/mosaic/nccf_inq_mosaic_gridname.c | 28 +
gridspec_api/mosaic/nccf_inq_mosaic_gridranges.c | 193 +
gridspec_api/mosaic/nccf_inq_mosaic_ncontacts.c | 26 +
gridspec_api/mosaic/nccf_inq_mosaic_ndims.c | 27 +
gridspec_api/mosaic/nccf_inq_mosaic_ngrids.c | 27 +
gridspec_api/mosaic/nccf_inq_mosaic_tilecontact.c | 37 +
.../mosaic/nccf_inq_mosaic_tileseparator.c | 29 +
gridspec_api/mosaic/nccf_mosaic.h | 122 +
.../mosaic/nccf_print_mosaic_as_polytopes.c | 360 +
gridspec_api/mosaic/nccf_put_mosaic.c | 110 +
gridspec_api/mosaic/nccf_set_mosaic_contact.c | 142 +
gridspec_api/mosaic/tst_1d_mosaic.c | 104 +
gridspec_api/mosaic/tst_big_dimsizes.c | 111 +
gridspec_api/mosaic/tst_bipolar_tripolar_grid.c | 131 +
.../mosaic/tst_bipolar_tripolar_grid_periodic.c | 129 +
gridspec_api/mosaic/tst_cubesphere_mosaic.c | 142 +
.../mosaic/tst_cubesphere_mosaic_grid_ranges.c | 124 +
gridspec_api/mosaic/tst_get_mosaic_grid_ranges.c | 165 +
gridspec_api/mosaic/tst_nccf_set_mosaic_contact.c | 69 +
gridspec_api/mosaic/tst_periodic_grid.c | 165 +
gridspec_api/mosaic/tst_rotation.c | 156 +
gridspec_api/mosaic/tst_sg_mosaic_latlon.c | 106 +
.../mosaic/tst_sg_periodic_mosaic_latlon.c | 103 +
gridspec_api/mosaic/tst_tripolar_zhi.c | 99 +
gridspec_api/mosaic/tst_two_tiles.c | 157 +
gridspec_api/mosaic/tst_two_unequal_in_i_j_tiles.c | 197 +
gridspec_api/mosaic/tst_two_unequal_in_i_tiles.c | 164 +
gridspec_api/regrid/Makefile.am | 77 +
{src => gridspec_api/regrid}/Makefile.in | 575 +-
gridspec_api/regrid/nccf_add_regrid_forbidden.c | 40 +
gridspec_api/regrid/nccf_apply_regrid.c | 61 +
gridspec_api/regrid/nccf_apply_regrid_type.h | 92 +
gridspec_api/regrid/nccf_compute_regrid_weights.c | 444 +
gridspec_api/regrid/nccf_def_regrid.c | 100 +
gridspec_api/regrid/nccf_def_regrid_from_file.c | 87 +
gridspec_api/regrid/nccf_free_regrid.c | 48 +
.../regrid/nccf_get_regrid_weights_pointer.c | 41 +
gridspec_api/regrid/nccf_inq_regrid_nnodes.c | 30 +
gridspec_api/regrid/nccf_inq_regrid_ntargets.c | 30 +
gridspec_api/regrid/nccf_inq_regrid_nvalid.c | 30 +
gridspec_api/regrid/nccf_inq_regrid_weights.c | 101 +
gridspec_api/regrid/nccf_put_regrid.c | 42 +
gridspec_api/regrid/nccf_regrid.h | 88 +
.../regrid/tst_cubesphere_to_lonlat_regrid.c | 398 +
gridspec_api/regrid/tst_lonlat_regrid.c | 211 +
gridspec_api/regrid/tst_lonlat_to_lonlat_regrid.c | 254 +
gridspec_api/regrid/tst_mask.c | 195 +
gridspec_api/regrid/tst_mask2.c | 232 +
gridspec_api/regrid/tst_periodic.c | 247 +
gridspec_api/regrid/tst_periodic2.c | 203 +
gridspec_api/regrid/tst_periodic3.c | 209 +
gridspec_api/regrid/tst_put_and_def_from_file.c | 217 +
gridspec_api/regrid/tst_slanted_lonlat_regrid.c | 226 +
.../regrid/tst_tripolar_to_lonlat_regrid.c | 302 +
.../tst_tripolar_to_lonlat_regrid_from_weights.c | 266 +
include/Makefile.am | 19 +
{gridspec/shared/mosaic => include}/Makefile.in | 253 +-
{src => include}/cferror.h | 5 +-
include/cflistitem.h | 164 +
include/libcf.h | 23 +
src/libcf.h => include/libcf_src.h | 150 +-
{src => include}/nc_tests.h | 2 +-
include/nccf_constants.h | 90 +
include/nccf_errors.h | 54 +
include/nccf_handle_error.h | 20 +
include/nccf_utility_functions.h | 483 +
include/nccf_varObj.h | 332 +
ltmain.sh | 3898 +-
m4/libtool.m4 | 2124 +-
m4/ltoptions.m4 | 13 +-
m4/ltsugar.m4 | 20 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 12 +-
pycf/Makefile.am | 19 +
pycf/Makefile.in | 451 +
pycf/__init__.py | 4 +
pycf/__init__.py.in | 4 +
pycf/generateLibCFConfig.py | 164 +
pycf/libCFConfig.py | 370 +
setup.py.in | 142 +
src/Makefile.am | 163 +-
src/Makefile.in | 499 +-
src/cdTimeConv.c | 2 +-
src/cddrs.h | 2 +-
src/cdms.h | 2 +-
src/cdmsint.h | 2 +-
src/cdunif.h | 2 +-
src/cfcvars.c | 1262 +-
src/cferror.c | 39 +-
src/cffiles.c | 366 +-
src/cflistitem.c | 228 +
src/cfsubsets.c | 61 +-
src/cfvars.c | 196 +-
src/drscdf.h | 2 +-
src/libcfAddOn.c | 18 +
src/libcf_api.f90 | 788 -
src/libcf_int.h | 4 +-
src/nccf_add_id_to_files.c | 62 +
src/nccf_find_indices.c | 44 +
src/nccf_find_indices.h | 208 +
src/nccf_find_next_adjacent.c | 34 +
src/nccf_find_next_adjcnt_index.c | 140 +
src/nccf_find_next_indices.c | 40 +
src/nccf_find_next_indices.h | 86 +
src/nccf_generate_id.c | 84 +
src/nccf_get_bipolar_cap.c | 60 +
src/nccf_get_cubedsphere_grid.c | 56 +
src/nccf_get_distance_in_coord.c | 27 +
src/nccf_get_distance_in_coord.h | 25 +
src/nccf_get_flat_index.c | 14 +
src/nccf_get_linear_weights.c | 32 +
src/nccf_get_linear_weights.h | 163 +
src/nccf_get_multi_index.c | 16 +
src/nccf_get_position.c | 44 +
src/nccf_get_position.h | 48 +
src/nccf_get_start_end_bound_indices.c | 24 +
src/nccf_get_tripolar_grid.c | 64 +
src/nccf_get_tripolar_halfgrid.c | 72 +
src/nccf_handle_error.c | 41 +
src/nccf_index2vector.c | 37 +
src/nccf_index_to_corner_vector.c | 24 +
src/nccf_keyvalue.c | 131 +
src/nccf_keyvalue.h | 91 +
src/nccf_linear_interp.c | 19 +
src/nccf_linear_interp.h | 63 +
src/nccf_linear_interp_mod.c | 20 +
src/nccf_linear_interp_mod.h | 81 +
src/nccf_linesearch_indices.c | 27 +
src/nccf_linesearch_indices.h | 100 +
src/nccf_put_var_slice_text.c | 45 +
src/nccf_solve.c | 52 +
src/nccf_solve.h | 30 +
src/nccf_strerror.c | 115 +
src/nccf_varObj.c | 867 +
src/nccf_varSetData_generic.h | 18 +
src/nccoord.c | 15 +-
src/timeArith.c | 182 +
src/timeConv.c | 399 +
src/tst_coords.c | 17 +-
src/tst_cvars.c | 6 +-
src/tst_example_data.c | 6 +-
src/tst_f03_file.f90 | 139 -
src/tst_files.c | 6 +-
src/tst_linear_interp.c | 427 +
src/tst_listitem.c | 222 +
src/tst_nccf_find_adjacent.c | 93 +
src/tst_nccf_generate_id.c | 75 +
src/tst_nccf_get_bipolar_cap.c | 51 +
src/tst_nccf_get_cubedsphere_grid.c | 74 +
src/tst_nccf_get_flat_index.c | 41 +
src/tst_nccf_get_tripolar_grid.c | 49 +
src/tst_nccf_get_tripolar_halfgrid.c | 75 +
src/tst_nccf_index2vector.c | 41 +
src/tst_nccf_keyvalue.c | 107 +
src/tst_nccf_linear_interp_mask.c | 180 +
src/tst_nccf_varObj.c | 287 +
src/tst_princeton.c | 73 +
src/tst_solve.c | 47 +
src/tst_subsets.c | 6 +-
src/tst_vars.c | 14 +-
src/tst_vert.c | 6 +-
394 files changed, 51266 insertions(+), 74831 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf-libcf.git
More information about the Pkg-grass-devel
mailing list