Commit 3af2de5a authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed cdiInventoryMode to CDI_inventory_mode.

parent 0a409ed6
......@@ -31,7 +31,7 @@ bool cdiCoordinatesLonLat = false;
bool cdiIgnoreValidRange = false;
int cdiSkipRecords = 0;
int cdiConvention = CDI_CONVENTION_ECHAM;
int cdiInventoryMode = 1;
int CDI_inventory_mode = 1;
int CDO_version_info = 1;
int CDI_read_cell_corners = 1;
int CDI_cmor_mode = 0;
......@@ -407,7 +407,7 @@ void cdiInitialize(void)
{
if ( strncmp(envstr, "time", 4) == 0 )
{
cdiInventoryMode = 2;
CDI_inventory_mode = 2;
if ( CDI_Debug )
Message("Inventory mode was set to timestep!");
}
......
......@@ -345,7 +345,7 @@ extern bool cdiCoordinatesLonLat;
extern bool cdiIgnoreValidRange;
extern int cdiSkipRecords;
extern int cdiConvention;
extern int cdiInventoryMode;
extern int CDI_inventory_mode;
extern int CDO_version_info;
extern int CDI_read_cell_corners;
extern int CDI_cmor_mode;
......
......@@ -738,7 +738,7 @@ int cgribexScanTimestep1(stream_t *streamptr)
if ( cgribexVarCompare(compVar, streamptr->tsteps[0].records[recID], 0) == 0 ) break;
}
if ( cdiInventoryMode == 1 )
if ( CDI_inventory_mode == 1 )
{
if ( recID < nrecs ) break;
if ( warn_time )
......@@ -977,7 +977,7 @@ int cgribexScanTimestep2(stream_t * streamptr)
return CDI_EUFSTRUCT;
}
if ( cdiInventoryMode == 1 )
if ( CDI_inventory_mode == 1 )
{
if ( streamptr->tsteps[tsID].records[recID].used )
{
......@@ -1228,13 +1228,13 @@ int cgribexScanTimestep(stream_t * streamptr)
{
gribWarning("Parameter not defined at timestep 1!", nrecs_scanned, tsID+1, paramstr, level1, level2);
if ( cdiInventoryMode == 1 )
if ( CDI_inventory_mode == 1 )
return CDI_EUFSTRUCT;
else
continue;
}
if ( cdiInventoryMode == 1 )
if ( CDI_inventory_mode == 1 )
{
streamptr->tsteps[tsID].records[recID].used = true;
streamptr->tsteps[tsID].recIDs[rindex] = recID;
......
......@@ -22,7 +22,7 @@
#include <grib_api.h>
extern int cdiInventoryMode;
extern int CDI_inventory_mode;
static const var_tile_t dummy_tiles = { 0, -1, -1, -1, -1, -1 };
......@@ -887,7 +887,7 @@ static checkTimeResult checkTime(stream_t* streamptr, compvar2_t compVar, const
int consistentTime = !memcmp(verificationTime, expectedVTime, sizeof(*verificationTime));
// Finally, we make a decision.
if ( cdiInventoryMode == 1 )
if ( CDI_inventory_mode == 1 )
{
if ( recordExists ) return CHECKTIME_STOP;
if ( !consistentTime ) return CHECKTIME_INCONSISTENT;
......@@ -1238,7 +1238,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
if ( streamptr->tsteps[tsID].records[recID].used )
{
if ( cdiInventoryMode == 1 ) break;
if ( CDI_inventory_mode == 1 ) break;
else
{
if ( datetimeCmp(datetime, datetime0) != 0 ) break;
......@@ -1469,13 +1469,13 @@ int gribapiScanTimestep(stream_t * streamptr)
{
gribWarning("Parameter not defined at timestep 1!", nrecs_scanned, tsID+1, varname, param, level1, level2);
if ( cdiInventoryMode == 1 )
if ( CDI_inventory_mode == 1 )
return CDI_EUFSTRUCT;
else
continue;
}
if ( cdiInventoryMode != 1 )
if ( CDI_inventory_mode != 1 )
{
if ( streamptr->tsteps[tsID].records[recID].used )
{
......
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