Commit Graph

5170 Commits

Author SHA1 Message Date
Ed Hartnett
8996b36c66 fixed make clean in docs 2018-06-05 11:30:59 -06:00
Ed Hartnett
7e2ffd0071 more documentation 2018-06-04 06:44:05 -06:00
Ed Hartnett
fd1a3383c7 adding documentation 2018-06-04 06:21:56 -06:00
Ed Hartnett
d556dcb2c9 udf1 stuff 2018-06-03 06:28:55 -06:00
Ed Hartnett
01d1364331 user defined formats working 2018-06-03 06:14:23 -06:00
Ed Hartnett
2e831e9bbe initialization of user-defined formats 2018-06-02 08:43:34 -06:00
Ed Hartnett
0f0cd5085a configure options for user-defined formats 2018-06-02 07:13:08 -06:00
Ed Hartnett
926ce56775 fixing NC4_show_metadata for windows 2018-06-01 08:10:16 -06:00
Ed Hartnett
d7badd18d9 messing with NC4_show_metadata 2018-06-01 07:09:44 -06:00
Ed Hartnett
21f60c64f5 merged master 2018-06-01 05:51:28 -06:00
Ward Fisher
2eb02ad89e
Merge pull request #1008 from Unidata/f03fix.dmh
Fix use of 'int' to represent 'hid_t' that caused HDF5 1.10 to fail.
2018-05-30 17:31:32 -06:00
Dennis Heimbigner
4b936ee26a Fix use of 'int' to represent 'hid_t' that caused HDF5 1.10 to fail.
re: github issue https://github.com/Unidata/netcdf-fortran/issues/82

This was originally discovered in the Fortran tests, but is
a problem in the C library.

The problem only occurred when using HDF5-1.10.x.  The reason it
failed is that starting with 1.10, the hid_t type was changed
from 32 bits to 64 bits.
The function libsrc4/nc4memcb.c#NC4_image_init was using type int (doh!)
to return the hdf fileid instead of hid_t type.  This, of course,
caused the id to be truncated and in turn later use of the id
caused hdf5 to fail.

Fix is trivial: replace int with hid_t. This also requires a related
change in nc4mem.c.

Also added the test case derived from the original Fortran code.

You would think I would learn...
2018-05-30 14:47:37 -06:00
Ed Hartnett
6992295ef7 getting windows build working 2018-05-30 04:31:15 -06:00
Ed Hartnett
dbacd00c9c fixing windows build problem, plus documentation 2018-05-30 03:29:19 -06:00
Ed Hartnett
aa4032a4f1 merged upstream master 2018-05-30 02:51:32 -06:00
Ed Hartnett
39ad753a3b trying to get UDF working for windows 2018-05-30 02:50:09 -06:00
Ed Hartnett
c5c84645d0 merged master 2018-05-30 02:33:12 -06:00
Ward Fisher
d4332040c4
Merge pull request #1005 from Unidata/misc-changes.wif
Misc changes.wif
2018-05-29 21:37:20 -06:00
Ward Fisher
84fd054a29 Merge branch 'ejh_hdf5_3' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into misc-changes.wif 2018-05-29 15:39:09 -06:00
Ward Fisher
a5ea8411d6 Merge branch 'ejh_comm_info' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into misc-changes.wif 2018-05-29 15:18:27 -06:00
Ed Hartnett
5b56e66096 removed changes to nc4hdf5.c 2018-05-24 15:26:17 -06:00
Ed Hartnett
e0f92efaa2 fixed logging 2018-05-24 14:55:34 -06:00
Ed Hartnett
d26df3fb27 comment cleanup 2018-05-24 14:43:00 -06:00
Ed Hartnett
f2cb4678ee moving HDF5 functions to libhdf5 2018-05-24 14:27:16 -06:00
Ed Hartnett
0c0da02b49
Merge branch 'master' into ejh_comm_info 2018-05-24 13:39:42 -06:00
Ward Fisher
4283b791b5 Misc changes to appveyor testing. 2018-05-24 13:16:56 -06:00
Ward Fisher
491b96066c
Merge pull request #980 from NetCDF-World-Domination-Council/ejh_hdf5_2
more progress towards separating HDF5 code from libsrc4 code
2018-05-24 13:13:27 -06:00
Ed Hartnett
59f9a0c4f0
Merge branch 'master' into ejh_hdf5_2 2018-05-22 07:19:23 -06:00
Ed Hartnett
7a18d361fb
Merge branch 'master' into ejh_udf 2018-05-22 07:19:10 -06:00
Ward Fisher
2a9eaffd67
Merge pull request #619 from Unidata/dapparams.dmh
Alias stringlength url parameter and maxstrlen
2018-05-21 13:36:29 -06:00
Dennis Heimbigner
02bd33f250 Merge branch 'dapparams.dmh' of https://github.com/Unidata/netcdf-c into dapparams.dmh 2018-05-19 16:11:24 -06:00
Dennis Heimbigner
5fc6be9472 Code duplicated; merge failure? 2018-05-18 20:28:51 -06:00
Ed Hartnett
e4bed351c3
Merge branch 'master' into ejh_hdf5_2 2018-05-18 17:15:25 -06:00
Ed Hartnett
4a443d1d76
Merge branch 'master' into ejh_comm_info 2018-05-18 17:15:06 -06:00
Ed Hartnett
a0a8dc6204
Merge branch 'master' into ejh_udf 2018-05-18 17:14:29 -06:00
Ward Fisher
30d41fa44a
Merge branch 'master' into dapparams.dmh 2018-05-18 14:27:55 -06:00
Ed Hartnett
29427ef3ec
Merge branch 'master' into ejh_comm_info 2018-05-18 05:32:53 -06:00
Ed Hartnett
fb6d19c3bb
Merge branch 'master' into ejh_hdf5_2 2018-05-18 05:32:09 -06:00
Ed Hartnett
fedd8d0f5d
Merge branch 'master' into ejh_udf 2018-05-18 05:31:27 -06:00
Ward Fisher
61a6c0c183
Merge branch 'master' into cleanncgen.dmh 2018-05-17 12:41:03 -06:00
Ward Fisher
5bd8992ff6
Merge pull request #988 from NetCDF-World-Domination-Council/ejh_clean
removed unused function
2018-05-17 12:40:41 -06:00
Ed Hartnett
7552e1588e
Merge branch 'master' into ejh_clean 2018-05-17 04:24:38 -06:00
Ed Hartnett
5a0b1cbe98
Merge branch 'master' into ejh_comm_info 2018-05-17 04:24:29 -06:00
Ed Hartnett
ba2c572f63
Merge branch 'master' into ejh_udf 2018-05-16 16:23:27 -06:00
Ed Hartnett
c8f6aa7d66
Merge branch 'master' into ejh_hdf5_2 2018-05-16 16:22:37 -06:00
Ward Fisher
6f844e8f5e
Merge pull request #992 from Unidata/small-pr-aggregate.wif
Small aggregation of PRs
2018-05-16 16:00:44 -06:00
Ward Fisher
ebe6633006
Merge branch 'master' into dapparams.dmh 2018-05-16 14:34:28 -06:00
Ward Fisher
a8c4c0aa68 Merge remote-tracking branch 'origin/cleanncgen.dmh' into small-pr-aggregate.wif 2018-05-16 14:32:10 -06:00
Ward Fisher
c9d1589c39
Merge branch 'master' into cleanncgen.dmh 2018-05-16 14:31:11 -06:00
Ward Fisher
9c13f3ff8b Merge branch 'ejh_fix_memtest' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into small-pr-aggregate.wif 2018-05-16 14:27:45 -06:00