Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Isolate code depending on v2 API #656

Closed
wants to merge 3 commits into from
Closed

Isolate code depending on v2 API #656

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
498284f
Isolate code depending on v2 API
gsjaardema Nov 16, 2017
44cabac
Add missing include
gsjaardema Nov 16, 2017
872d77c
Merge branch 'master' into patch-6
WardF Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions nc_test4/tst_vars2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <nc_tests.h>
#include "err_macros.h"
#include "netcdf.h"
#include "netcdf_meta.h"

#define FILE_NAME "tst_vars2.nc"
#define NUM_DIMS 1
Expand Down Expand Up @@ -302,7 +303,7 @@ main(int argc, char **argv)
}
SUMMARIZE_ERR;

#ifndef NO_NETCDF_2
#if NC_HAS_NC2
/* The following test is an attempt to recreate a problem occurring
in the cxx tests. The file is created in c++ in nctsts.cpp. */
printf("**** testing fill value with example from cxx tests in v2 api...");
Expand Down Expand Up @@ -387,7 +388,7 @@ main(int argc, char **argv)
ncclose(ncid);
}
SUMMARIZE_ERR;
#endif /* NO_NETCDF_2 */
#endif /* NC_HAS_NC2 */
}

printf("**** testing create order varids...");
Expand Down Expand Up @@ -485,6 +486,7 @@ main(int argc, char **argv)
}
SUMMARIZE_ERR;

#if NC_HAS_NC2
#define VAR_DIMS2 2
printf("*** testing 2D array of NC_FLOAT with v2 API...");
{
Expand All @@ -509,6 +511,7 @@ main(int argc, char **argv)
if (nvars != 1 || ndims != 2 || natts != 0 || recdim != -1) ERR;
ncclose(ncid);
}
#endif /* NC_HAS_NC2 */
SUMMARIZE_ERR;

#define NDIMS 3
Expand Down