Commit Graph

526 Commits

Author SHA1 Message Date
Ed Hartnett
d8c1a6209a removed unneeded lookup function 2018-08-21 11:54:06 -06:00
Ed Hartnett
990a75d5d7 clean up of find_grp functions 2018-08-21 11:23:12 -06:00
Ed Hartnett
ece953458d cleanup of group find functions 2018-08-21 10:50:32 -06:00
Ed Hartnett
06db182eff cleaned up error handling in nc4_close_netcdf4_file 2018-08-21 08:32:39 -06:00
Ed Hartnett
5b2f6ecebc changed literal in netcdf.h 2018-08-18 05:22:07 -06:00
Ed Hartnett
d6c0cbe234 removing unneeded file lookups 2018-08-14 08:56:58 -06:00
Ed Hartnett
b5999278cc added nc4_find_grp_h5_var 2018-08-09 06:47:45 -06:00
Ed Hartnett
5e9ffcaab3 renamed get_fill_value 2018-08-09 06:41:54 -06:00
Ed Hartnett
5a452c5815 bring in changes from lazy vars branch 2018-08-06 10:49:31 -06:00
Ed Hartnett
9dc99c8a04 cleaned up some functions in preparation for lazy vars 2018-08-06 10:16:49 -06:00
Ed Hartnett
354b89c363 merged upstream/master 2018-08-06 08:36:44 -06:00
Ward Fisher
59e98ef087
Merge branch 'master' into default_format 2018-08-03 10:59:41 -06:00
Ward Fisher
81c91eb519 Made some changes to export symbols on Windows builds. 2018-08-02 14:58:47 -06:00
Ed Hartnett
b9afdee6cd merged master 2018-07-31 19:44:28 -06:00
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
0ee68a3263 This commit fixes the logical problem of using the default file formats.
The fix includes the following changes.
1. Checking and using the default file format at file create time is now
   done only when the create mode (argument cmode) does not include any
   format related flags, i.e. NC_64BIT_OFFSET, NC_64BIT_DATA,
   NC_CLASSIC_MODEL, and NC_NETCDF4.
2. Adjustment of cmode based on the default format is now done in
   NC_create() only. The idea is to adjust cmode before entering the
   dispatcher's file create subroutine.
3. Any adjustment of cmode is removed from all I/O dispatchers, i.e.
   NC4_create(), NC3_create(), and NCP_create().
4. Checking for illegal cmode has been done in check_create_mode() called
   in NC_create(). This commit removes the redundant checking from
   NCP_create().
5. Remove PnetCDF tests in nc_test/tst_names.c, so it can focus on testing
   all classic formats and netCDF4 formats.

Two new test programs are added. They can be used to test netCDF with and
without this commit.
1. nc_test/tst_default_format.c
2. nc_test/tst_default_format_pnetcdf.c (use when PnetCDF is enabled).
2018-07-28 11:18:28 -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
5631fa512a merged master 2018-07-24 01:51:51 -06: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
5a52f28bb7 further condensing code 2018-07-21 10:43:36 -06:00
Ed Hartnett
afa7c0a87d further condensing code 2018-07-21 09:26:16 -06:00
Ed Hartnett
a17d66f66b clean up 2018-07-21 07:35:27 -06:00
Ed Hartnett
7aed50a902 performance test for fast global att reads 2018-07-21 07:29:12 -06:00
Ed Hartnett
43f094ca50 changing the way global atts are read 2018-07-21 06:46:29 -06:00
Ed Hartnett
9849c23773 now using NC_HDF5_FILE_INFO_T for hdf5 specific file info 2018-07-19 13:07:13 -06:00
Ed Hartnett
802c1a82f1 starting to add NC_HDF5_FILE_INFO_T 2018-07-19 08:50:53 -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
Ward Fisher
bb2e8da129
Merge branch 'master' into 32bit_LFS 2018-06-21 15:51:20 -06:00
Ed Hartnett
b524cd04bc adding calls to get var atts when needed 2018-06-19 07:56:54 -06:00
Ed Hartnett
a01da62481 isolating code to read variable attributes 2018-06-19 07:51:49 -06:00
Ed Hartnett
6b90169278 switching to att_not_read 2018-06-19 05:05:44 -06:00
Ed Hartnett
5f850408c3 adding lazy att handling 2018-06-19 04:40:00 -06:00
Ed Hartnett
93278a8561 merged in outstanding PRs 2018-06-19 03:59:00 -06:00
Ed Hartnett
c7ab5573b4 removed get/put vara functions 2018-06-16 10:39:50 -06:00
Ed Hartnett
416da4cb4f took out is_long for vars functions 2018-06-16 05:55:50 -06:00
Ed Hartnett
19ae8b47d1 took out src_long and dest_long again. Getting good at it! ;-) 2018-06-16 05:33:04 -06:00
Wei-keng Liao
ab2dbc0d84 Promote NC_var member len from size_t to long long to fix some problems of large-variable tests on 320bit platforms. 2018-06-15 15:08:05 -05:00
Ed Hartnett
2ca8526278 merged master 2018-06-14 16:57:38 -06:00
Ed Hartnett
8c879b7d2b removed unwanted ifdefs 2018-06-09 19:01:47 -06:00
Ed Hartnett
037a3cb58c reverting 2018-06-09 06:17:52 -06:00
Ed Hartnett
09366bf43b removed longs from conver_type again 2018-06-09 06:14:14 -06:00
Ward Fisher
5fe7d0ffad
Merge branch 'master' into ejh_udf 2018-06-08 16:52:20 -06:00
Ward Fisher
1d789d9d39 Additional reconciliation 2018-06-08 15:50:39 -06:00
Ward Fisher
df4942d280 Merge branch 'master' into vars.dmh 2018-06-08 15:50:28 -06:00
Ed Hartnett
03d1a7c7cc
Merge branch 'master' into ejh_logging 2018-06-08 03:17:01 -06:00
Ed Hartnett
367d7c2a57 merged master 2018-06-07 18:36:25 -06:00
Ed Hartnett
8d08b8c236 more magic numbers 2018-06-06 13:09:16 -06:00
Ed Hartnett
9a2782b56c got long working with master 2018-06-05 14:40:49 -06:00
Ed Hartnett
17da700a5c adding support for magic numbers 2018-06-05 12:22:38 -06:00
Ed Hartnett
2e831e9bbe initialization of user-defined formats 2018-06-02 08:43:34 -06:00
Dennis Heimbigner
2f1daaa61e Merge branch 'master' into vars.dmh 2018-05-30 10:45:00 -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