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

added prototype for zaxisInqLtype2()

parent 358ea982
...@@ -373,6 +373,11 @@ void cdiStreamSync_(stream_t *streamptr); ...@@ -373,6 +373,11 @@ void cdiStreamSync_(stream_t *streamptr);
char *cdiUnitNamePtr(int cdi_unit); char *cdiUnitNamePtr(int cdi_unit);
void zaxisGetIndexList(int nzaxis, int *zaxisIndexList);
void zaxisDefLtype2(int zaxisID, int ltype2);
int zaxisInqLtype2(int zaxisID);
#endif /* _CDI_INT_H */ #endif /* _CDI_INT_H */
/* /*
* Local Variables: * Local Variables:
......
...@@ -50,13 +50,14 @@ ...@@ -50,13 +50,14 @@
const char *gribapiLibraryVersionString(void); const char *gribapiLibraryVersionString(void);
void gribContainersNew(stream_t * streamptr); void gribContainersNew(stream_t * streamptr);
void gribContainersDelete(stream_t * streamptr); void gribContainersDelete(stream_t * streamptr);
#ifdef HAVE_LIBGRIB_API #ifdef HAVE_LIBGRIB_API
static inline void *gribHandleNew(int editionNumber) static inline void *gribHandleNew(int editionNumber)
{ {
void *gh = void *gh = (void *)grib_handle_new_from_samples(NULL, (editionNumber == 1) ? "GRIB1" : "GRIB2");
(void *)grib_handle_new_from_samples(NULL, (editionNumber == 1) ? "GRIB1" : "GRIB2");
if ( gh == NULL ) Error("grib_handle_new_from_samples failed!"); if ( gh == NULL ) Error("grib_handle_new_from_samples failed!");
return gh; return gh;
} }
......
...@@ -2810,8 +2810,6 @@ void grib2DefLevel(grib_handle *gh, int gcinit, long leveltype1, long leveltype2 ...@@ -2810,8 +2810,6 @@ void grib2DefLevel(grib_handle *gh, int gcinit, long leveltype1, long leveltype2
} }
} }
int zaxisInqLtype2(int zaxisID);
static static
void gribapiDefLevel(int editionNumber, grib_handle *gh, int param, int zaxisID, int levelID, int gcinit) void gribapiDefLevel(int editionNumber, grib_handle *gh, int param, int zaxisID, int levelID, int gcinit)
{ {
......
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
#include "zaxis.h" #include "zaxis.h"
extern void zaxisGetIndexList(int, int *);
extern void zaxisDefLtype2(int zaxisID, int ltype2);
#undef UNDEFID #undef UNDEFID
#define UNDEFID -1 #define UNDEFID -1
...@@ -907,7 +903,7 @@ int varDefZaxis(int vlistID, int zaxistype, int nlevels, double *levels, int lbo ...@@ -907,7 +903,7 @@ int varDefZaxis(int vlistID, int zaxistype, int nlevels, double *levels, int lbo
{ {
int *zaxisIndexList; int *zaxisIndexList;
zaxisIndexList = (int *)xmalloc((size_t)nzaxis * sizeof (int)); zaxisIndexList = (int *)xmalloc((size_t)nzaxis * sizeof (int));
zaxisGetIndexList ( nzaxis, zaxisIndexList ); zaxisGetIndexList(nzaxis, zaxisIndexList);
for ( i = 0; i < nzaxis; i++ ) for ( i = 0; i < nzaxis; i++ )
{ {
zaxisID = zaxisIndexList[i]; zaxisID = zaxisIndexList[i];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment