Commit 863469c1 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed cdiDefaultMissval to CDO_default_missval.

parent 23e31b77
......@@ -42,7 +42,7 @@ bool CDI_netcdf_lazy_grid_load = false;
char *cdiPartabPath = NULL;
int cdiPartabIntern = 1;
double cdiDefaultMissval = -9.E33;
double CDO_default_missval = -9.E33;
double CDI_grid_missval = -9999.;
static const char Filetypes[][9] = {
......@@ -114,7 +114,7 @@ cdiPrintDefaults(void)
"default modelID : %d\n"
"default tableID : %d\n"
"default missval : %g\n", cdiDefaultInstID,
cdiDefaultModelID, cdiDefaultTableID, cdiDefaultMissval);
cdiDefaultModelID, cdiDefaultTableID, CDO_default_missval);
}
void cdiPrintVersion(void)
......@@ -361,7 +361,7 @@ void cdiInitialize(void)
if ( value >= 0 ) CDI_netcdf_hdr_pad = (size_t) value;
envstr = getenv("CDI_MISSVAL");
if ( envstr ) cdiDefaultMissval = atof(envstr);
if ( envstr ) CDO_default_missval = atof(envstr);
/*
envstr = getenv("NC_MISSING_VALUE");
if ( envstr ) cdiNcMissingValue = atoi(envstr);
......@@ -491,7 +491,7 @@ void cdiDefMissval(double missval)
{
cdiInitialize();
cdiDefaultMissval = missval;
CDO_default_missval = missval;
}
......@@ -499,7 +499,7 @@ double cdiInqMissval(void)
{
cdiInitialize();
return cdiDefaultMissval;
return CDO_default_missval;
}
......@@ -507,7 +507,7 @@ double cdiInqGridMissval(void)
{
cdiInitialize();
return cdiDefaultMissval;
return CDO_default_missval;
}
/*
......
......@@ -325,7 +325,7 @@ extern int cdiDebugExt;
extern int CDI_Debug; /* If set to 1, debuggig (default 0) */
extern int CDI_Recopt;
extern int cdiGribApiDebug;
extern double cdiDefaultMissval;
extern double CDO_default_missval;
extern double CDI_grid_missval;
extern int cdiDefaultInstID;
extern int cdiDefaultModelID;
......
......@@ -577,7 +577,7 @@ void cdiGribIterator_readField(CdiIterator *super, double *buffer, size_t *nmiss
{
CdiGribIterator *me = (CdiGribIterator*)(void *)super;
GRIB_CHECK(my_grib_set_double(me->gribHandle, "missingValue", cdiDefaultMissval), 0);
GRIB_CHECK(my_grib_set_double(me->gribHandle, "missingValue", CDO_default_missval), 0);
gribGetDoubleArray(me->gribHandle, "values", buffer);
long gridType = gribGetLong(me->gribHandle, "gridDefinitionTemplateNumber");
if(nmiss)
......
......@@ -1833,7 +1833,7 @@ streamPack(void * streamptr, void * packBuffer, int packBufferSize,
uint32_t d = cdiCheckSum(CDI_DATATYPE_INT, streamNint, intBuffer);
serializePack(&d, 1, CDI_DATATYPE_UINT32, packBuffer, packBufferSize, packBufferPos, context);
serializePack(&cdiDefaultMissval, 1, CDI_DATATYPE_FLT64, packBuffer, packBufferSize, packBufferPos, context);
serializePack(&CDO_default_missval, 1, CDI_DATATYPE_FLT64, packBuffer, packBufferSize, packBufferPos, context);
serializePack(streamP->filename, intBuffer[2], CDI_DATATYPE_TXT, packBuffer, packBufferSize, packBufferPos, context);
d = cdiCheckSum(CDI_DATATYPE_TXT, intBuffer[2], streamP->filename);
serializePack(&d, 1, CDI_DATATYPE_UINT32, packBuffer, packBufferSize, packBufferPos, context);
......@@ -1854,7 +1854,7 @@ streamUnpack(char * unpackBuffer, int unpackBufferSize,
xassert(cdiCheckSum(CDI_DATATYPE_INT, streamNint, intBuffer) == d);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
&cdiDefaultMissval, 1, CDI_DATATYPE_FLT64, context);
&CDO_default_missval, 1, CDI_DATATYPE_FLT64, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
&filename, intBuffer[2], CDI_DATATYPE_TXT, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......
......@@ -955,7 +955,7 @@ int gribapiScanTimestep1(stream_t * streamptr)
gh = gribapiGetDiskRepresentation(recsize, &buffersize, &gribbuffer, &datatype, &comptype, &unzipsize);
nrecs_scanned++;
GRIB_CHECK(my_grib_set_double(gh, "missingValue", cdiDefaultMissval), 0);
GRIB_CHECK(my_grib_set_double(gh, "missingValue", CDO_default_missval), 0);
int param = gribapiGetParam(gh);
int leveltype1 = -1, leveltype2 = -1, lbounds, level_sf, level_unit;
......@@ -1168,7 +1168,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
nrecs_scanned++;
gh = grib_handle_new_from_message(NULL, gribbuffer, recsize);
GRIB_CHECK(my_grib_set_double(gh, "missingValue", cdiDefaultMissval), 0);
GRIB_CHECK(my_grib_set_double(gh, "missingValue", CDO_default_missval), 0);
int param = gribapiGetParam(gh);
int level1 = 0, level2 = 0, leveltype1, leveltype2, lbounds, level_sf, level_unit;
......@@ -1398,7 +1398,7 @@ int gribapiScanTimestep(stream_t * streamptr)
nrecs_scanned++;
gh = grib_handle_new_from_message(NULL, gribbuffer, recsize);
GRIB_CHECK(my_grib_set_double(gh, "missingValue", cdiDefaultMissval), 0);
GRIB_CHECK(my_grib_set_double(gh, "missingValue", CDO_default_missval), 0);
int param = gribapiGetParam(gh);
int level1 = 0, level2 = 0, leveltype1, leveltype2 = -1, lbounds, level_sf, level_unit;
......
......@@ -36,7 +36,7 @@ void vlistvarInitEntry(int vlistID, int varID)
vlistptr->vars[varID].modelID = CDI_UNDEFID;
vlistptr->vars[varID].tableID = CDI_UNDEFID;
vlistptr->vars[varID].missvalused = false;
vlistptr->vars[varID].missval = cdiDefaultMissval;
vlistptr->vars[varID].missval = CDO_default_missval;
vlistptr->vars[varID].addoffset = 0.0;
vlistptr->vars[varID].scalefactor = 1.0;
vlistptr->vars[varID].name = NULL;
......
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