added def_dim

rfiorella · Jul 5, 2019 · 45ccb61 · 45ccb61
1 parent 92dd174
commit 45ccb61
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/ncint/ncintdispatch.c b/src/ncint/ncintdispatch.c
@@ -39,7 +39,7 @@ NC_Dispatch NCINT_dispatcher = {
     NC4_inq,
     NC4_inq_type,
 
-    NC_RO_def_dim,
+    NC_NCINT_def_dim,
     NC4_inq_dimid,
     NC4_inq_dim,
     NC4_inq_unlimdim,
@@ -53,7 +53,7 @@ NC_Dispatch NCINT_dispatcher = {
     NC4_get_att,
     NC_RO_put_att,
 
-    NC_RO_def_var,
+    NC_NCINT_def_var,
     NC4_inq_varid,
     NC_RO_rename_var,
     NC_NCINT_get_vara,
@@ -205,6 +205,19 @@ NC_NCINT_create(const char* path, int cmode, size_t initialsz, int basepe,
     return PIO_NOERR;
 }
 
+int
+NC_NCINT_def_dim(int ncid, const char *name, size_t len, int *idp)
+{
+    return PIOc_def_dim(ncid, name, len, idp);
+}
+
+int
+NC_NCINT_def_var(int ncid, const char *name, nc_type xtype, int ndims,
+                 const int *dimidsp, int *varidp)
+{
+    return PIOc_def_var(ncid, name, xtype, ndims, dimidsp, varidp);
+}
+
 int
 NC_NCINT_abort(int ncid)
 {

diff --git a/src/ncint/ncintdispatch.h b/src/ncint/ncintdispatch.h
@@ -45,6 +45,13 @@ extern "C" {
                     size_t *chunksizehintp, void *parameters,
                     const NC_Dispatch *dispatch, NC *nc_file);
 
+    extern int
+    NC_NCINT_def_var(int ncid, const char *name, nc_type xtype, int ndims,
+                     const int *dimidsp, int *varidp);
+
+    extern int
+    NC_NCINT_def_dim(int ncid, const char *name, size_t len, int *idp);
+
     extern int
     NC_NCINT_abort(int ncid);
 

diff --git a/tests/ncint/tst_pio_udf.c b/tests/ncint/tst_pio_udf.c
@@ -12,6 +12,9 @@
 #include <mpi.h>
 
 #define FILE_NAME "tst_pio_udf.nc"
+#define VAR_NAME "data_var"
+#define DIM_NAME "dim_x"
+#define DIM_LEN 16
 
 extern NC_Dispatch NCINT_dispatcher;
 
@@ -32,6 +35,7 @@ main(int argc, char **argv)
     printf("*** testing simple use of netCDF integration layer format...");
     {
         int ncid;
+        int dimid, varid;
         int iosysid;
         NC_Dispatch *disp_in;
 
@@ -48,6 +52,8 @@ main(int argc, char **argv)
 
         /* Create an empty file to play with. */
         if (nc_create(FILE_NAME, NC_UDF0, &ncid)) ERR;
+        if (nc_def_dim(ncid, DIM_NAME, DIM_LEN, &dimid)) ERR;
+        if (nc_def_var(ncid, VAR_NAME, NC_INT, 1, &dimid, &varid)) ERR;
         if (nc_close(ncid)) ERR;
 
         /* Check that our user-defined format has been added. */