Commit eddddf0f authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

EXSE lib update

parent 8e22803c
......@@ -65,7 +65,7 @@ typedef struct {
size_t buffersize;
void *buffer;
}
IEGREC;
iegrec_t;
const char *iegLibraryVersion(void);
......@@ -73,22 +73,22 @@ const char *iegLibraryVersion(void);
void iegDebug(int debug);
int iegCheckFiletype(int fileID, int *swap);
IEGREC *iegNew(void);
void iegDelete(IEGREC *iegp);
void iegInit(IEGREC *iegp);
void iegInitMem(IEGREC *iegp);
iegrec_t *iegNew(void);
void iegDelete(iegrec_t *iegp);
void iegInit(iegrec_t *iegp);
void iegInitMem(iegrec_t *iegp);
int iegRead(int fileID, IEGREC *iegp);
int iegWrite(int fileID, IEGREC *iegp);
int iegRead(int fileID, iegrec_t *iegp);
int iegWrite(int fileID, iegrec_t *iegp);
void iegCopyMeta(IEGREC *diegp, IEGREC *siegp);
int iegInqHeader(IEGREC *iegp, int *header);
int iegInqDataSP(IEGREC *iegp, float *data);
int iegInqDataDP(IEGREC *iegp, double *data);
void iegCopyMeta(iegrec_t *diegp, iegrec_t *siegp);
int iegInqHeader(iegrec_t *iegp, int *header);
int iegInqDataSP(iegrec_t *iegp, float *data);
int iegInqDataDP(iegrec_t *iegp, double *data);
int iegDefHeader(IEGREC *iegp, const int *header);
int iegDefDataSP(IEGREC *iegp, const float *data);
int iegDefDataDP(IEGREC *iegp, const double *data);
int iegDefHeader(iegrec_t *iegp, const int *header);
int iegDefDataSP(iegrec_t *iegp, const float *data);
int iegDefDataDP(iegrec_t *iegp, const double *data);
#endif /* _IEG_H */
......@@ -8,12 +8,11 @@ typedef struct {
int header[8];
int hprec; /* header precision */
int dprec; /* data precision */
int recnum;
size_t datasize;
size_t buffersize;
void *buffer;
}
SRVREC;
srvrec_t;
const char *srvLibraryVersion(void);
......@@ -22,19 +21,19 @@ void srvDebug(int debug);
int srvCheckFiletype(int fileID, int *swap);
SRVREC *srvNew(void);
void srvDelete(SRVREC *srvp);
srvrec_t *srvNew(void);
void srvDelete(srvrec_t *srvp);
int srvRead(int fileID, SRVREC *srvp);
int srvWrite(int fileID, SRVREC *srvp);
int srvRead(int fileID, srvrec_t *srvp);
int srvWrite(int fileID, srvrec_t *srvp);
int srvInqHeader(SRVREC *srvp, int *header);
int srvInqDataSP(SRVREC *srvp, float *data);
int srvInqDataDP(SRVREC *srvp, double *data);
int srvInqHeader(srvrec_t *srvp, int *header);
int srvInqDataSP(srvrec_t *srvp, float *data);
int srvInqDataDP(srvrec_t *srvp, double *data);
int srvDefHeader(SRVREC *srvp, const int *header);
int srvDefDataSP(SRVREC *srvp, const float *data);
int srvDefDataDP(SRVREC *srvp, const double *data);
int srvDefHeader(srvrec_t *srvp, const int *header);
int srvDefDataSP(srvrec_t *srvp, const float *data);
int srvDefDataDP(srvrec_t *srvp, const double *data);
#endif /* _SERVICE_H */
......@@ -415,7 +415,7 @@ void streamDefByteorder(int streamID, int byteorder)
#if defined (HAVE_LIBSERVICE)
case FILETYPE_SRV:
{
SRVREC *srvp = streamptr->record->srvp;
srvrec_t *srvp = streamptr->record->srvp;
srvp->byteswap = getByteswap(byteorder);
break;
......@@ -433,7 +433,7 @@ void streamDefByteorder(int streamID, int byteorder)
#if defined (HAVE_LIBIEG)
case FILETYPE_IEG:
{
IEGREC *iegp = streamptr->record->iegp;
iegrec_t *iegp = streamptr->record->iegp;
iegp->byteswap = getByteswap(byteorder);
break;
......
......@@ -67,7 +67,7 @@ int iegInqRecord(int streamID, int *varID, int *levelID)
int icode, ilevel;
int zaxisID = -1;
int vlistID;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -112,7 +112,7 @@ int iegReadRecord(int streamID, double *data, int *nmiss)
int varID, gridID;
int i, size;
double missval;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -544,7 +544,7 @@ int iegDefRecord(int streamID)
int param, pdis, pcat, pnum;
int varID, levelID, tsID, zaxisID;
int byteorder;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -594,7 +594,7 @@ int iegWriteRecord(int streamID, const double *data)
int status = 0;
int i, gridsize, gridID;
double refval;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -846,7 +846,7 @@ void iegScanTimestep1(int streamID)
TAXIS *taxis;
int vlistID;
IEGCOMPVAR compVar, compVar0;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -989,7 +989,7 @@ int iegScanTimestep2(int streamID)
TAXIS *taxis;
int vlistID;
IEGCOMPVAR compVar, compVar0;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -1179,7 +1179,7 @@ int iegScanTimestep(int streamID)
TAXIS *taxis;
int rindex, nrecs = 0;
IEGCOMPVAR compVar, compVar0;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -1342,7 +1342,7 @@ void iegReadVarDP(int streamID, int varID, double *data, int *nmiss)
int i;
int status;
double missval;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -1392,7 +1392,7 @@ void iegReadVarSliceDP(int streamID, int varID, int levID, double *data, int *nm
int i;
int status;
double missval;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -1444,7 +1444,7 @@ void iegWriteVarDP(int streamID, int varID, const double *data)
int date, time;
int param, pdis, pcat, pnum;
double refval;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -1510,7 +1510,7 @@ void iegWriteVarSliceDP(int streamID, int varID, int levID, const double *data)
int tsID;
int vlistID;
int param, date, time, datasize;
IEGREC *iegp;
iegrec_t *iegp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......
......@@ -126,13 +126,13 @@ typedef struct
int sec3[2];
int sec4[512];
#if defined (HAVE_LIBSERVICE)
SRVREC *srvp;
srvrec_t *srvp;
#endif
#if defined (HAVE_LIBEXTRA)
extrec_t *extp;
#endif
#if defined (HAVE_LIBIEG)
IEGREC *iegp;
iegrec_t *iegp;
#endif
}
Record;
......
......@@ -66,7 +66,7 @@ int srvInqRecord(int streamID, int *varID, int *levelID)
int zaxisID = -1;
int header[8];
int vlistID;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -111,7 +111,7 @@ int srvReadRecord(int streamID, double *data, int *nmiss)
int varID, gridID;
int i, size;
double missval;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -204,7 +204,7 @@ int srvDefRecord(int streamID)
int xsize, ysize;
int datatype;
int pdis, pcat, pnum;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -252,7 +252,7 @@ int srvWriteRecord(int streamID, const double *data)
static char func[] = "srvWriteRecord";
int fileID;
int status = 0;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -378,7 +378,7 @@ void srvScanTimestep1(int streamID)
TAXIS *taxis;
int vlistID;
SRVCOMPVAR compVar, compVar0;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -519,7 +519,7 @@ int srvScanTimestep2(int streamID)
TAXIS *taxis;
int vlistID;
SRVCOMPVAR compVar, compVar0;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -706,7 +706,7 @@ int srvScanTimestep(int streamID)
TAXIS *taxis;
int rindex, nrecs = 0;
SRVCOMPVAR compVar, compVar0;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -870,7 +870,7 @@ void srvReadVarDP(int streamID, int varID, double *data, int *nmiss)
int i;
int status;
double missval;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -922,7 +922,7 @@ void srvReadVarSliceDP(int streamID, int varID, int levID, double *data, int *nm
int i;
int status;
double missval;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -974,7 +974,7 @@ void srvWriteVarDP(int streamID, int varID, const double *data)
int tsID;
int vlistID;
int pdis, pcat, pnum;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -1045,7 +1045,7 @@ void srvWriteVarSliceDP(int streamID, int varID, int levID, const double *data)
int tsID;
int vlistID;
int pdis, pcat, pnum;
SRVREC *srvp;
srvrec_t *srvp;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......
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