Commit 0b522fa4 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Replace FILETYPE_ by CDI_FILETYPE.

parent 5497a0bd
......@@ -88,7 +88,7 @@ void cdfGetSlapDescription(stream_t *streamptr, int varID, size_t (*start)[4], s
//Returns the number of missing + out-of-range values encountered.
static
size_t cdfDoInputDataTransformationDP(size_t valueCount, double *data, bool haveMissVal, double missVal, double scaleFactor, double offset, double validMin, double validMax)
{
{
const bool haveOffset = IS_NOT_EQUAL(offset, 0);
const bool haveScaleFactor = IS_NOT_EQUAL(scaleFactor, 1);
size_t missValCount = 0;
......@@ -860,15 +860,16 @@ int cdiStreamReadVarSlicePart(int streamID, int varID, int levelID, int varType,
switch (filetype)
{
#if defined (HAVE_LIBNETCDF)
case FILETYPE_NC:
case FILETYPE_NC2:
case FILETYPE_NC4:
case FILETYPE_NC4C:
case CDI_FILETYPE_NC:
case CDI_FILETYPE_NC2:
case CDI_FILETYPE_NC4:
case CDI_FILETYPE_NC4C:
case CDI_FILETYPE_NC5:
{
if ( memtype == MEMTYPE_FLOAT )
cdfReadVarSliceSPPart(streamptr, varID, levelID, varType, start, size, (float *)data, nmiss);
cdfReadVarSliceSPPart(streamptr, varID, levelID, varType, start, size, (float *)data, nmiss);
else
cdfReadVarSliceDPPart(streamptr, varID, levelID, varType, start, size, (double *)data, nmiss);
cdfReadVarSliceDPPart(streamptr, varID, levelID, varType, start, size, (double *)data, nmiss);
break;
}
#endif
......@@ -990,15 +991,16 @@ void cdiStreamReadVarPart(int streamID, int varID, int varType, int start, size_
switch (filetype)
{
#if defined (HAVE_LIBNETCDF)
case FILETYPE_NC:
case FILETYPE_NC2:
case FILETYPE_NC4:
case FILETYPE_NC4C:
case CDI_FILETYPE_NC:
case CDI_FILETYPE_NC2:
case CDI_FILETYPE_NC4:
case CDI_FILETYPE_NC4C:
case CDI_FILETYPE_NC5:
{
if ( memtype == MEMTYPE_FLOAT )
cdfReadVarSPPart(streamptr, varID, varType, start, size, (float *)data, nmiss);
cdfReadVarSPPart(streamptr, varID, varType, start, size, (float *)data, nmiss);
else
cdfReadVarDPPart(streamptr, varID, varType, start, size, (double *)data, nmiss);
cdfReadVarDPPart(streamptr, varID, varType, start, size, (double *)data, nmiss);
break;
}
......@@ -1025,3 +1027,4 @@ void streamReadVarPart(int streamID, int varID, int varType, int start, size_t s
}
#endif
......@@ -60,16 +60,6 @@ extern "C" {
#define CDI_FILETYPE_EXT 9 // File type EXTRA
#define CDI_FILETYPE_IEG 10 // File type IEG
#define FILETYPE_GRB 1
#define FILETYPE_GRB2 2
#define FILETYPE_NC 3
#define FILETYPE_NC2 4
#define FILETYPE_NC4 5
#define FILETYPE_NC4C 6
#define FILETYPE_SRV 7
#define FILETYPE_EXT 8
#define FILETYPE_IEG 9
/* Compress types */
#define CDI_COMPRESS_NONE 0
......
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