Renamed DefPrec/InqPrec to DefDatatype/InqDatatype.

src/cdi.h

@@ -883,11 +883,11 @@ void    gridInqXstdname(int gridID, char *xstdname);
 /*      gridInqYstdname: Get the standard name of a Y-axis */
 void    gridInqYstdname(int gridID, char *ystdname);
 
-/*      gridDefPrec: Define the precision of a Grid */
-void    gridDefPrec(int gridID, int prec);
+/*      gridDefDatatype: Define the precision of a Grid */
+void    gridDefDatatype(int gridID, int prec);
 
-/*      gridInqPrec: Get the precision of a Grid */
-int     gridInqPrec(int gridID);
+/*      gridInqDatatype: Get the precision of a Grid */
+int     gridInqDatatype(int gridID);
 
 /*      gridInqXval: Get one value of a X-axis */
 double  gridInqXval(int gridID, int index);
@@ -1072,8 +1072,8 @@ void    zaxisInqUnits(int zaxisID, char *units);
 /*      zaxisInqStdname: Get the standard name of a Z-axis */
 void    zaxisInqStdname(int zaxisID, char *stdname);
 
-void    zaxisDefPrec(int zaxisID, int prec);
-int     zaxisInqPrec(int zaxisID);
+void    zaxisDefDatatype(int zaxisID, int prec);
+int     zaxisInqDatatype(int zaxisID);
 
 void    zaxisDefPositive(int zaxisID, int positive);
 int     zaxisInqPositive(int zaxisID);

src/cdiFortran.c

@@ -370,8 +370,8 @@ FCALLSCSUB2 (gridDefYunits, GRIDDEFYUNITS, griddefyunits, INT, STRING)
 FCALLSCSUB2 (gridInqYunits, GRIDINQYUNITS, gridinqyunits, INT, PSTRING)
 FCALLSCSUB2 (gridInqXstdname, GRIDINQXSTDNAME, gridinqxstdname, INT, PSTRING)
 FCALLSCSUB2 (gridInqYstdname, GRIDINQYSTDNAME, gridinqystdname, INT, PSTRING)
-FCALLSCSUB2 (gridDefPrec, GRIDDEFPREC, griddefprec, INT, INT)
-FCALLSCFUN1 (INT, gridInqPrec, GRIDINQPREC, gridinqprec, INT)
+FCALLSCSUB2 (gridDefDatatype, GRIDDEFPREC, griddefprec, INT, INT)
+FCALLSCFUN1 (INT, gridInqDatatype, GRIDINQPREC, gridinqprec, INT)
 FCALLSCFUN2 (DOUBLE, gridInqXval, GRIDINQXVAL, gridinqxval, INT, INT)
 FCALLSCFUN2 (DOUBLE, gridInqYval, GRIDINQYVAL, gridinqyval, INT, INT)
 FCALLSCFUN1 (DOUBLE, gridInqXinc, GRIDINQXINC, gridinqxinc, INT)
@@ -454,8 +454,8 @@ FCALLSCSUB2 (zaxisInqLongname, ZAXISINQLONGNAME, zaxisinqlongname, INT, PSTRING)
 FCALLSCSUB2 (zaxisDefUnits, ZAXISDEFUNITS, zaxisdefunits, INT, STRING)
 FCALLSCSUB2 (zaxisInqUnits, ZAXISINQUNITS, zaxisinqunits, INT, PSTRING)
 FCALLSCSUB2 (zaxisInqStdname, ZAXISINQSTDNAME, zaxisinqstdname, INT, PSTRING)
-FCALLSCSUB2 (zaxisDefPrec, ZAXISDEFPREC, zaxisdefprec, INT, INT)
-FCALLSCFUN1 (INT, zaxisInqPrec, ZAXISINQPREC, zaxisinqprec, INT)
+FCALLSCSUB2 (zaxisDefDatatype, ZAXISDEFPREC, zaxisdefprec, INT, INT)
+FCALLSCFUN1 (INT, zaxisInqDatatype, ZAXISINQPREC, zaxisinqprec, INT)
 FCALLSCSUB2 (zaxisDefPositive, ZAXISDEFPOSITIVE, zaxisdefpositive, INT, INT)
 FCALLSCFUN1 (INT, zaxisInqPositive, ZAXISINQPOSITIVE, zaxisinqpositive, INT)
 FCALLSCSUB1 (zaxisDefScalar, ZAXISDEFSCALAR, zaxisdefscalar, INT)

src/grid.c

@@ -1210,7 +1210,7 @@ void gridDefXsize(int gridID, int xsize)
 
 @EndFunction
 */
