Ed Hartnett
9a2782b56c
got long working with master
2018-06-05 14:40:49 -06:00
Ward Fisher
e289404896
Merge pull request #1007 from NetCDF-World-Domination-Council/ejh_all_tests
...
Test code for parallel I/O issue, enum issue, and some other issues
2018-06-05 13:54:04 -06:00
Ed Hartnett
112a200cc9
Merge branch 'master' into ejh_all_tests
2018-05-30 17:39:19 -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
011e85cea4
merge ejh_par_tests
2018-05-30 05:06:25 -06:00
Ed Hartnett
3949bd61bc
merge ejh_par_leak
2018-05-30 05:03:42 -06:00
Ed Hartnett
5ac7df7ae1
merge ejh_more_tests
2018-05-30 05:01:19 -06:00
Ed Hartnett
fcc6091600
merged ejh_test_def_var_extra
2018-05-30 04:59:10 -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
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
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
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
7d117cc0ce
removed more dead code
2018-05-17 05:58:57 -06:00
Ed Hartnett
7f4717bf97
removed more dead code
2018-05-17 05:58:46 -06:00
Ed Hartnett
bab5ef7549
fixed printf statement
2018-05-17 05:53:10 -06:00
Ed Hartnett
df60e5917a
added test
2018-05-17 05:50:30 -06:00
Ed Hartnett
6c6c86ef96
added tests, cleaned up test
2018-05-17 05:45:51 -06:00
Ed Hartnett
ff6a82d051
Merge branch 'master' into ejh_par_leak
2018-05-17 04:24:46 -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
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
Ward Fisher
3f83cc4926
Merge branch 'master' into inmem2.dmh
2018-05-16 14:24:19 -06:00
Ed Hartnett
7b41bded0f
fixed comments
2018-05-16 10:24:51 -06:00
Ed Hartnett
72a7ddb15a
changes from other branches to get CI to pass
2018-05-16 10:03:24 -06:00
Ed Hartnett
2b44cd3470
don't use MPI_COMM_WORLD as default
2018-05-16 09:36:32 -06:00
Ed Hartnett
485f42a51b
no longer allow default communicator of MPI_COMM_WORLD for open
2018-05-16 09:27:40 -06:00
Ed Hartnett
978fc99f3f
fixed indentation
2018-05-16 08:35:32 -06:00
