Commit Graph

5546 Commits

Author SHA1 Message Date
Ward Fisher
1783e81bfc
Merge branch 'master' into patch-23 2018-07-23 15:34:27 -06:00
Ward Fisher
ea81baeec9
Merge pull request #1069 from NetCDF-World-Domination-Council/ejh_cmake_fix
cmake warning fix for nc_set_log_level warning from netcdf.h
2018-07-23 15:33:37 -06:00
Ed Hartnett
c094baea42 merged master 2018-07-23 13:53:07 -06:00
Ed Hartnett
12b76d2dc5 merged master 2018-07-23 13:18:21 -06:00
Ed Hartnett
d77d12cc58 fixed cmake issue 2018-07-23 11:16:12 -06:00
Ed Hartnett
ee944c3fbb merged master 2018-07-23 10:58:14 -06:00
Ed Hartnett
ef7b525ce4 merged master 2018-07-23 09:45:39 -06:00
Ed Hartnett
1424391a4c merged upstream/master 2018-07-23 09:42:48 -06:00
Ward Fisher
d0ab40a5fb
Merge pull request #1073 from Unidata/pr-aggregation.wif
Merging multiple pull requests
2018-07-23 09:37:32 -06:00
Ed Hartnett
da7af8f1e7 comment cleanup 2018-07-21 15:36:58 -06:00
Ed Hartnett
2cc3d10f4b comment cleanup 2018-07-21 10:47:01 -06:00
Ed Hartnett
5a52f28bb7 further condensing code 2018-07-21 10:43:36 -06:00
Ed Hartnett
48d6473844 further condensing code 2018-07-21 09:31:51 -06:00
Ed Hartnett
afa7c0a87d further condensing code 2018-07-21 09:26:16 -06:00
Ed Hartnett
21dade79a9 use same callback function for global and var atts 2018-07-21 09:20:22 -06:00
Ed Hartnett
b56a8edcc9 code cleanup 2018-07-21 09:09:12 -06:00
Ed Hartnett
a17d66f66b clean up 2018-07-21 07:35:27 -06:00
Ed Hartnett
7aed50a902 performance test for fast global att reads 2018-07-21 07:29:12 -06:00
Ed Hartnett
43f094ca50 changing the way global atts are read 2018-07-21 06:46:29 -06:00
Ed Hartnett
fcbd5226a7 clean up 2018-07-20 12:39:02 -06:00
Ed Hartnett
8fdea13227 merged ejh_change_attsperf 2018-07-20 12:27:19 -06:00
Ed Hartnett
9908e538bb merged ejh_global_att_read 2018-07-20 12:26:36 -06:00
Ed Hartnett
cafd2eaaf9 more changes to hande different scales 2018-07-20 12:19:20 -06:00
Ed Hartnett
0deb4635d5 fixed master 2018-07-20 10:24:58 -06:00
Ed Hartnett
4dbcd03f02 fixed num_vars bug 2018-07-20 09:43:53 -06:00
Ed Hartnett
67e31b9271 undid changes to CMakeList.txt 2018-07-20 06:32:00 -06:00
Ed Hartnett
0f21e3495e changed tst_attsperf 2018-07-20 06:26:42 -06:00
Ed Hartnett
0d8dd16231 removed use of hdfid from libsrc4 directory 2018-07-19 13:13:23 -06:00
Ed Hartnett
9849c23773 now using NC_HDF5_FILE_INFO_T for hdf5 specific file info 2018-07-19 13:07:13 -06:00
Ed Hartnett
a545c1526d further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 13:00:34 -06:00
Ed Hartnett
4fb0e9d248 further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:51:46 -06:00
Ed Hartnett
582bd5ec1a further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:47:43 -06:00
Ed Hartnett
b1a478a497 further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:44:02 -06:00
Ed Hartnett
43b6aeca34 further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:39:49 -06:00
Ed Hartnett
2d53a8ece0 moving hdf5 field to NC_HDF5_FILE_INFO_T 2018-07-19 12:32:06 -06:00
Ed Hartnett
cd95f1fb24 continuing to add NC_HDF5_FILE_INFO_T to the code 2018-07-19 09:13:48 -06:00
Ed Hartnett
802c1a82f1 starting to add NC_HDF5_FILE_INFO_T 2018-07-19 08:50:53 -06:00
Ed Hartnett
d1198a3667 whitespace cleanup 2018-07-19 07:33:48 -06:00
Ed Hartnett
9b0192fe94 moved memfile code to libhdf5 2018-07-19 07:26:27 -06:00
Ed Hartnett
3c0abc3d28 moved hdf5 var code to hdf5var.c 2018-07-19 07:23:03 -06:00
Ed Hartnett
bdca4313c4 split nc4var.c 2018-07-19 07:05:55 -06:00
Ward Fisher
b1078c13f0 Merge branch 'ejh_hdf5internal' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2018-07-18 14:12:26 -06:00
Ward Fisher
91fd1de453 Merge remote-tracking branch 'origin/interndocs.dmh' into pr-aggregation.wif 2018-07-18 14:09:47 -06:00
Ward Fisher
a741bec8d9 Merge branch 'doc-cdf5' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-18 14:08:20 -06:00
Ward Fisher
0904a8d37d
Merge branch 'master' into patch-23 2018-07-17 15:54:19 -06:00
Ward Fisher
d6ed28291a
Merge branch 'master' into doc-cdf5 2018-07-17 15:53:56 -06:00
Ward Fisher
2f791cc749 Merge branch 'enable-cdf5' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-17 11:26:21 -06:00
Ward Fisher
b570d10e01
Merge branch 'master' into enable-cdf5 2018-07-17 11:26:02 -06:00
Ward Fisher
03a473f608 Merge branch '32bit_LFS' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-17 11:02:27 -06:00
Ward Fisher
090523e2c5
Merge branch 'master' into 32bit_LFS 2018-07-17 11:01:52 -06:00