Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
eb17ccb5
Commit
eb17ccb5
authored
Oct 11, 2018
by
Uwe Schulzweida
Browse files
cdf_read: removed limitation of nmiss_ to INT_MAX [Bug #8691].
parent
43ff5095
Changes
2
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
eb17ccb5
...
...
@@ -3,6 +3,10 @@
* using EXSE library version 1.4.1
* Version 1.9.6 released
2018-10-11 Uwe Schulzweida
* cdf_read: removed limitation of nmiss_ to INT_MAX [Bug #8691]
2018-10-08 Uwe Schulzweida
* NetCDF: Fix xyz dim order for unstructured grids without coordinates
...
...
src/cdf_read.c
View file @
eb17ccb5
...
...
@@ -504,9 +504,7 @@ void cdfReadVarDP(stream_t *streamptr, int varID, double *data, size_t *nmiss)
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
double
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
double
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationDP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
int
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationDP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
static
...
...
@@ -536,9 +534,7 @@ void cdfReadVarSP(stream_t *streamptr, int varID, float *data, size_t *nmiss)
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
double
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
double
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationSP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
int
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationSP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
...
...
@@ -602,9 +598,7 @@ void cdfReadVarSliceDP(stream_t *streamptr, int varID, int levelID, double *data
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
double
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
double
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationDP
(
gridsize
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
int
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationDP
(
gridsize
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
static
...
...
@@ -659,9 +653,7 @@ void cdfReadVarSliceSP(stream_t *streamptr, int varID, int levelID, float *data,
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
double
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
double
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationSP
(
gridsize
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
int
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationSP
(
gridsize
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
...
...
@@ -758,9 +750,7 @@ void cdfReadVarSliceDPPart(stream_t *streamptr, int varID, int levelID, int varT
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
double
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
double
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationDP
(
length
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
size_t
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationDP
(
length
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
void
cdfReadVarSliceSPPart
(
stream_t
*
streamptr
,
int
varID
,
int
levelID
,
int
varType
,
int
startpoint
,
size_t
length
,
float
*
data
,
size_t
*
nmiss
)
...
...
@@ -827,9 +817,7 @@ void cdfReadVarSliceSPPart(stream_t *streamptr, int varID, int levelID, int varT
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
float
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
float
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationSP
(
length
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
size_t
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationSP
(
length
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
static
...
...
@@ -915,9 +903,7 @@ void cdfReadVarDPPart(stream_t *streamptr, int varID, int varType, int startpoin
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
double
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
double
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationDP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
size_t
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationDP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
void
cdfReadVarSPPart
(
stream_t
*
streamptr
,
int
varID
,
int
varType
,
int
startpoint
,
size_t
length
,
float
*
data
,
size_t
*
nmiss
)
...
...
@@ -959,9 +945,7 @@ void cdfReadVarSPPart(stream_t *streamptr, int varID, int varType, int startpoin
validRange
[
0
]
=
DBL_MIN
,
validRange
[
1
]
=
DBL_MAX
;
float
addoffset
=
vlistInqVarAddoffset
(
vlistID
,
varID
);
float
scalefactor
=
vlistInqVarScalefactor
(
vlistID
,
varID
);
size_t
nmiss_
=
cdfDoInputDataTransformationSP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
assert
(
nmiss_
<=
INT_MAX
);
*
nmiss
=
(
size_t
)
nmiss_
;
*
nmiss
=
cdfDoInputDataTransformationSP
(
size
,
data
,
haveMissVal
,
missval
,
scalefactor
,
addoffset
,
validRange
[
0
],
validRange
[
1
]);
}
static
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment