Skip to content

GitLab

Commit 7cb4a1c5 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Replaced cdiGridInqKeyStr() by cdiInqKeyString() for CDI_KEY_UNITS.

parent e0adf48b
Hide whitespace changes
Inline Side-by-side
app/printinfo.c
View file @ 7cb4a1c5
......@@ -303,8 +303,8 @@ printGridInfoKernel(int gridID, int index, bool lproj)
}
char name[CDI_MAX_NAME];
name[0] = 0;
cdiGridInqKeyStr(gridID, CDI_KEY_GRIDMAP_NAME, CDI_MAX_NAME, name);
int length = CDI_MAX_NAME;
cdiInqKeyString(gridID, CDI_GLOBAL, CDI_KEY_GRIDMAP_NAME, name, &length);
if (gridtype == GRID_PROJECTION || name[0])
{
if (name[0] == 0) strcpy(name, "undefined");
......
doc/tex/c_quick_ref.tex
View file @ 7cb4a1c5
......@@ -69,24 +69,6 @@ Define an integer value from a key of a CDI variable.
Define a string value from a key of a CDI variable.
\section*{\tt \htmlref{cdiGridDefKeyStr}{cdiGridDefKeyStr}}
\begin{verbatim}
int cdiGridDefKeyStr (int gridID, int key, int size, const char *mesg);
\end{verbatim}
Define a CDI grid string value from a key.
\section*{\tt \htmlref{cdiGridInqKeyStr}{cdiGridInqKeyStr}}
\begin{verbatim}
int cdiGridInqKeyStr (int gridID, int key, int size, char *mesg);
\end{verbatim}
Get a CDI grid string value from a key.
\section*{\tt \htmlref{cdiInqAtt}{cdiInqAtt}}
\begin{verbatim}
......
doc/tex/f_quick_ref.tex
View file @ 7cb4a1c5
......@@ -71,26 +71,6 @@ Define an integer value from a key of a CDI variable.
Define a string value from a key of a CDI variable.
\section*{\tt \htmlref{cdiGridDefKeyStr}{cdiGridDefKeyStr}}
\begin{verbatim}
INTEGER FUNCTION cdiGridDefKeyStr (INTEGER gridID, INTEGER key, INTEGER size,
CHARACTER*(*) mesg)
\end{verbatim}
Define a CDI grid string value from a key.
\section*{\tt \htmlref{cdiGridInqKeyStr}{cdiGridInqKeyStr}}
\begin{verbatim}
INTEGER FUNCTION cdiGridInqKeyStr (INTEGER gridID, INTEGER key, INTEGER size,
CHARACTER*(*) mesg)
\end{verbatim}
Get a CDI grid string value from a key.
\section*{\tt \htmlref{cdiInqAtt}{cdiInqAtt}}
\begin{verbatim}
......
src/cdi.h
View file @ 7cb4a1c5
......@@ -832,28 +832,20 @@ int cdiInqKeyLen(int cdiID, int varID, int key, int *length);
int cdiCopyKeys(int cdiID1, int varID1, int cdiID2, int varID2);
// CDI grid keys
#define CDI_KEY_XUNITS 904 // X-axis units
#define CDI_KEY_YUNITS 914 // Y-axis units
#define CDI_KEY_VDIMNAME 920 // Vertex dimension name
#define CDI_KEY_GRIDMAP_VARTYPE 921 // Grid mapping var datatype
#define CDI_KEY_GRIDMAP_VARNAME 922 // Grid mapping var name
#define CDI_KEY_GRIDMAP_NAME 923 // Grid mapping name
// CDI zaxis keys
#define CDI_KEY_NAME 941 // Variable name
#define CDI_KEY_DIMNAME 942 // Dimension name
#define CDI_KEY_DIMNAME 941 // Dimension name
#define CDI_KEY_NAME 942 // Variable name
#define CDI_KEY_LONGNAME 943 // Long name of the variable
#define CDI_KEY_UNITS 944 // Z-axis units
#define CDI_KEY_UNITS 944 // Units of the variable
#define CDI_KEY_PSNAME 950 // Z-axis surface pressure name
#define CDI_KEY_P0NAME 951 // Z-axis reference pressure name
#define CDI_KEY_P0VALUE 952 // Z-axis reference pressure in Pa
// cdiGridDefKeyStr: Define a CDI grid string value from a key
int cdiGridDefKeyStr(int gridID, int key, int size, const char *mesg);
// cdiGridInqKeyStr: Get a CDI grid string value from a key
int cdiGridInqKeyStr(int gridID, int key, int size, char *mesg);
// cdiZaxisDefKeyStr: Define a CDI Z-axis string value from a key
int cdiZaxisDefKeyStr(int zaxisID, int key, int size, const char *mesg);
......
src/cdi.inc
View file @ 7cb4a1c5
......@@ -1656,10 +1656,6 @@
!
! CDI grid keys
!
INTEGER CDI_KEY_XUNITS
PARAMETER (CDI_KEY_XUNITS = 904)
INTEGER CDI_KEY_YUNITS
PARAMETER (CDI_KEY_YUNITS = 914)
INTEGER CDI_KEY_VDIMNAME
PARAMETER (CDI_KEY_VDIMNAME = 920)
INTEGER CDI_KEY_GRIDMAP_VARTYPE
......@@ -1671,10 +1667,10 @@
!
! CDI zaxis keys
!
INTEGER CDI_KEY_NAME
PARAMETER (CDI_KEY_NAME = 941)
INTEGER CDI_KEY_DIMNAME
PARAMETER (CDI_KEY_DIMNAME = 942)
PARAMETER (CDI_KEY_DIMNAME = 941)
INTEGER CDI_KEY_NAME
PARAMETER (CDI_KEY_NAME = 942)
INTEGER CDI_KEY_LONGNAME
PARAMETER (CDI_KEY_LONGNAME = 943)
INTEGER CDI_KEY_UNITS
......@@ -1685,20 +1681,6 @@
PARAMETER (CDI_KEY_P0NAME = 951)
INTEGER CDI_KEY_P0VALUE
PARAMETER (CDI_KEY_P0VALUE = 952)
INTEGER cdiGridDefKeyStr
! (INTEGER gridID,
! INTEGER key,
! INTEGER size,
! CHARACTER*(*) mesg)
EXTERNAL cdiGridDefKeyStr
INTEGER cdiGridInqKeyStr
! (INTEGER gridID,
! INTEGER key,
! INTEGER size,
! CHARACTER*(*) mesg)
EXTERNAL cdiGridInqKeyStr
INTEGER cdiZaxisDefKeyStr
! (INTEGER zaxisID,
! INTEGER key,
......
src/cdiFortran.c
View file @ 7cb4a1c5
......@@ -544,8 +544,6 @@ FCALLSCFUN4 (INT, cdiCopyKeys, CDICOPYKEYS, cdicopykeys, INT, INT, INT, INT)
/* CDI zaxis keys */
FCALLSCFUN4 (INT, cdiGridDefKeyStr, CDIGRIDDEFKEYSTR, cdigriddefkeystr, INT, INT, INT, STRING)
FCALLSCFUN4 (INT, cdiGridInqKeyStr, CDIGRIDINQKEYSTR, cdigridinqkeystr, INT, INT, INT, PSTRING)
FCALLSCFUN4 (INT, cdiZaxisDefKeyStr, CDIZAXISDEFKEYSTR, cdizaxisdefkeystr, INT, INT, INT, STRING)
FCALLSCFUN4 (INT, cdiZaxisInqKeyStr, CDIZAXISINQKEYSTR, cdizaxisinqkeystr, INT, INT, INT, PSTRING)
FCALLSCFUN3 (INT, cdiZaxisDefKeyFlt, CDIZAXISDEFKEYFLT, cdizaxisdefkeyflt, INT, INT, DOUBLE)
......
src/grid.c
View file @ 7cb4a1c5
......@@ -126,7 +126,6 @@ void grid_axis_init(struct gridaxis_t *axisptr)
axisptr->clength = 0;
axisptr->cvals = NULL;
#endif
axisptr->units[0] = 0;
axisptr->stdname = NULL;
axisptr->keys.nalloc = MAX_KEYS;
axisptr->keys.nelems = 0;
......@@ -293,14 +292,6 @@ void gridaxisSetKey(struct gridaxis_t *axisptr, int key, const char *name)
cdiDefVarKeyBytes(&axisptr->keys, key, (const unsigned char*)name, (int)strlen(name)+1);
}
static inline
void gridSetName(char *gridstrname, const char *name)
{
strncpy(gridstrname, name, CDI_MAX_NAME);
gridstrname[CDI_MAX_NAME - 1] = 0;
}
void cdiGridTypeInit(grid_t *gridptr, int gridtype, size_t size)
{
gridptr->type = gridtype;
......@@ -336,8 +327,8 @@ void cdiGridTypeInit(grid_t *gridptr, int gridtype, size_t size)
gridaxisSetKey(&gridptr->x, CDI_KEY_LONGNAME, "longitude");
gridaxisSetKey(&gridptr->y, CDI_KEY_LONGNAME, "latitude");
if ( !gridptr->x.units[0] ) gridSetName(gridptr->x.units, "degrees_east");
if ( !gridptr->y.units[0] ) gridSetName(gridptr->y.units, "degrees_north");
gridaxisSetKey(&gridptr->x, CDI_KEY_UNITS, "degrees_east");
gridaxisSetKey(&gridptr->y, CDI_KEY_UNITS, "degrees_north");
gridptr->x.stdname = xystdname_tab[grid_xystdname_latlon][0];
gridptr->y.stdname = xystdname_tab[grid_xystdname_latlon][1];
......@@ -366,8 +357,8 @@ void cdiGridTypeInit(grid_t *gridptr, int gridtype, size_t size)
gridptr->x.stdname = xystdname_tab[grid_xystdname_projection][0];
gridptr->y.stdname = xystdname_tab[grid_xystdname_projection][1];
if ( !gridptr->x.units[0] ) gridSetName(gridptr->x.units, "m");
if ( !gridptr->y.units[0] ) gridSetName(gridptr->y.units, "m");
gridaxisSetKey(&gridptr->x, CDI_KEY_UNITS, "m");
gridaxisSetKey(&gridptr->y, CDI_KEY_UNITS, "m");
}
break;
}
......@@ -629,97 +620,6 @@ void gridName(int gridtype, char *gridname)
strcpy(gridname, gridNamePtr(gridtype));
}
static
void *grid_key_to_ptr(grid_t *gridptr, int key)
{
void *keyptr = NULL;
switch (key)
{
case CDI_KEY_XUNITS: keyptr = (void*)gridptr->x.units; break;
case CDI_KEY_YUNITS: keyptr = (void*)gridptr->y.units; break;
}
return keyptr;
}
/*
@Function cdiGridDefKeyStr
@Title Define a CDI grid string value from a key
@Prototype int cdiGridDefKeyStr(int gridID, int key, int size, const char *mesg)
@Parameter
@Item gridID Grid ID, from a previous call to @fref{gridCreate}.
@Item key The key to be searched
@Item size The allocated length of the string on input
@Item mesg The address of a string where the data will be read
@Description
The function @func{cdiGridDefKeyStr} defines a CDI grid string value from a key.
@Result
@func{cdiGridDefKeyStr} returns 0 if OK and integer value on error.
@EndFunction
*/
int cdiGridDefKeyStr(int gridID, int key, int size, const char *mesg)
{
if ( size < 1 || mesg == NULL || *mesg == 0 ) return -1;
grid_t *gridptr = grid_to_pointer(gridID);
char *keyptr = (char*)grid_key_to_ptr(gridptr, key);
if ( keyptr == NULL )
{
Warning("CDI grid string key %d not supported!", key);
return -1;
}
gridSetString(keyptr, mesg, (size_t)size);
gridMark4Update(gridID);
return 0;
}
/*
@Function cdiGridInqKeyStr
@Title Get a CDI grid string value from a key
@Prototype int cdiGridInqKeyStr(int gridID, int key, int size, char *mesg)
@Parameter
@Item gridID Grid ID, from a previous call to @fref{gridCreate}.
@Item key The key to be searched.
@Item size The allocated length of the string on input.
@Item mesg The address of a string where the data will be retrieved.
The caller must allocate space for the returned string.
The maximum possible length, in characters, of the string
is given by the predefined constant @func{CDI_MAX_NAME}.
@Description
The function @func{cdiGridInqKeyStr} return a CDI grid string value from a key.
@Result
@func{cdiGridInqKeyStr} returns 0 if OK and integer value on error.
@EndFunction
*/
int cdiGridInqKeyStr(int gridID, int key, int size, char *mesg)
{
if ( size < 1 || mesg == NULL ) return -1;
grid_t *gridptr = grid_to_pointer(gridID);
const char *keyptr = (const char*)grid_key_to_ptr(gridptr, key);
if ( keyptr == NULL)
{
Warning("CDI grid string key %d not supported!", key);
return -1;
}
gridGetString(mesg, keyptr, (size_t)size);
return 0;
}
/*
@Function gridDefXname
@Title Define the name of a X-axis
......@@ -772,9 +672,9 @@ The function @func{gridDefXunits} defines the units of a X-axis.
@EndFunction
*/
void gridDefXunits(int gridID, const char *xunits)
void gridDefXunits(int gridID, const char *units)
{
(void)cdiGridDefKeyStr(gridID, CDI_KEY_XUNITS, CDI_MAX_NAME, xunits);
(void)cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, units);
}
/*
......@@ -829,9 +729,9 @@ The function @func{gridDefYunits} defines the units of a Y-axis.
@EndFunction
*/
void gridDefYunits(int gridID, const char *yunits)
void gridDefYunits(int gridID, const char *units)
{
(void)cdiGridDefKeyStr(gridID, CDI_KEY_YUNITS, CDI_MAX_NAME, yunits);
(void)cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, units);
}
/*
......@@ -903,9 +803,10 @@ The function @func{gridInqXunits} returns the units of a X-axis.
@EndFunction
*/
void gridInqXunits(int gridID, char *xunits)
void gridInqXunits(int gridID, char *units)
{
(void)cdiGridInqKeyStr(gridID, CDI_KEY_XUNITS, CDI_MAX_NAME, xunits);
int length = CDI_MAX_NAME;
(void)cdiInqKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, units, &length);
}
......@@ -988,9 +889,10 @@ The function @func{gridInqYunits} returns the units of a Y-axis.
@EndFunction
*/
void gridInqYunits(int gridID, char *yunits)
void gridInqYunits(int gridID, char *units)
{
(void)cdiGridInqKeyStr(gridID, CDI_KEY_YUNITS, CDI_MAX_NAME, yunits);
int length = CDI_MAX_NAME;
(void)cdiInqKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, units, &length);
}
......@@ -1064,15 +966,15 @@ void gridVerifyProj(int gridID)
{
gridptr->x.stdname = xystdname_tab[grid_xystdname_grid_latlon][0];
gridptr->y.stdname = xystdname_tab[grid_xystdname_grid_latlon][1];
gridSetName(gridptr->x.units, "degrees");
gridSetName(gridptr->y.units, "degrees");
gridaxisSetKey(&gridptr->x, CDI_KEY_UNITS, "degrees");
gridaxisSetKey(&gridptr->y, CDI_KEY_UNITS, "degrees");
}
else if ( projtype == CDI_PROJ_LCC )
{
gridptr->x.stdname = xystdname_tab[grid_xystdname_projection][0];
gridptr->y.stdname = xystdname_tab[grid_xystdname_projection][1];
if ( !gridptr->x.units[0] ) gridSetName(gridptr->x.units, "m");
if ( !gridptr->y.units[0] ) gridSetName(gridptr->y.units, "m");
gridaxisSetKey(&gridptr->x, CDI_KEY_UNITS, "m");
gridaxisSetKey(&gridptr->y, CDI_KEY_UNITS, "m");
}
}
......@@ -2627,10 +2529,10 @@ int gridCompareP(void *gridptr1, void *gridptr2)
if (strcmp(gridInqKeyStringPtr(&g1->y.keys, CDI_KEY_NAME), gridInqKeyStringPtr(&g2->y.keys, CDI_KEY_NAME))) return differ;
if (strcmp(gridInqKeyStringPtr(&g1->x.keys, CDI_KEY_LONGNAME), gridInqKeyStringPtr(&g2->x.keys, CDI_KEY_LONGNAME))) return differ;
if (strcmp(gridInqKeyStringPtr(&g1->y.keys, CDI_KEY_LONGNAME), gridInqKeyStringPtr(&g2->y.keys, CDI_KEY_LONGNAME))) return differ;
if (strcmp(gridInqKeyStringPtr(&g1->x.keys, CDI_KEY_UNITS), gridInqKeyStringPtr(&g2->x.keys, CDI_KEY_UNITS))) return differ;
if (strcmp(gridInqKeyStringPtr(&g1->y.keys, CDI_KEY_UNITS), gridInqKeyStringPtr(&g2->y.keys, CDI_KEY_UNITS))) return differ;
if (g1->x.stdname != g2->x.stdname) return differ;
if (g1->y.stdname != g2->y.stdname) return differ;
if (strcmp(g1->x.units, g2->x.units)) return differ;
if (strcmp(g1->y.units, g2->y.units)) return differ;
if ( g1->reference )
{
......@@ -2717,10 +2619,12 @@ void gridComplete(grid_t *grid)
if ( name[0] == 0 ) cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_LONGNAME, "longitude in rotated pole grid");
name = gridInqKeyStringPtr(&grid->y.keys, CDI_KEY_LONGNAME);
if ( name[0] == 0 ) cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_LONGNAME, "latitude in rotated pole grid");
name = gridInqKeyStringPtr(&grid->x.keys, CDI_KEY_UNITS);
if ( name[0] == 0 ) cdiDefKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, "degrees");
name = gridInqKeyStringPtr(&grid->y.keys, CDI_KEY_UNITS);
if ( name[0] == 0 ) cdiDefKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, "degrees");
grid->x.stdname = xystdname_tab[grid_xystdname_grid_latlon][0];
grid->y.stdname = xystdname_tab[grid_xystdname_grid_latlon][1];
if ( grid->x.units[0] == 0 ) strcpy(grid->x.units, "degrees");
if ( grid->y.units[0] == 0 ) strcpy(grid->y.units, "degrees");
}
if ( gridtype == GRID_UNSTRUCTURED )
......@@ -2796,9 +2700,6 @@ void gridComplete(grid_t *grid)
break;
}
}
grid->x.units[CDI_MAX_NAME - 1] = 0;
grid->y.units[CDI_MAX_NAME - 1] = 0;
}
// Used only in iterator_grib.c
......@@ -3472,7 +3373,8 @@ void gridPrintKernel(int gridID, int opt, FILE *fp)
length = CDI_MAX_NAME;
cdiInqKeyString(gridID, CDI_XAXIS, CDI_KEY_LONGNAME, attstr, &length);
if ( attstr[0] ) fprintf(fp, "xlongname = %s\n", attstr);
attstr[0] = 0; cdiGridInqKeyStr(gridID, CDI_KEY_XUNITS, CDI_MAX_NAME, attstr);
length = CDI_MAX_NAME;
cdiInqKeyString(gridID, CDI_XAXIS, CDI_KEY_UNITS, attstr, &length);
if ( attstr[0] ) fprintf(fp, "xunits = %s\n", attstr);
}
......@@ -3487,7 +3389,8 @@ void gridPrintKernel(int gridID, int opt, FILE *fp)
length = CDI_MAX_NAME;
cdiInqKeyString(gridID, CDI_YAXIS, CDI_KEY_LONGNAME, attstr, &length);
if ( attstr[0] ) fprintf(fp, "ylongname = %s\n", attstr);
attstr[0] = 0; cdiGridInqKeyStr(gridID, CDI_KEY_YUNITS, CDI_MAX_NAME, attstr);
length = CDI_MAX_NAME;
cdiInqKeyString(gridID, CDI_YAXIS, CDI_KEY_UNITS, attstr, &length);
if ( attstr[0] ) fprintf(fp, "yunits = %s\n", attstr);
}
......@@ -4350,8 +4253,6 @@ static int gridGetComponentFlags(const grid_t * gridP)
return flags;
}
#define GRID_STR_SERIALIZE(gridP) { gridP->x.units, gridP->y.units }
static int
gridGetPackSize(void * voidP, void *context)
{
......@@ -4426,13 +4327,6 @@ gridGetPackSize(void * voidP, void *context)
+ serializeGetSize(1, CDI_DATATYPE_UINT32, context));
}
{
const char *strTab[] = GRID_STR_SERIALIZE(gridP);
int numStr = (int)(sizeof (strTab) / sizeof (strTab[0]));
packBuffSize
+= serializeStrTabGetPackSize(strTab, numStr, context);
}
packBuffSize += serializeKeysGetPackSize(&gridP->x.keys, context);
packBuffSize += serializeKeysGetPackSize(&gridP->y.keys, context);
......@@ -4609,13 +4503,6 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
xassert(cdiCheckSum(CDI_DATATYPE_FLT, size, gridP->y.bounds) == d);
}
{
char *strTab[] = GRID_STR_SERIALIZE(gridP);
int numStr = sizeof (strTab) / sizeof (strTab[0]);
serializeStrTabUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
strTab, numStr, context);
}
serializeKeysUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos, &gridP->x.keys, context);
serializeKeysUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos, &gridP->y.keys, context);
......@@ -4817,13 +4704,6 @@ gridPack(void * voidP, void * packBuffer, int packBufferSize,
packBuffer, packBufferSize, packBufferPos, context);
}
{
const char *strTab[] = GRID_STR_SERIALIZE(gridP);
int numStr = sizeof (strTab) / sizeof (strTab[0]);
serializeStrTabPack(strTab, numStr,
packBuffer, packBufferSize, packBufferPos, context);
}
serializeKeysPack(&gridP->x.keys, packBuffer, packBufferSize, packBufferPos, context);
serializeKeysPack(&gridP->y.keys, packBuffer, packBufferSize, packBufferPos, context);
......@@ -4865,8 +4745,6 @@ gridPack(void * voidP, void * packBuffer, int packBufferSize,
packBuffer, packBufferSize, packBufferPos, context);
}
#undef GRID_STR_SERIALIZE
struct gridCompareSearchState
{
......
src/grid.h
View file @ 7cb4a1c5
......@@ -62,7 +62,6 @@ struct gridVirtTable
};
struct gridaxis_t {
char units[CDI_MAX_NAME];
const char *stdname;
size_t size; // number of values
short flag; // 0: undefined 1:vals 2:first+inc
......
src/mo_cdi.f90
View file @ 7cb4a1c5
......@@ -489,21 +489,17 @@ module mo_cdi
public :: cdiInqKeyString
public :: cdiInqKeyLen
public :: cdiCopyKeys
integer(c_int), public, parameter :: CDI_KEY_XUNITS = 904
integer(c_int), public, parameter :: CDI_KEY_YUNITS = 914
integer(c_int), public, parameter :: CDI_KEY_VDIMNAME = 920
integer(c_int), public, parameter :: CDI_KEY_GRIDMAP_VARTYPE = 921
integer(c_int), public, parameter :: CDI_KEY_GRIDMAP_VARNAME = 922
integer(c_int), public, parameter :: CDI_KEY_GRIDMAP_NAME = 923
integer(c_int), public, parameter :: CDI_KEY_NAME = 941
integer(c_int), public, parameter :: CDI_KEY_DIMNAME = 942
integer(c_int), public, parameter :: CDI_KEY_DIMNAME = 941
integer(c_int), public, parameter :: CDI_KEY_NAME = 942
integer(c_int), public, parameter :: CDI_KEY_LONGNAME = 943
integer(c_int), public, parameter :: CDI_KEY_UNITS = 944
integer(c_int), public, parameter :: CDI_KEY_PSNAME = 950
integer(c_int), public, parameter :: CDI_KEY_P0NAME = 951
integer(c_int), public, parameter :: CDI_KEY_P0VALUE = 952
public :: cdiGridDefKeyStr
public :: cdiGridInqKeyStr
public :: cdiZaxisDefKeyStr
public :: cdiZaxisInqKeyStr
public :: cdiZaxisDefKeyFlt
......@@ -5044,73 +5040,6 @@ contains
end do
end function cdiInqKeyString
function cdiGridDefKeyStr(gridID_dummy, key_dummy, size_dummy, mesg_dummy)&
& result(f_result)
integer(c_int) :: f_result
integer(c_int), value :: gridID_dummy
integer(c_int), value :: key_dummy
integer(c_int), value :: size_dummy
character(kind = c_char, len = *), intent(in) :: mesg_dummy
character(kind = c_char) :: mesg_temp(len(mesg_dummy) + 1)
integer :: mesg_i
interface
function lib_cdiGridDefKeyStr(gridID_dummy, key_dummy, size_dummy,&
& mesg_dummy) bind(c, name = 'cdiGridDefKeyStr') result(c_result)
import c_char, c_int
integer(c_int) :: c_result
integer(c_int), value :: gridID_dummy
integer(c_int), value :: key_dummy
integer(c_int), value :: size_dummy
character(kind = c_char) :: mesg_dummy(*)
end function lib_cdiGridDefKeyStr
end interface
do mesg_i = 1, len(mesg_dummy)
mesg_temp(mesg_i) = mesg_dummy(mesg_i:mesg_i)
end do
mesg_temp(len(mesg_dummy) + 1) = c_null_char
f_result = lib_cdiGridDefKeyStr(gridID_dummy, key_dummy, size_dummy,&
& mesg_temp)
end function cdiGridDefKeyStr
function cdiGridInqKeyStr(gridID_dummy, key_dummy, size_dummy, mesg_dummy)&
& result(f_result)
integer(c_int) :: f_result
integer(c_int), value :: gridID_dummy
integer(c_int), value :: key_dummy
integer(c_int), value :: size_dummy
character(kind = c_char, len = *), intent(inout) :: mesg_dummy
character(kind = c_char) :: mesg_temp(len(mesg_dummy) + 1)
integer :: mesg_i
interface
function lib_cdiGridInqKeyStr(gridID_dummy, key_dummy, size_dummy,&
& mesg_dummy) bind(c, name = 'cdiGridInqKeyStr') result(c_result)
import c_char, c_int
integer(c_int) :: c_result
integer(c_int), value :: gridID_dummy
integer(c_int), value :: key_dummy
integer(c_int), value :: size_dummy
character(kind = c_char) :: mesg_dummy(*)
end function lib_cdiGridInqKeyStr
end interface
mesg_temp(len(mesg_dummy) + 1) = c_null_char
do mesg_i = len(mesg_dummy), 1, -1
if(mesg_dummy(mesg_i:mesg_i) /= ' ') exit
mesg_temp(mesg_i) = c_null_char
end do
do mesg_i = mesg_i, 1, -1
mesg_temp(mesg_i) = mesg_dummy(mesg_i:mesg_i)
end do
f_result = lib_cdiGridInqKeyStr(gridID_dummy, key_dummy, size_dummy,&
& mesg_temp)
do mesg_i = 1, len(mesg_dummy)
if(mesg_temp(mesg_i) == c_null_char) exit
mesg_dummy(mesg_i:mesg_i) = mesg_temp(mesg_i)
end do
do mesg_i = mesg_i, len(mesg_dummy)
mesg_dummy(mesg_i:mesg_i) = ' '
end do
end function cdiGridInqKeyStr
function cdiZaxisDefKeyStr(zaxisID_dummy, key_dummy, size_dummy, mesg_dummy)&
& result(f_result)
integer(c_int) :: f_result
......
src/stream_cdf_i.c
View file @ 7cb4a1c5
......@@ -2069,10 +2069,9 @@ void cdf_load_cellarea(size_t size, ncvar_t *ncvar, double **gridarea, struct cd
static
void cdf_copy_axis_attr(ncvar_t *ncvar, struct gridaxis_t *gridaxis)
{
//strcpy(gridaxis->name, ncvar->name);
cdiDefVarKeyBytes(&gridaxis->keys, CDI_KEY_NAME, (const unsigned char*)ncvar->name, (int)sizeof(ncvar->name)+1);
cdiDefVarKeyBytes(&gridaxis->keys, CDI_KEY_LONGNAME, (const unsigned char*)ncvar->longname, (int)sizeof(ncvar->longname)+1);
strcpy(gridaxis->units, ncvar->units);
cdiDefVarKeyBytes(&gridaxis->keys, CDI_KEY_UNITS, (const unsigned char*)ncvar->units, (int)sizeof(ncvar->units)+1);
#ifndef USE_MPI
if ( gridaxis->cvals )
gridaxis->stdname = ncvar->stdname;
......
src/stream_cdf_o.c
View file @ 7cb4a1c5
......@@ -227,7 +227,7 @@ static const struct cdfDefGridAxisInqs {
int (*axisDimname)(int cdiID, int varID, int key, char *string, int *length);
int (*axisName)(int cdiID, int varID, int key, char *string, int *length);
int (*axisLongname)(int cdiID, int varID, int key, char *string, int *length);
int (*axisUnits)(int cdiID, int key, int size