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
3df6cb4f
Commit
3df6cb4f
authored
3 weeks ago
by
Oliver Heidmann
Browse files
Options
Downloads
Patches
Plain Diff
fixed error stating netcdf 4 operation applied to netcdf 3 file
parent
3a8fa4e6
No related branches found
No related tags found
1 merge request
!152
M300433/cmake include fixes
Pipeline
#103985
passed
3 weeks ago
Stage: basic
Stage: levante
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/stream.c
+6
-2
6 additions, 2 deletions
src/stream.c
with
6 additions
and
2 deletions
src/stream.c
+
6
−
2
View file @
3df6cb4f
...
...
@@ -721,7 +721,9 @@ streamOpenNCMem(int ncidp, char mode)
stream_t
*
streamptr
=
stream_new_entry
(
CDI_UNDEFID
);
int
streamID
=
CDI_ESYSTEM
;
#ifdef HAVE_NETCDF4
#ifdef NC_FORMAT_64BIT_DATA // so that we ran reliably use NC5 filetype
// Not doing this can result in an error message
// that falsely states a NC3 file is being used
streamID
=
streamptr
->
self
;
if
(
streamID
<
0
)
return
CDI_ELIMIT
;
...
...
@@ -733,7 +735,7 @@ streamOpenNCMem(int ncidp, char mode)
streamptr
->
filename
=
strdup
(
filename
);
streamptr
->
filemode
=
mode
;
streamptr
->
filetype
=
CDI_FILETYPE_NC
4
;
streamptr
->
filetype
=
CDI_FILETYPE_NC
5
;
streamptr
->
fileID
=
ncidp
;
if
(
mode
==
'r'
)
...
...
@@ -746,6 +748,8 @@ streamOpenNCMem(int ncidp, char mode)
reshRemove
(
streamptr
->
self
,
&
streamOps
);
}
}
#else
Error
(
"tried to use in memory capabilities without Netcdf4 enabled"
);
#endif
return
streamID
;
...
...
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