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

merged changes from trunk

parents 38b804e8 d703640f
...@@ -63,6 +63,7 @@ const char Filetypes[][9] = { ...@@ -63,6 +63,7 @@ const char Filetypes[][9] = {
int CDI_Debug = 0; /* If set to 1, debugging */ int CDI_Debug = 0; /* If set to 1, debugging */
int CDI_Recopt = 0;
int cdiGribApiDebug = 0; int cdiGribApiDebug = 0;
int cdiDefaultLeveltype = -1; int cdiDefaultLeveltype = -1;
...@@ -289,6 +290,9 @@ void cdiInitialize(void) ...@@ -289,6 +290,9 @@ void cdiInitialize(void)
value = cdiGetenvInt("CDI_GRIBAPI_DEBUG"); value = cdiGetenvInt("CDI_GRIBAPI_DEBUG");
if ( value >= 0 ) cdiGribApiDebug = (int) value; if ( value >= 0 ) cdiGribApiDebug = (int) value;
value = cdiGetenvInt("CDI_RECOPT");
if ( value >= 0 ) CDI_Recopt = (int) value;
value = cdiGetenvInt("CDI_REGULARGRID"); value = cdiGetenvInt("CDI_REGULARGRID");
if ( value >= 0 ) cdiDataUnreduced = (int) value; if ( value >= 0 ) cdiDataUnreduced = (int) value;
......
...@@ -284,6 +284,7 @@ typedef struct ...@@ -284,6 +284,7 @@ typedef struct
extern int CDI_Debug; /* If set to 1, debuggig (default 0) */ extern int CDI_Debug; /* If set to 1, debuggig (default 0) */
extern int CDI_Recopt;
extern int cdiGribApiDebug; extern int cdiGribApiDebug;
extern double cdiDefaultMissval; extern double cdiDefaultMissval;
extern int cdiDefaultInstID; extern int cdiDefaultInstID;
......
...@@ -2132,6 +2132,7 @@ int streamInqFileID(int streamID) ...@@ -2132,6 +2132,7 @@ int streamInqFileID(int streamID)
return (streamptr->fileID); return (streamptr->fileID);
} }
void cdiDefAccesstype(int streamID, int type) void cdiDefAccesstype(int streamID, int type)
{ {
stream_t *streamptr = reshGetVal(streamID, &streamOps); stream_t *streamptr = reshGetVal(streamID, &streamOps);
...@@ -2148,9 +2149,7 @@ void cdiDefAccesstype(int streamID, int type) ...@@ -2148,9 +2149,7 @@ void cdiDefAccesstype(int streamID, int type)
int cdiInqAccesstype(int streamID) int cdiInqAccesstype(int streamID)
{ {
stream_t *streamptr; stream_t *streamptr = (stream_t *) reshGetVal ( streamID, &streamOps );
streamptr = ( stream_t *) reshGetVal ( streamID, &streamOps );
return (streamptr->accesstype); return (streamptr->accesstype);
} }
......
Supports Markdown
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