Commit 29b0db9f authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cleanup

parent bb5a948e
/* Automatically generated by m214003 at 2009-09-11, do not edit */
/* Automatically generated by m214003 at 2009-09-13, do not edit */
/* CGRIBEXLIB_VERSION="1.4.0" */
......@@ -72,7 +72,11 @@
#endif
/* performance problems on IBM
#if defined (__ibm__) /* performance problems on IBM */
#ifndef DBL_IS_NAN
# define DBL_IS_NAN(x) ((x) != (x))
#endif
#else
#ifndef DBL_IS_NAN
#if defined (HAVE_ISNAN)
# define DBL_IS_NAN(x) (isnan(x))
......@@ -82,10 +86,6 @@
# define DBL_IS_NAN(x) ((x) != (x))
#endif
#endif
*/
#ifndef DBL_IS_NAN
# define DBL_IS_NAN(x) ((x) != (x))
#endif
#ifndef DBL_IS_EQUAL
......@@ -8878,7 +8878,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
return (gribLen);
}
static const char grb_libvers[] = "1.4.0" " of ""Sep 11 2009"" ""14:00:27";
static const char grb_libvers[] = "1.4.0" " of ""Sep 13 2009"" ""15:39:58";
const char *
cgribexLibraryVersion(void)
{
......
......@@ -29,7 +29,6 @@
#define UNDEFID CDI_UNDEFID
void cdfDefTime(int streamID);
void cdfDefGlobalAtts(int streamID);
void cdfDefLocalAtts(int streamID);
......@@ -517,6 +516,7 @@ int cdfDefRecord(int streamID)
return (ierr);
}
static
void cdfWriteGridTraj(int streamID, int gridID)
{
#if defined (HAVE_LIBNETCDF)
......@@ -546,7 +546,7 @@ void cdfWriteGridTraj(int streamID, int gridID)
#endif
}
static
void cdfReadGridTraj(int streamID, int gridID)
{
#if defined (HAVE_LIBNETCDF)
......@@ -579,6 +579,7 @@ void cdfReadGridTraj(int streamID, int gridID)
#if defined (HAVE_LIBNETCDF)
static
void cdfDefVarDeflate(int ncid, int ncvarid, int deflate_level)
{
static char func[] = "cdfDefVarDeflate";
......@@ -606,7 +607,7 @@ void cdfDefVarDeflate(int ncid, int ncvarid, int deflate_level)
}
#endif
static
void cdfDefMissval(int streamID, int varID, int dtype)
{
#if defined (HAVE_LIBNETCDF)
......@@ -642,6 +643,7 @@ void cdfDefMissval(int streamID, int varID, int dtype)
#endif
}
void cdfWriteRecord(int streamID, double *data, int nmiss)
{
#if defined (HAVE_LIBNETCDF)
......@@ -662,6 +664,7 @@ void cdfWriteRecord(int streamID, double *data, int nmiss)
#endif
}
int cdfReadRecord(int streamID, double *data, int *nmiss)
{
static char func[] = "cdfReadRecord";
......@@ -739,19 +742,7 @@ printf("fileID = %d %d %d %f\n", fileID, time_varid, index, timevalue);
#endif
}
void cdfDefTimestep(int streamID, int tsID)
{
int vlistID;
vlistID = streamInqVlist(streamID);
if ( vlistHasTime(vlistID) ) cdfDefTime(streamID);
cdfDefTimeValue(streamID, tsID);
}
static
void cdfDefTime(int streamID)
{
#if defined (HAVE_LIBNETCDF)
......@@ -863,6 +854,18 @@ void cdfDefTime(int streamID)
}
void cdfDefTimestep(int streamID, int tsID)
{
int vlistID;
vlistID = streamInqVlist(streamID);
if ( vlistHasTime(vlistID) ) cdfDefTime(streamID);
cdfDefTimeValue(streamID, tsID);
}
static
void cdfDefComplex(int streamID, int gridID)
{
#if defined (HAVE_LIBNETCDF)
......@@ -915,6 +918,7 @@ void cdfDefComplex(int streamID, int gridID)
#endif
}
static
void cdfDefSpc(int streamID, int gridID)
{
#if defined (HAVE_LIBNETCDF)
......@@ -979,6 +983,7 @@ void cdfDefSpc(int streamID, int gridID)
#endif
}
static
void cdfDefTrajLon(int streamID, int gridID)
{
#if defined (HAVE_LIBNETCDF)
......@@ -1039,6 +1044,7 @@ void cdfDefTrajLon(int streamID, int gridID)
#endif
}
static
void cdfDefTrajLat(int streamID, int gridID)
{
#if defined (HAVE_LIBNETCDF)
......
......@@ -58,7 +58,11 @@ char *strdup(const char *s);
#endif
/* performance problems on IBM
#if defined (__ibm__) /* performance problems on IBM */
#ifndef DBL_IS_NAN
# define DBL_IS_NAN(x) ((x) != (x))
#endif
#else
#ifndef DBL_IS_NAN
#if defined (HAVE_ISNAN)
# define DBL_IS_NAN(x) (isnan(x))
......@@ -68,10 +72,6 @@ char *strdup(const char *s);
# define DBL_IS_NAN(x) ((x) != (x))
#endif
#endif
*/
#ifndef DBL_IS_NAN
# define DBL_IS_NAN(x) ((x) != (x))
#endif
#ifndef DBL_IS_EQUAL
......
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