Ward Fisher
5582466724
Merge branch 'master' into ejh_hdf5_sep
2018-07-31 14:04:55 -06:00
Ward Fisher
90d664b9ec
Merge branch 'has_parallel4' of https://github.com/wkliao/netcdf-c into pr-aggregation.wif
2018-07-31 11:32:54 -06:00
Ward Fisher
334a936732
Merge branch 'master' into relax_coord_bound
2018-07-31 11:26:51 -06:00
Ward Fisher
00f66133af
Merge branch 'master' into has_parallel4
2018-07-30 14:17:41 -06:00
Ed Hartnett
fce57d4498
Merge branch 'master' into ejh_hdf5_sep
2018-07-30 12:13:45 -06:00
Wei-keng Liao
025c7d1bb2
introduce error code NC_EPNETCDF for errors at PnetCDF level
2018-07-29 15:33:08 -05:00
Wei-keng Liao
e154ad609f
Merge branch 'master' into has_parallel4
2018-07-26 01:40:15 -05:00
Wei-keng Liao
5a06155f88
Merge branch 'master' into relax_coord_bound
2018-07-26 01:39:59 -05:00
Ed Hartnett
25021aa847
Merge branch 'master' into ejh_hdf5_sep
2018-07-23 18:52:07 -06:00
Ed Hartnett
a1437c5ca0
Merge branch 'master' into ejh_split_hdf5file
2018-07-23 18:51:29 -06:00
Ward Fisher
1783e81bfc
Merge branch 'master' into patch-23
2018-07-23 15:34:27 -06:00
Ed Hartnett
12b76d2dc5
merged master
2018-07-23 13:18:21 -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
3c0abc3d28
moved hdf5 var code to hdf5var.c
2018-07-19 07:23:03 -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
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
090523e2c5
Merge branch 'master' into 32bit_LFS
2018-07-17 11:01:52 -06:00
Ed Hartnett
32c165ce2a
fixed parallel build problem
2018-07-17 10:15:16 -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
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
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
Wei-keng Liao
d0cb241cfe
add NC_HAS_PARALLEL4 to netcdf_meta.h.in
2018-07-14 18:03:42 -05:00
Ed Hartnett
d801425b78
Merge branch 'master' into ejh_hdf5internal
2018-07-14 13:01:14 -06:00
Wei-keng Liao
c8f3a647b6
add NC_RELAX_COORD_BOUND to netcdf_meta.h.in
2018-07-13 16:32:43 -05:00
Ward Fisher
d7ef36bb6f
Merge branch 'master' into doc-cdf5
2018-07-13 11:02:55 -06:00
Ward Fisher
03b0113350
Merge branch 'master' into 32bit_LFS
2018-07-13 11:00:54 -06:00
Dennis Heimbigner
3c23254e34
Fix esupport # HYV-329576
...
nc_finalize() -> nc_finalize(void)
2018-07-12 12:14:14 -06:00
Ed Hartnett
e00b2ee557
clean up
2018-07-12 07:07:23 -06:00
Ed Hartnett
4484c48964
clean up
2018-07-12 07:06:40 -06:00
Ed Hartnett
786c5a8f2e
moved hdf5 specific header stuff to hdf5internal.h
2018-07-12 07:05:21 -06:00
Ward Fisher
82c9788bb8
Correcting #1057 , also adding fortran tests to travis-ci for the time being.
2018-07-11 13:30:53 -06:00
Ward Fisher
a46d59e426
Merge branch 'master' into 32bit_LFS
2018-07-10 15:59:30 -06:00
Greg Sjaardema
43173957d0
Eliminate compiler warning
...
The `typedef struct NC_Dispatch NC_Dispatch;` declaration is in both netcdf.h and in ncdispatch.h. Even though it is the same declaration, there are compilers which see this as an error and the compilation will fail:
```
In file included from /netcdf-c/include/nc4dispatch.h:15,
from /netcdf-c/libhdf5/hdf5attr.c:16:
/netcdf-c/include/ncdispatch.h:111: error: redefinition of typedef `NC_Dispatch`
/netcdf/netcdf-c/include/netcdf.h:515: note: previous declaration of `NC_Dispatch` was here
```
This is with a very old version of gcc-4.4.7 which isn't used much anymore, but this is the default gcc compiler on RHEL6 so it might be worth fixing.
2018-07-06 08:04:11 -04:00
Wei-keng Liao
577fcea506
add missing note about CDF-5 format
2018-07-05 22:54:41 -05:00
Ed Hartnett
7bb4e8cf4d
Merge branch 'master' into ejh_ifdef_clean
2018-06-27 18:15:37 -06:00
Ward Fisher
3dd9aab138
Merge branch 'master' into ejh_rename
2018-06-27 14:04:58 -06:00
Dennis Heimbigner
1299a0fcee
The Jetstream remote test server is now working.
...
So it now becomes the first default test server to try.
This also means that the dap4 remote testing is enabled.
The only issue to watch is to see if the jetstream-based
server can stay up for significant periods of time.
A uptimerobot (https://uptimerobot.com ) has been set ups
to monitor this hourly, so we shall see.
2018-06-26 13:58:45 -06:00
Ed Hartnett
5100b9c5f7
merged ejh_rename
2018-06-25 17:09:00 -06:00
Ed Hartnett
e28405744c
merged master
2018-06-25 17:08:22 -06:00
Ed Hartnett
697f033823
renamed NC_HDF5_FILE_INFO to NC_FILE_INFO
2018-06-22 07:08:09 -06:00