Commit Graph

5463 Commits

Author SHA1 Message Date
Ward Fisher
ac805e3ebd
Merge pull request #1071 from NetCDF-World-Domination-Council/ejh_split_hdf5file
Split hdf5file.c into hdf5file.c, hdf5create.c, and hdf5open.c
2018-07-27 15:59:46 -06:00
Ed Hartnett
a1437c5ca0
Merge branch 'master' into ejh_split_hdf5file 2018-07-23 18:51:29 -06:00
Ward Fisher
000e7a054d
Merge pull request #1045 from gsjaardema/patch-23
Eliminate NC_Dispatch redefinition compiler warning
2018-07-23 17:19:59 -06:00
Ed Hartnett
0d43a4185d
Merge branch 'master' into ejh_split_hdf5file 2018-07-23 16:32:18 -06:00
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
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
0deb4635d5 fixed master 2018-07-20 10:24:58 -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
Ward Fisher
35d1d73e53
Merge branch 'master' into patch-24 2018-07-17 10:58:58 -06:00
Ed Hartnett
32c165ce2a fixed parallel build problem 2018-07-17 10:15:16 -06:00
Ed Hartnett
752e76df22 cleanup 2018-07-17 09:03:19 -06:00
Ed Hartnett
b0f9f965b7 clean up, moved hdf5open and hdf5create code to their own code files 2018-07-17 08:29:47 -06:00
Ed Hartnett
858f1dce02 split out hdf5create.c code 2018-07-17 08:00:47 -06:00
Ed Hartnett
396124c0ca merged ejh_hdf5internal 2018-07-17 07:56:09 -06:00
Ed Hartnett
9354535ae4 moved code to hdf5create.c 2018-07-17 07:55:27 -06:00
Ed Hartnett
a8faab2f93 nc_set_log_level only available for netcdf-4 builds 2018-07-16 15:38:45 -06:00
Ed Hartnett
99c4f82f2e only define nc_set_log_level() to nothing for netcdf-4 builds 2018-07-16 13:47:18 -06:00
Ed Hartnett
52d7985aec moving definition of nc_set_log_level() to nothing 2018-07-16 13:41:36 -06:00
Ed Hartnett
413f8c2886 moving definition of nc_set_log_level() to nothing 2018-07-16 13:36:03 -06:00
Ed Hartnett
6a27bbcec6 moving definition of nc_set_log_level() to nothing 2018-07-16 12:09:40 -06:00
Ed Hartnett
c4196ce5ec moving definition of nc_set_log_level() to nothing 2018-07-16 11:52:03 -06:00
Ed Hartnett
9ac15aac46 attempting to fix ENABLE_SET_LOG_LEVEL problem with cmake build 2018-07-16 11:45:26 -06:00
Ed Hartnett
966fec740d attempting to fix ENABLE_SET_LOG_LEVEL problem with cmake build 2018-07-16 08:39:23 -06:00
Ed Hartnett
cdfa6abad8 attempting to fix ENABLE_SET_LOG_LEVEL problem with cmake build 2018-07-16 08:34:00 -06:00
Ed Hartnett
82d0302fa9 attempting to fix ENABLE_SET_LOG_LEVEL problem with cmake build 2018-07-16 06:39:15 -06:00
Ed Hartnett
03de993ce5 attempting to fix ENABLE_SET_LOG_LEVEL problem with cmake build 2018-07-16 06:31:44 -06:00
Ed Hartnett
987ce47f5e removed duplicate handling of logging 2018-07-16 06:24:57 -06:00
Ed Hartnett
7fdf22f2a7 fixing parens 2018-07-16 06:23:16 -06:00
Ed Hartnett
6e6403bb0f merged ejh_hdf5internal 2018-07-16 05:50:29 -06:00
Ed Hartnett
2dd0ac6319 clean up 2018-07-16 04:50:15 -06:00
Ed Hartnett
d801425b78
Merge branch 'master' into ejh_hdf5internal 2018-07-14 13:01:14 -06:00
Ward Fisher
178f322bd3
Merge pull request #1063 from Unidata/pr-aggregation.wif
Combining some PR's
2018-07-14 11:30:18 -06:00
Dennis Heimbigner
390f3ec0ad
Add warning about user formats
Add warning about this capability being experimental
2018-07-13 11:47:58 -06:00
Dennis Heimbigner
fc3416691c
Typo 2018-07-13 11:41:57 -06:00
Ward Fisher
d7ef36bb6f
Merge branch 'master' into doc-cdf5 2018-07-13 11:02:55 -06:00
Ward Fisher
f4b5f4dc06 Merge branch 'pnetcdf_doc' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif 2018-07-13 11:02:40 -06:00
Ward Fisher
8d150a56b3 Merge remote-tracking branch 'origin/interndocs.dmh' into pr-aggregation.wif 2018-07-13 11:01:43 -06:00