-void gridDefPrec(int gridID, int prec)
+void gridDefDatatype(int gridID, int prec)
 {
   grid_t *gridptr = grid_to_pointer(gridID);
 
@@ -1231,7 +1231,7 @@ void gridDefPrec(int gridID, int prec)
 
 @EndFunction
 */
-int gridInqPrec(int gridID)
+int gridInqDatatype(int gridID)
 {
   grid_t *gridptr = grid_to_pointer(gridID);
   return gridptr->prec;
@@ -2569,7 +2569,7 @@ static
 void gridComplete(grid_t *grid)
 {
   int gridID = grid->self;
-  gridDefPrec(gridID, grid->prec);
+  gridDefDatatype(gridID, grid->prec);
 
   int gridtype = grid->type;
   switch (gridtype)
@@ -3394,7 +3394,7 @@ void gridPrintKernel(int gridID, int opt, FILE *fp)
   int xstrlen  = gridInqXIsc(gridID);
   int ystrlen  = gridInqYIsc(gridID);
   int nvertex  = gridInqNvertex(gridID);
-  int prec     = gridInqPrec(gridID);
+  int prec     = gridInqDatatype(gridID);
 
   int dig = (prec == CDI_DATATYPE_FLT64) ? 15 : 7;
 

src/mo_cdi.f90

@@ -506,8 +506,8 @@ module mo_cdi
   public :: gridInqYunits
   public :: gridInqXstdname
   public :: gridInqYstdname
-  public :: gridDefPrec
-  public :: gridInqPrec
+  public :: gridDefDatatype
+  public :: gridInqDatatype
   public :: gridInqXval
   public :: gridInqYval
   public :: gridInqXinc
@@ -574,8 +574,8 @@ module mo_cdi
   public :: zaxisDefUnits
   public :: zaxisInqUnits
   public :: zaxisInqStdname
-  public :: zaxisDefPrec
-  public :: zaxisInqPrec
+  public :: zaxisDefDatatype
+  public :: zaxisInqDatatype
   public :: zaxisDefPositive
   public :: zaxisInqPositive
   public :: zaxisDefScalar
@@ -1957,19 +1957,19 @@ module mo_cdi
       integer(c_int) :: f_result
     end function cdiZaxisInqKeyFlt
 
-    subroutine gridDefPrec(gridID_dummy, prec_dummy) bind(c, name =&
-    & 'gridDefPrec')
+    subroutine gridDefDatatype(gridID_dummy, prec_dummy) bind(c, name =&
+    & 'gridDefDatatype')
       import c_int
       integer(c_int), value :: gridID_dummy
       integer(c_int), value :: prec_dummy
-    end subroutine gridDefPrec
+    end subroutine gridDefDatatype
 
-    function gridInqPrec(gridID_dummy) bind(c, name = 'gridInqPrec')&
+    function gridInqDatatype(gridID_dummy) bind(c, name = 'gridInqDatatype')&
     & result(f_result)
       import c_int
       integer(c_int), value :: gridID_dummy
       integer(c_int) :: f_result
-    end function gridInqPrec
+    end function gridInqDatatype
 
     function gridInqXval(gridID_dummy, index_dummy) bind(c, name =&
     & 'gridInqXval') result(f_result)
@@ -2381,19 +2381,19 @@ module mo_cdi
       integer(kind = c_signed_char), intent(inout) :: uuid_dummy(CDI_UUID_SIZE)
     end subroutine zaxisInqUUID
 
-    subroutine zaxisDefPrec(zaxisID_dummy, prec_dummy) bind(c, name =&
-    & 'zaxisDefPrec')
+    subroutine zaxisDefDatatype(zaxisID_dummy, prec_dummy) bind(c, name =&
+    & 'zaxisDefDatatype')
       import c_int
       integer(c_int), value :: zaxisID_dummy
       integer(c_int), value :: prec_dummy
-    end subroutine zaxisDefPrec
+    end subroutine zaxisDefDatatype
 
-    function zaxisInqPrec(zaxisID_dummy) bind(c, name = 'zaxisInqPrec')&
+    function zaxisInqDatatype(zaxisID_dummy) bind(c, name = 'zaxisInqDatatype')&
     & result(f_result)
       import c_int
       integer(c_int), value :: zaxisID_dummy
       integer(c_int) :: f_result
-    end function zaxisInqPrec
+    end function zaxisInqDatatype
 
     subroutine zaxisDefPositive(zaxisID_dummy, positive_dummy) bind(c, name =&
     & 'zaxisDefPositive')

src/stream_cdf_o.c

@@ -297,7 +297,7 @@ static void
 cdfDefTrajLatLon(stream_t *streamptr, int gridID, int gridindex,
                  const struct cdfDefGridAxisInqs *inqs, int dimtype)
 {
-  nc_type xtype = (gridInqPrec(gridID) == CDI_DATATYPE_FLT32) ? NC_FLOAT : NC_DOUBLE;
+  nc_type xtype = (gridInqDatatype(gridID) == CDI_DATATYPE_FLT32) ? NC_FLOAT : NC_DOUBLE;
   ncgrid_t *ncgrid = streamptr->ncgrid;
 
   int dimlen = inqs->axisSize(gridID);
@@ -453,7 +453,7 @@ cdfDefAxisCommon(stream_t *streamptr, int gridID, int gridindex, int ndims,
   int nvdimID = CDI_UNDEFID;
   int fileID  = streamptr->fileID;
   size_t dimlen = (size_t)gridAxisInq->axisSize(gridID);
-  nc_type xtype = (nc_type)cdfDefDatatype(gridInqPrec(gridID), streamptr->filetype);
+  nc_type xtype = (nc_type)cdfDefDatatype(gridInqDatatype(gridID), streamptr->filetype);
 
   ncgrid_t *ncgrid = streamptr->ncgrid;
 
@@ -664,7 +664,7 @@ cdfDefIrregularGridCommon(stream_t *streamptr, int gridID,
                           size_t nvertex, const char *vdimname_default,
                           bool setVdimname)
 {
-  nc_type xtype = (nc_type)cdfDefDatatype(gridInqPrec(gridID), streamptr->filetype);
+  nc_type xtype = (nc_type)cdfDefDatatype(gridInqDatatype(gridID), streamptr->filetype);
   int xdimID = CDI_UNDEFID;
   int ydimID = CDI_UNDEFID;
   int ncxvarid = CDI_UNDEFID, ncyvarid = CDI_UNDEFID, ncavarid = CDI_UNDEFID;
@@ -1478,7 +1478,7 @@ void cdfDefZaxis(stream_t *streamptr, int zaxisID)
   char axisname[CDI_MAX_NAME];
   int dimID = CDI_UNDEFID;
   int ncvarid = CDI_UNDEFID, ncbvarid = CDI_UNDEFID;
-  int xtype = zaxisInqPrec(zaxisID) == CDI_DATATYPE_FLT32 ? NC_FLOAT : NC_DOUBLE;
+  int xtype = zaxisInqDatatype(zaxisID) == CDI_DATATYPE_FLT32 ? NC_FLOAT : NC_DOUBLE;
 
   int vlistID = streamptr->vlistID;
   int fileID  = streamptr->fileID;

src/varscan.c

@@ -1019,7 +1019,7 @@ int varDefZaxis(int vlistID, int zaxistype, int nlevels, const double *levels, c
 	  if ( name && name[0] ) zaxisDefName(zaxisID, name);
 	  if ( longname && longname[0] ) zaxisDefLongname(zaxisID, longname);
 	  if ( units && units[0] ) zaxisDefUnits(zaxisID, units);
-	  zaxisDefPrec(zaxisID, prec);
+	  zaxisDefDatatype(zaxisID, prec);
 	  zaxisDefLtype(zaxisID, ltype1);
 	}
 

src/vlist.c

@@ -682,7 +682,7 @@ void vlistCopyFlag(int vlistID2, int vlistID1)
                 zaxisDefLongname(zaxisID2, ctemp);
                 zaxisInqUnits(zaxisID, ctemp);
                 zaxisDefUnits(zaxisID2, ctemp);
-                zaxisDefPrec(zaxisID2, zaxisInqPrec(zaxisID));
+                zaxisDefDatatype(zaxisID2, zaxisInqDatatype(zaxisID));
 
                 if ( zaxisType == ZAXIS_CHAR )
                   {

src/zaxis.c

@@ -659,7 +659,7 @@ void zaxisInqStdname(int zaxisID, char *stdname)
 }
 
 
-void zaxisDefPrec(int zaxisID, int prec)
+void zaxisDefDatatype(int zaxisID, int prec)
 {
   zaxis_t *zaxisptr = zaxis_to_pointer(zaxisID);
 
@@ -671,7 +671,7 @@ void zaxisDefPrec(int zaxisID, int prec)
 }
 
 
-int zaxisInqPrec(int zaxisID)
+int zaxisInqDatatype(int zaxisID)
 {
   zaxis_t *zaxisptr = zaxis_to_pointer(zaxisID);
   return zaxisptr->prec;