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
Wei-keng Liao
0cfd1b6bce
Merge branch 'master' into var_par_access
2018-07-15 16:35:15 -05:00
Wei-keng Liao
739dfa2aa2
PnetCDF does not support per-variable collective/independent data mode change; modify nc_var_par_access to ignore varid
2018-07-15 16:19:21 -05: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
Ward Fisher
178f322bd3
Merge pull request #1063 from Unidata/pr-aggregation.wif
...
Combining some PR's
2018-07-14 11:30:18 -06:00
Wei-keng Liao
c8f3a647b6
add NC_RELAX_COORD_BOUND to netcdf_meta.h.in
2018-07-13 16:32:43 -05: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
Ward Fisher
5806d33924
Merge branch 'master' into interndocs.dmh
2018-07-13 11:01:29 -06:00
Ward Fisher
03b0113350
Merge branch 'master' into 32bit_LFS
2018-07-13 11:00:54 -06:00
Ward Fisher
36f60e7797
Merge branch 'metadata-perf-cmake' of https://github.com/gsjaardema/netcdf-c into pr-aggregation.wif
2018-07-13 11:00:02 -06:00
Ward Fisher
d4d8b0a618
Merge branch 'master' into metadata-perf-cmake
2018-07-13 10:59:50 -06:00
Ward Fisher
485278f911
Merge branch 'master' into pnetcdf_doc
2018-07-12 14:46:03 -06:00
Ward Fisher
37c3b2f3e9
Merge branch 'master' into patch-24
2018-07-12 14:45:48 -06:00
Dennis Heimbigner
3c23254e34
Fix esupport # HYV-329576
...
nc_finalize() -> nc_finalize(void)
2018-07-12 12:14:14 -06:00
Ed Hartnett
3a08d85e13
clean up
2018-07-12 07:08:27 -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
a458df5292
Merge pull request #1060 from Unidata/fix_fortran_test.wif
...
Correct an issue impacting down-stream packages.
2018-07-11 15:02:18 -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
Greg Sjaardema
ddabcda2c2
Test should be off by default
2018-07-11 13:40:37 -04:00
Greg Sjaardema
c3f63b6ffe
Enable metadata_perf test in CMake build
...
Currently defaults to enabled, can change top-level
CMakeLists.txt file to change default to disabled
2018-07-11 13:40:31 -04:00
Ward Fisher
9209a2ede5
Merge branch 'master' into interndocs.dmh
2018-07-10 16:00:39 -06:00
Ward Fisher
ca56fc768c
Merge branch 'master' into enable-cdf5
2018-07-10 16:00:12 -06:00
Ward Fisher
a46d59e426
Merge branch 'master' into 32bit_LFS
2018-07-10 15:59:30 -06:00
Greg Sjaardema
1eb2504043
Fix missing ERR in tst_parallel5.c
...
Missing the ERR macro for a few tests in tst_parallel5.c
2018-07-10 08:12:04 -04:00
Greg Sjaardema
065646cdb2
Merge branch 'master' into patch-23
2018-07-10 08:02:49 -04:00
Ward Fisher
f9aba77eb5
Merge pull request #1050 from NetCDF-World-Domination-Council/ejh_logging
...
Fix clang warnings in tst_vars3.c, hdf5file.c, d4read.c, ncuri.c
2018-07-09 14:39:02 -06:00
Ed Hartnett
39d45e9941
fixed clang warning in ncuri.c
2018-07-06 06:52:02 -06:00
Ed Hartnett
8b902e67c9
fxed another clang warning
2018-07-06 06:49:32 -06:00
Ed Hartnett
044b13fe34
fixed another clang warning
2018-07-06 06:41:36 -06:00
Ed Hartnett
0fed77be82
fixed warning
2018-07-06 06:32:09 -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
Ed Hartnett
fbe2b19f69
merged upstream master
2018-07-06 05:59:15 -06:00
Wei-keng Liao
577fcea506
add missing note about CDF-5 format
2018-07-05 22:54:41 -05:00
Dennis Heimbigner
2f162b72e8
typeo
2018-07-05 11:33:03 -06:00
Wei-keng Liao
87ff13d851
add missing info about building netCDF with PnetCDF support
2018-07-05 12:03:39 -05:00
Dennis Heimbigner
bd96509735
Doxygen is apparently buggy when trying to combine a markdown
...
file with @internal. The equivalent can be faked using
the Doxygen ENABLED_SECTIONS mechanism. See docs/testserver.dox
to see how this is done. So I make --enable-internal-docs
also set ENABLED_SECTIONS = INTERNAL and then used it
in docs/testserver.dox to decide if it needs to be included.
2018-07-01 21:56:59 -06:00
Wei-keng Liao
26f1d9137c
revise #1033 and emulate CMAKE OPTION to use 3rd option AUTO
2018-07-01 19:42:03 -05:00
Dennis Heimbigner
c304b2075b
Merge branch 'master' into interndocs.dmh
2018-06-30 13:56:36 -06:00
Ward Fisher
dca50ac4ba
Merge pull request #1030 from NetCDF-World-Domination-Council/ejh_ifdef_clean
...
ifdef cleanup of netcdf.h
2018-06-30 13:34:39 -06:00
Ward Fisher
68fb79daea
Merge branch 'master' into enable-cdf5
2018-06-30 10:51:40 -06:00
