Skip to content
GitLab
Commit 2269be1e authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed vlistDefAtt/vlistInqAtt to cdiDefAtt/cdiInqAtt.

parent 3243b271
Hide whitespace changes
Inline Side-by-side
doc/tex/c_quick_ref.tex
View file @ 2269be1e
......@@ -22,6 +22,83 @@ Clear the list of additional GRIB keys..
Register an additional GRIB key which is read when file is opened..
\section*{\tt \htmlref{cdiDefAttFlt}{cdiDefAttFlt}}
\begin{verbatim}
int cdiDefAttFlt (int cdiID, int varID, const char *name, int type, int len,
const double dp[]);
\end{verbatim}
Define a floating point attribute.
\section*{\tt \htmlref{cdiDefAttInt}{cdiDefAttInt}}
\begin{verbatim}
int cdiDefAttInt (int cdiID, int varID, const char *name, int type, int len,
const int ip[]);
\end{verbatim}
Define an integer attribute.
\section*{\tt \htmlref{cdiDefAttTxt}{cdiDefAttTxt}}
\begin{verbatim}
int cdiDefAttTxt (int cdiID, int varID, const char *name, int len,
const char *tp_cbuf);
\end{verbatim}
Define a text attribute.
\section*{\tt \htmlref{cdiInqAtt}{cdiInqAtt}}
\begin{verbatim}
int cdiInqAtt (int cdiID, int varID, int attrnum, char *name, int *typep,
int *lenp);
\end{verbatim}
Get information about an attribute.
\section*{\tt \htmlref{cdiInqAttFlt}{cdiInqAttFlt}}
\begin{verbatim}
int cdiInqAttFlt (int cdiID, int varID, const char *name, int mlen, double dp[]);
\end{verbatim}
Get the value(s) of a floating point attribute.
\section*{\tt \htmlref{cdiInqAttInt}{cdiInqAttInt}}
\begin{verbatim}
int cdiInqAttInt (int cdiID, int varID, const char *name, int mlen, int ip[]);
\end{verbatim}
Get the value(s) of an integer attribute.
\section*{\tt \htmlref{cdiInqAttTxt}{cdiInqAttTxt}}
\begin{verbatim}
int cdiInqAttTxt (int cdiID, int varID, const char *name, int mlen,
char *tp_cbuf);
\end{verbatim}
Get the value(s) of a text attribute.
\section*{\tt \htmlref{cdiInqNatts}{cdiInqNatts}}
\begin{verbatim}
int cdiInqNatts (int cdiID, int varID, int *nattsp);
\end{verbatim}
Get number of attributes assigned to this variable.
\section*{\tt \htmlref{gridCreate}{gridCreate}}
\begin{verbatim}
......@@ -76,6 +153,24 @@ Define the position of grid in the reference file.
Define the precision of a Grid.
\section*{\tt \htmlref{gridDefProj}{gridDefProj}}
\begin{verbatim}
void gridDefProj (int gridID, int projID);
\end{verbatim}
Define the projection ID of a Grid.
\section*{\tt \htmlref{gridDefProjType}{gridDefProjType}}
\begin{verbatim}
void gridDefProjType (int gridID, int projtype);
\end{verbatim}
Define the projection type.
\section*{\tt \htmlref{gridDefReference}{gridDefReference}}
\begin{verbatim}
......@@ -265,6 +360,24 @@ Get the position of grid in the reference file.
Get the precision of a Grid.
\section*{\tt \htmlref{gridInqProj}{gridInqProj}}
\begin{verbatim}
int gridInqProj (int gridID);
\end{verbatim}
Get the projection ID of a Grid.
\section*{\tt \htmlref{gridInqProjType}{gridInqProjType}}
\begin{verbatim}
int gridInqProjType (int gridID);
\end{verbatim}
Get the projection type.
\section*{\tt \htmlref{gridInqReference}{gridInqReference}}
\begin{verbatim}
......@@ -889,36 +1002,6 @@ Safe and convenient version of vlistInqVarName.
Create a variable list.
\section*{\tt \htmlref{vlistDefAttFlt}{vlistDefAttFlt}}
\begin{verbatim}
int vlistDefAttFlt (int vlistID, int varID, const char *name, int type, int len,
const double dp[]);
\end{verbatim}
Define a floating point attribute.
\section*{\tt \htmlref{vlistDefAttInt}{vlistDefAttInt}}
\begin{verbatim}
int vlistDefAttInt (int vlistID, int varID, const char *name, int type, int len,
const int ip[]);
\end{verbatim}
Define an integer attribute.
\section*{\tt \htmlref{vlistDefAttTxt}{vlistDefAttTxt}}
\begin{verbatim}
int vlistDefAttTxt (int vlistID, int varID, const char *name, int len,
const char *tp_cbuf);
\end{verbatim}
Define a text attribute.
\section*{\tt \htmlref{vlistDefTaxis}{vlistDefTaxis}}
\begin{verbatim}
......@@ -1073,54 +1156,6 @@ Duplicate a variable list.
returns 1 if meta-data key was read, 0 otherwise..
\section*{\tt \htmlref{vlistInqAtt}{vlistInqAtt}}
\begin{verbatim}
int vlistInqAtt (int vlistID, int varID, int attrnum, char *name, int *typep,
int *lenp);
\end{verbatim}
Get information about an attribute.
\section*{\tt \htmlref{vlistInqAttFlt}{vlistInqAttFlt}}
\begin{verbatim}
int vlistInqAttFlt (int vlistID, int varID, const char *name, int mlen,
double dp[]);
\end{verbatim}
Get the value(s) of a floating point attribute.
\section*{\tt \htmlref{vlistInqAttInt}{vlistInqAttInt}}
\begin{verbatim}
int vlistInqAttInt (int vlistID, int varID, const char *name, int mlen, int ip[]);
\end{verbatim}
Get the value(s) of an integer attribute.
\section*{\tt \htmlref{vlistInqAttTxt}{vlistInqAttTxt}}
\begin{verbatim}
int vlistInqAttTxt (int vlistID, int varID, const char *name, int mlen,
char *tp_cbuf);
\end{verbatim}
Get the value(s) of a text attribute.
\section*{\tt \htmlref{vlistInqNatts}{vlistInqNatts}}
\begin{verbatim}
int vlistInqNatts (int vlistID, int varID, int *nattsp);
\end{verbatim}
Get number of variable attributes assigned to this variable.
\section*{\tt \htmlref{vlistInqTaxis}{vlistInqTaxis}}
\begin{verbatim}
......
doc/tex/f_quick_ref.tex
View file @ 2269be1e
......@@ -22,6 +22,85 @@ Clear the list of additional GRIB keys..
Register an additional GRIB key which is read when file is opened..
\section*{\tt \htmlref{cdiDefAttFlt}{cdiDefAttFlt}}
\begin{verbatim}
INTEGER FUNCTION cdiDefAttFlt (INTEGER cdiID, INTEGER varID, CHARACTER*(*) name,
INTEGER type, INTEGER len, DOUBLEPRECISION dp(*))
\end{verbatim}
Define a floating point attribute.
\section*{\tt \htmlref{cdiDefAttInt}{cdiDefAttInt}}
\begin{verbatim}
INTEGER FUNCTION cdiDefAttInt (INTEGER cdiID, INTEGER varID, CHARACTER*(*) name,
INTEGER type, INTEGER len, INTEGER ip(*))
\end{verbatim}
Define an integer attribute.
\section*{\tt \htmlref{cdiDefAttTxt}{cdiDefAttTxt}}
\begin{verbatim}
INTEGER FUNCTION cdiDefAttTxt (INTEGER cdiID, INTEGER varID, CHARACTER*(*) name,
INTEGER len, CHARACTER*(*) tp_cbuf)
\end{verbatim}
Define a text attribute.
\section*{\tt \htmlref{cdiInqAtt}{cdiInqAtt}}
\begin{verbatim}
INTEGER FUNCTION cdiInqAtt (INTEGER cdiID, INTEGER varID, INTEGER attrnum,
CHARACTER*(*) name, INTEGER typep, INTEGER lenp)
\end{verbatim}
Get information about an attribute.
\section*{\tt \htmlref{cdiInqAttFlt}{cdiInqAttFlt}}
\begin{verbatim}
INTEGER FUNCTION cdiInqAttFlt (INTEGER cdiID, INTEGER varID, CHARACTER*(*) name,
INTEGER mlen, DOUBLEPRECISION dp(*))
\end{verbatim}
Get the value(s) of a floating point attribute.
\section*{\tt \htmlref{cdiInqAttInt}{cdiInqAttInt}}
\begin{verbatim}
INTEGER FUNCTION cdiInqAttInt (INTEGER cdiID, INTEGER varID, CHARACTER*(*) name,
INTEGER mlen, INTEGER ip(*))
\end{verbatim}
Get the value(s) of an integer attribute.
\section*{\tt \htmlref{cdiInqAttTxt}{cdiInqAttTxt}}
\begin{verbatim}
INTEGER FUNCTION cdiInqAttTxt (INTEGER cdiID, INTEGER varID, CHARACTER*(*) name,
INTEGER mlen, CHARACTER*(*) tp_cbuf)
\end{verbatim}
Get the value(s) of a text attribute.
\section*{\tt \htmlref{cdiInqNatts}{cdiInqNatts}}
\begin{verbatim}
INTEGER FUNCTION cdiInqNatts (INTEGER cdiID, INTEGER varID, INTEGER nattsp)
\end{verbatim}
Get number of attributes assigned to this variable.
\section*{\tt \htmlref{gridCreate}{gridCreate}}
\begin{verbatim}
......@@ -76,6 +155,24 @@ Define the position of grid in the reference file.
Define the precision of a Grid.
\section*{\tt \htmlref{gridDefProj}{gridDefProj}}
\begin{verbatim}
SUBROUTINE gridDefProj (INTEGER gridID, INTEGER projID)
\end{verbatim}
Define the projection ID of a Grid.
\section*{\tt \htmlref{gridDefProjType}{gridDefProjType}}
\begin{verbatim}
SUBROUTINE gridDefProjType (INTEGER gridID, INTEGER projtype)
\end{verbatim}
Define the projection type.
\section*{\tt \htmlref{gridDefReference}{gridDefReference}}
\begin{verbatim}
......@@ -265,6 +362,24 @@ Get the position of grid in the reference file.
Get the precision of a Grid.
\section*{\tt \htmlref{gridInqProj}{gridInqProj}}
\begin{verbatim}
INTEGER FUNCTION gridInqProj (INTEGER gridID)
\end{verbatim}
Get the projection ID of a Grid.
\section*{\tt \htmlref{gridInqProjType}{gridInqProjType}}
\begin{verbatim}
INTEGER FUNCTION gridInqProjType (INTEGER gridID)
\end{verbatim}
Get the projection type.
\section*{\tt \htmlref{gridInqReference}{gridInqReference}}
\begin{verbatim}
......@@ -892,39 +1007,6 @@ Safe and convenient version of vlistInqVarName.
Create a variable list.
\section*{\tt \htmlref{vlistDefAttFlt}{vlistDefAttFlt}}
\begin{verbatim}
INTEGER FUNCTION vlistDefAttFlt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER type, INTEGER len,
DOUBLEPRECISION dp(*))
\end{verbatim}
Define a floating point attribute.
\section*{\tt \htmlref{vlistDefAttInt}{vlistDefAttInt}}
\begin{verbatim}
INTEGER FUNCTION vlistDefAttInt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER type, INTEGER len,
INTEGER ip(*))
\end{verbatim}
Define an integer attribute.
\section*{\tt \htmlref{vlistDefAttTxt}{vlistDefAttTxt}}
\begin{verbatim}
INTEGER FUNCTION vlistDefAttTxt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER len,
CHARACTER*(*) tp_cbuf)
\end{verbatim}
Define a text attribute.
\section*{\tt \htmlref{vlistDefTaxis}{vlistDefTaxis}}
\begin{verbatim}
......@@ -1087,57 +1169,6 @@ Duplicate a variable list.
returns 1 if meta-data key was read, 0 otherwise..
\section*{\tt \htmlref{vlistInqAtt}{vlistInqAtt}}
\begin{verbatim}
INTEGER FUNCTION vlistInqAtt (INTEGER vlistID, INTEGER varID, INTEGER attrnum,
CHARACTER*(*) name, INTEGER typep, INTEGER lenp)
\end{verbatim}
Get information about an attribute.
\section*{\tt \htmlref{vlistInqAttFlt}{vlistInqAttFlt}}
\begin{verbatim}
INTEGER FUNCTION vlistInqAttFlt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER mlen,
DOUBLEPRECISION dp(*))
\end{verbatim}
Get the value(s) of a floating point attribute.
\section*{\tt \htmlref{vlistInqAttInt}{vlistInqAttInt}}
\begin{verbatim}
INTEGER FUNCTION vlistInqAttInt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER mlen, INTEGER ip(*))
\end{verbatim}
Get the value(s) of an integer attribute.
\section*{\tt \htmlref{vlistInqAttTxt}{vlistInqAttTxt}}
\begin{verbatim}
INTEGER FUNCTION vlistInqAttTxt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER mlen,
CHARACTER*(*) tp_cbuf)
\end{verbatim}
Get the value(s) of a text attribute.
\section*{\tt \htmlref{vlistInqNatts}{vlistInqNatts}}
\begin{verbatim}
INTEGER FUNCTION vlistInqNatts (INTEGER vlistID, INTEGER varID, INTEGER nattsp)
\end{verbatim}
Get number of variable attributes assigned to this variable.
\section*{\tt \htmlref{vlistInqTaxis}{vlistInqTaxis}}
\begin{verbatim}
......
src/cdf_write.c
View file @ 2269be1e
......@@ -173,11 +173,11 @@ void cdfDefineAttributes(int cdiID, int varID, int fileID, int ncvarID)
size_t attBufSize = 0;
int natts;
vlistInqNatts(cdiID, varID, &natts);
cdiInqNatts(cdiID, varID, &natts);
for ( int iatt = 0; iatt < natts; ++iatt )
{
vlistInqAtt(cdiID, varID, iatt, attname, &atttype, &attlen);
cdiInqAtt(cdiID, varID, iatt, attname, &atttype, &attlen);
if ( attlen == 0 ) continue;
......@@ -185,7 +185,7 @@ void cdfDefineAttributes(int cdiID, int varID, int fileID, int ncvarID)
{
size_t attSize = (size_t)attlen*sizeof(char);
char *atttxt = (char *)resizeBuf(&attBuf, &attBufSize, attSize);
vlistInqAttTxt(cdiID, varID, attname, attlen, atttxt);
cdiInqAttTxt(cdiID, varID, attname, attlen, atttxt);
len = (size_t)attlen;
cdf_put_att_text(fileID, ncvarID, attname, len, atttxt);
}
......@@ -195,7 +195,7 @@ void cdfDefineAttributes(int cdiID, int varID, int fileID, int ncvarID)
{
size_t attSize = (size_t)attlen*sizeof(int);
int *attint = (int *)resizeBuf(&attBuf, &attBufSize, attSize);
vlistInqAttInt(cdiID, varID, attname, attlen, &attint[0]);
cdiInqAttInt(cdiID, varID, attname, attlen, &attint[0]);
len = (size_t)attlen;
nc_type xtype = (atttype == DATATYPE_INT8) ? NC_BYTE :
(atttype == DATATYPE_INT16) ? NC_SHORT :
......@@ -211,7 +211,7 @@ void cdfDefineAttributes(int cdiID, int varID, int fileID, int ncvarID)
{
size_t attSize = (size_t)attlen * sizeof(double);
double *attflt = (double *)resizeBuf(&attBuf, &attBufSize, attSize);
vlistInqAttFlt(cdiID, varID, attname, attlen, attflt);
cdiInqAttFlt(cdiID, varID, attname, attlen, attflt);
len = (size_t)attlen;
if ( atttype == DATATYPE_FLT32 )
{
......@@ -239,7 +239,7 @@ void cdfDefGlobalAtts(stream_t *streamptr)
cdfDefInstitut(streamptr);
int natts;
vlistInqNatts(vlistID, CDI_GLOBAL, &natts);
cdiInqNatts(vlistID, CDI_GLOBAL, &natts);
if ( natts > 0 && streamptr->ncmode == 2 ) cdf_redef(fileID);
......
src/cdi.h
View file @ 2269be1e
......@@ -678,27 +678,27 @@ const char *vlistInqVarNamePtr(int vlistID, int varID);
const char *vlistInqVarLongnamePtr(int vlistID, int varID);
const char *vlistInqVarUnitsPtr(int vlistID, int varID);
/* VLIST attributes */
/* vlistInqNatts: Get number of attributes assigned to this variable */
int vlistInqNatts(int vlistID, int varID, int *nattsp);
/* vlistInqAtt: Get information about an attribute */
int vlistInqAtt(int vlistID, int varID, int attrnum, char *name, int *typep, int *lenp);
int vlistDelAtt(int vlistID, int varID, const char *name);
/* vlistDefAttInt: Define an integer attribute */
int vlistDefAttInt(int vlistID, int varID, const char *name, int type, int len, const int ip[]);
/* vlistDefAttFlt: Define a floating point attribute */
int vlistDefAttFlt(int vlistID, int varID, const char *name, int type, int len, const double dp[]);
/* vlistDefAttTxt: Define a text attribute */
int vlistDefAttTxt(int vlistID, int varID, const char *name, int len, const char *tp_cbuf);
/* vlistInqAttInt: Get the value(s) of an integer attribute */
int vlistInqAttInt(int vlistID, int varID, const char *name, int mlen, int ip[]);
/* vlistInqAttFlt: Get the value(s) of a floating point attribute */
int vlistInqAttFlt(int vlistID, int varID, const char *name, int mlen, double dp[]);
/* vlistInqAttTxt: Get the value(s) of a text attribute */
int vlistInqAttTxt(int vlistID, int varID, const char *name, int mlen, char *tp_cbuf);
/* CDI attributes */
/* cdiInqNatts: Get number of attributes assigned to this variable */
int cdiInqNatts(int cdiID, int varID, int *nattsp);
/* cdiInqAtt: Get information about an attribute */
int cdiInqAtt(int cdiID, int varID, int attrnum, char *name, int *typep, int *lenp);
int cdiDelAtt(int cdiID, int varID, const char *name);
/* cdiDefAttInt: Define an integer attribute */
int cdiDefAttInt(int cdiID, int varID, const char *name, int type, int len, const int ip[]);
/* cdiDefAttFlt: Define a floating point attribute */
int cdiDefAttFlt(int cdiID, int varID, const char *name, int type, int len, const double dp[]);
/* cdiDefAttTxt: Define a text attribute */
int cdiDefAttTxt(int cdiID, int varID, const char *name, int len, const char *tp_cbuf);
/* cdiInqAttInt: Get the value(s) of an integer attribute */
int cdiInqAttInt(int cdiID, int varID, const char *name, int mlen, int ip[]);
/* cdiInqAttFlt: Get the value(s) of a floating point attribute */
int cdiInqAttFlt(int cdiID, int varID, const char *name, int mlen, double dp[]);
/* cdiInqAttTxt: Get the value(s) of a text attribute */
int cdiInqAttTxt(int cdiID, int varID, const char *name, int mlen, char *tp_cbuf);
/* GRID routines */
......
src/cdi.inc
View file @ 2269be1e
! This file was automatically generated, don't edit!
!
! Fortran interface for CDI library version 1.7.2
! Fortran interface for CDI library version 1.8.0
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, April 2016
! Uwe Schulzweida, MPI-MET, Hamburg, August 2016
!
INTEGER CDI_MAX_NAME
......@@ -75,18 +75,18 @@
!
! Compress types
!
INTEGER COMPRESS_NONE
PARAMETER (COMPRESS_NONE = 0)
INTEGER COMPRESS_SZIP
PARAMETER (COMPRESS_SZIP = 1)
INTEGER COMPRESS_GZIP
PARAMETER (COMPRESS_GZIP = 2)
INTEGER COMPRESS_BZIP2
PARAMETER (COMPRESS_BZIP2 = 3)
INTEGER COMPRESS_ZIP
PARAMETER (COMPRESS_ZIP = 4)
INTEGER COMPRESS_JPEG
PARAMETER (COMPRESS_JPEG = 5)
INTEGER CDI_COMPRESS_NONE
PARAMETER (CDI_COMPRESS_NONE = 0)
INTEGER CDI_COMPRESS_SZIP
PARAMETER (CDI_COMPRESS_SZIP = 1)
INTEGER CDI_COMPRESS_GZIP
PARAMETER (CDI_COMPRESS_GZIP = 2)
INTEGER CDI_COMPRESS_BZIP2
PARAMETER (CDI_COMPRESS_BZIP2 = 3)
INTEGER CDI_COMPRESS_ZIP
PARAMETER (CDI_COMPRESS_ZIP = 4)
INTEGER CDI_COMPRESS_JPEG
PARAMETER (CDI_COMPRESS_JPEG = 5)
!
! external data types
!
......@@ -194,12 +194,12 @@
!
! Chunks
!
INTEGER CHUNK_AUTO
PARAMETER (CHUNK_AUTO = 1)
INTEGER CHUNK_GRID
PARAMETER (CHUNK_GRID = 2)
INTEGER CHUNK_LINES
PARAMETER (CHUNK_LINES = 3)
INTEGER CDI_CHUNK_AUTO
PARAMETER (CDI_CHUNK_AUTO = 1)
INTEGER CDI_CHUNK_GRID
PARAMETER (CDI_CHUNK_GRID = 2)
INTEGER CDI_CHUNK_LINES
PARAMETER (CDI_CHUNK_LINES = 3)
!
! GRID types
!
......@@ -233,6 +233,14 @@
PARAMETER (GRID_SINUSOIDAL = 14)
INTEGER GRID_PROJECTION
PARAMETER (GRID_PROJECTION = 15)
INTEGER CDI_PROJ_RLL
PARAMETER (CDI_PROJ_RLL = 21)
INTEGER CDI_PROJ_LCC
PARAMETER (CDI_PROJ_LCC = 22)
INTEGER CDI_PROJ_LAEA
PARAMETER (CDI_PROJ_LAEA = 23)
INTEGER CDI_PROJ_SINU
PARAMETER (CDI_PROJ_SINU = 24)
!
! ZAXIS types
!
......@@ -1340,78 +1348,78 @@
EXTERNAL vlistInqVarUnitsPtr
!
! VLIST attributes