2
0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-07 17:08:02 +08:00
Commit Graph

199 Commits

Author SHA1 Message Date
Wei-keng Liao
116f303182 correct error code for operation not allowed in data mode is NC_ENOTINDEFINE 2018-08-24 21:26:25 -05:00
Ward Fisher
373d0365a1
Merge branch 'master' into default_format 2018-08-24 11:27:07 -06:00
Ed Hartnett
59307c405d removing unneeded function nc4_rec_find_nc_type 2018-08-22 06:29:44 -06:00
Ed Hartnett
8885c75ade removing unneeded lookups 2018-08-22 06:08:19 -06:00
Ed Hartnett
ff1b71a1e4 cleanup of unneeded find functions 2018-08-21 16:46:44 -06:00
Ed Hartnett
580fc89776 cleanup of NC4_abort 2018-08-21 16:41:57 -06:00
Ed Hartnett
f4c36b532f cleanup of NC4_abort 2018-08-21 16:40:32 -06:00
Ed Hartnett
8688b9cbf0 cleanup of NC4_sync 2018-08-21 16:37:12 -06:00
Ed Hartnett
d8c1a6209a removed unneeded lookup function 2018-08-21 11:54:06 -06:00
Ed Hartnett
42b9dc778f removing unneeded function nc4_rec_find_grp 2018-08-21 10:28:44 -06:00
Ed Hartnett
8d0844fa7d removing unneeded function calls 2018-08-21 10:20:32 -06:00
Ed Hartnett
e0bdcf5b64 clean up 2018-08-21 08:40:53 -06:00
Ed Hartnett
06db182eff cleaned up error handling in nc4_close_netcdf4_file 2018-08-21 08:32:39 -06:00
Ed Hartnett
c02f976d84 more tests 2018-08-20 17:05:29 -06:00
Ed Hartnett
fda87a8d5f now check for max of 32 dims for a var in HDF5 file 2018-08-20 09:53:08 -06:00
Ed Hartnett
f77350c66d testing error for HDF5 file with circular groups 2018-08-20 09:26:50 -06:00
Ed Hartnett
72805a5eed tracking enum issue 2018-08-20 05:45:30 -06:00
Ed Hartnett
0ad7118064 no longer delete/re-create att if we dont have to 2018-08-20 05:10:34 -06:00
Ed Hartnett
e7b7430e75 trying to sort out nctest issue 2018-08-19 05:55:05 -06:00
Ed Hartnett
412c18a4a1 fixed error handling in read_coord_dimids 2018-08-18 05:59:30 -06:00
Ed Hartnett
acc22e0c54 checking NULLs in function 2018-08-14 06:28:28 -06:00
Ed Hartnett
a0bea92919 fixed problem of not calling NC_ versions of vars and varm functions for extra error checking 2018-08-14 05:04:09 -06:00
Ed Hartnett
ec3d3a3d06 return error for put_vara calls with NULL start 2018-08-13 09:03:49 -06:00
Ed Hartnett
19222632b4 return error for put_vars calls with NULL start 2018-08-13 08:48:20 -06:00
Ed Hartnett
80d4b9fbb9 checking for user-defined type in put_vars 2018-08-09 10:13:31 -06:00
Ed Hartnett
252f1c3af5 further development 2018-08-09 07:21:49 -06:00
Ed Hartnett
2e7a7ea94e moved put and get vars functions from nc4hdf5.c to hdf5var.c 2018-08-09 06:44:38 -06:00
Ed Hartnett
5e9ffcaab3 renamed get_fill_value 2018-08-09 06:41:54 -06:00
Ed Hartnett
06ecd2412d merged master 2018-08-08 05:54:03 -06:00
Ed Hartnett
4a16369e0e undid inadvertant change 2018-08-06 16:42:59 -06:00
Ed Hartnett
edfa5bc442 finished fixes 2018-08-06 16:34:00 -06:00
Ed Hartnett
bf7ad679f7 finished fixes 2018-08-06 16:33:44 -06:00
Ed Hartnett
ad25807bd1
Merge branch 'master' into ejh_global_att_read 2018-08-06 16:30:26 -06:00
Ward Fisher
19a3472a45
Merge branch 'master' into ejh_hdf5_sep_file_info 2018-08-06 11:33:08 -06:00
Ward Fisher
5f89204bdb
Merge branch 'master' into ejh_func_cleanup3 2018-08-06 11:32:45 -06:00
Ed Hartnett
56a57a57f0 bring in changes from lazy vars branch 2018-08-06 10:57:19 -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
f443facac5 merged ejh_hdf5_sep_file_info 2018-08-06 09:57:17 -06:00
Dennis Heimbigner
f46b65c602 Clear up coverity complaints
with respect to this coverity report.

https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZApv53Ry-2FReUME-2Fmei1et81WqdBwm5AxSAYBM9iFSmbw-3D-3D_YxTn3nq1kZ9CfXcyYFaB2DtJSVHTn8U-2BK0LV-2FDyLYKcFvnwYJ7pm2zFB5UovsEUh5miIfeCfQzYxpN9HYcdqs9sKVjtklOkfPIjEpg0Tj8G9wiptznJeX-2FO4PrqJA1ViQYtQfpjugq01XGMQ3-2Bll42dUMxrmbdYSqi8T7bCcANC5evyZs4MKvmAWXt1bnPaHcOYJDN-2FUt-2FJTlhwu91HyR7h-2FnkvMY9paYUNB1gxiyUA-3D
2018-08-04 13:22:29 -06:00
Ward Fisher
59e98ef087
Merge branch 'master' into default_format 2018-08-03 10:59:41 -06:00
Ed Hartnett
b9afdee6cd merged master 2018-07-31 19:44:28 -06:00
Ed Hartnett
7ab6d7bdda
Merge branch 'master' into ejh_global_att_read 2018-07-31 19:32:36 -06:00
Ed Hartnett
66b1884f41 fixed merge problem 2018-07-29 02:35:53 -06: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
Ed Hartnett
df15707488
Merge branch 'master' into ejh_hdf5_sep_file_info 2018-07-28 08:16:26 -06:00
Ed Hartnett
37d2fa902e
Merge branch 'master' into ejh_hdf5_sep 2018-07-27 17:37:55 -06:00
Ed Hartnett
5631fa512a merged master 2018-07-24 01:51:51 -06:00
Ed Hartnett
c094baea42 merged master 2018-07-23 13:53:07 -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
da7af8f1e7 comment cleanup 2018-07-21 15:36:58 -06:00
Ed Hartnett
2cc3d10f4b comment cleanup 2018-07-21 10:47:01 -06:00
Ed Hartnett
5a52f28bb7 further condensing code 2018-07-21 10:43:36 -06:00
Ed Hartnett
48d6473844 further condensing code 2018-07-21 09:31:51 -06:00
Ed Hartnett
afa7c0a87d further condensing code 2018-07-21 09:26:16 -06:00
Ed Hartnett
21dade79a9 use same callback function for global and var atts 2018-07-21 09:20:22 -06:00
Ed Hartnett
b56a8edcc9 code cleanup 2018-07-21 09:09:12 -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
fcbd5226a7 clean up 2018-07-20 12:39:02 -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
a545c1526d further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 13:00:34 -06:00
Ed Hartnett
4fb0e9d248 further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:51:46 -06:00
Ed Hartnett
582bd5ec1a further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:47:43 -06:00
Ed Hartnett
b1a478a497 further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:44:02 -06:00
Ed Hartnett
43b6aeca34 further movement towards NC_HDF5_FILE_INFO_T 2018-07-19 12:39:49 -06:00
Ed Hartnett
2d53a8ece0 moving hdf5 field to NC_HDF5_FILE_INFO_T 2018-07-19 12:32:06 -06:00
Ed Hartnett
cd95f1fb24 continuing to add NC_HDF5_FILE_INFO_T to the code 2018-07-19 09:13:48 -06:00
Ed Hartnett
d1198a3667 whitespace cleanup 2018-07-19 07:33:48 -06:00
Ed Hartnett
9b0192fe94 moved memfile code to libhdf5 2018-07-19 07:26:27 -06:00
Ed Hartnett
3c0abc3d28 moved hdf5 var code to hdf5var.c 2018-07-19 07:23:03 -06:00
Ed Hartnett
bdca4313c4 split nc4var.c 2018-07-19 07:05:55 -06:00
Ed Hartnett
32c165ce2a fixed parallel build problem 2018-07-17 10:15:16 -06:00
Ed Hartnett
752e76df22 cleanup 2018-07-17 09:03:19 -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
9354535ae4 moved code to hdf5create.c 2018-07-17 07:55:27 -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
Ed Hartnett
d801425b78
Merge branch 'master' into ejh_hdf5internal 2018-07-14 13:01:14 -06:00
Ed Hartnett
786c5a8f2e moved hdf5 specific header stuff to hdf5internal.h 2018-07-12 07:05:21 -06:00
Ward Fisher
9209a2ede5
Merge branch 'master' into interndocs.dmh 2018-07-10 16:00:39 -06:00
Ed Hartnett
044b13fe34 fixed another clang warning 2018-07-06 06:41:36 -06:00
Dennis Heimbigner
40013b72f6 The pr does some cleanup on the internal documentation
in the docs directory.
1. Add a new internal document -- testserver.dox -- to describe
   how to set up and maintain the dap test server.
2. It moves the internal documentation (internal.dox, indexing.dox,
   and testserver.dox) to later in the documentation table of contents.
3. Cleanup the formatting of the internal documents.
4. Cleanup some minor doxygen issues in other files.
2018-06-29 15:06:27 -06:00
Ed Hartnett
697f033823 renamed NC_HDF5_FILE_INFO to NC_FILE_INFO 2018-06-22 07:08:09 -06:00
Ed Hartnett
d4967405b4 cleaned up 2018-06-21 19:49:30 -06:00
Ed Hartnett
eafe151f13 added test 2018-06-19 14:59:07 -06:00
Ed Hartnett
77936f2884 more progress towards lazy read of atts for vars 2018-06-19 08:25:19 -06:00
Ed Hartnett
a01da62481 isolating code to read variable attributes 2018-06-19 07:51:49 -06:00
Ed Hartnett
81add527f2 lazy read of global atts now working 2018-06-19 07:39:42 -06:00
Ed Hartnett
2dc6676bd8 now checking for classic model 2018-06-19 07:30:08 -06:00
Ed Hartnett
6b90169278 switching to att_not_read 2018-06-19 05:05:44 -06:00
Ed Hartnett
dad70cf880 more lazy atts 2018-06-19 04:54:03 -06:00
Ed Hartnett
5f850408c3 adding lazy att handling 2018-06-19 04:40:00 -06:00
Ed Hartnett
401bc33339 added function check_for_classic_model() 2018-06-19 04:08:08 -06:00
Ed Hartnett
2549bd7d70 clean up 2018-06-17 08:20:51 -06:00
Ed Hartnett
c7ab5573b4 removed get/put vara functions 2018-06-16 10:39:50 -06:00