mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-30 16:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

merged master

Browse Source
This commit is contained in:
Ed Hartnett 2018-11-14 11:17:30 -07:00
commit e270359952
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nc_test4/tst_files6.c
View File

@ -77,7 +77,10 @@ main(int argc, char **argv)
H5P_DEFAULT) < 0) ERR;
if (H5Fclose(hdfid) < 0) ERR;
H5close(); /* Force HDF5 to forget about this file. */
/* Force HDF5 to forget about this file. This resets the error
* stack, so turn off HDF5 error messages again. */
H5close();
H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
/* Now try and open it with netCDF. It will not work. */
if (nc_open(HDF5_FILE_NAME, NC_NOWRITE, &ncid) != NC_EHDFERR) ERR;

12
nc_test4/tst_rename.c
View File

@ -130,7 +130,7 @@ main(int argc, char **argv)
char *file_names[] = {FILE_NAME3, FILE_NAME4};
int format;
fprintf(stderr,"*** Testing netcdf rename bugs and fixes.\n");
printf("*** Testing netcdf rename bugs and fixes.\n");
/* nc_set_log_level(5); */
for (format = 0; format < NUM_FORMATS; format++)
@ -142,7 +142,7 @@ main(int argc, char **argv)
float rh_in[DIM_LEN];
int ii;
fprintf(stderr,"*** Test Charlie's test for renaming without enddef...");
printf("*** Test Charlie's test for renaming without enddef...");
{
int ncid, dimid, varid;
@ -175,7 +175,7 @@ main(int argc, char **argv)
}
SUMMARIZE_ERR;
fprintf(stderr,"*** Test Charlie's test for renaming with one enddef...");
printf("*** Test Charlie's test for renaming with one enddef...");
{
int ncid, dimid, varid;
@ -217,7 +217,7 @@ main(int argc, char **argv)
}
SUMMARIZE_ERR;
fprintf(stderr,"*** Test Charlie's test for renaming with enddef...");
printf("*** Test Charlie's test for renaming with enddef...");
{
int ncid, dimid, varid;
float data[DIM1_LEN] = {0, 90.0, 180.0, 270.0};
@ -427,7 +427,7 @@ main(int argc, char **argv)
}
SUMMARIZE_ERR;
fprintf(stderr,"*** Test renaming just coordinate variable for %s...",
printf("*** Test renaming just coordinate variable for %s...",
fmt_names[format]);
{
if (create_test_file(file_names[format], formats[format])) ERR;
@ -452,7 +452,7 @@ main(int argc, char **argv)
}
SUMMARIZE_ERR;
fprintf(stderr,"*** Test renaming just coordinate dimension for %s...",
printf("*** Test renaming just coordinate dimension for %s...",
fmt_names[format]);
{
if (create_test_file(file_names[format], formats[format])) ERR;