Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
libcdi
Commits
eb17ccb5
Commit
eb17ccb5
authored
6 years ago
by
Uwe Schulzweida
Browse files
Options
Downloads
Patches
Plain Diff
cdf_read: removed limitation of nmiss_ to INT_MAX [Bug #8691].
parent
43ff5095
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+4
-0
4 additions, 0 deletions
ChangeLog
src/cdf_read.c
+8
-24
8 additions, 24 deletions
src/cdf_read.c
with
12 additions
and
24 deletions
ChangeLog
+
4
−
0
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
...
...
This diff is collapsed.
Click to expand it.
src/cdf_read.c
+
8
−
24
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment