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
fd34e212
Commit
fd34e212
authored
Aug 12, 2014
by
Uwe Schulzweida
Browse files
NetCDF: Reading uuidOfVGrid [Bug #5046]
parent
b4145500
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
fd34e212
...
...
@@ -3,6 +3,10 @@
* Version 1.7.0 released
* using CGRIBEX library version 1.7.0
2014-08-12 Daniel Reinert
* NetCDF: Reading uuidOfVGrid [Bug #5046]
2014-08-04 Nathanael Huebbe
* NetCDF single precision input
...
...
configure
View file @
fd34e212
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdi 1.6.5rc
2
.
# Generated by GNU Autoconf 2.68 for cdi 1.6.5rc
3
.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
...
...
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.6.5rc
2
'
PACKAGE_STRING='cdi 1.6.5rc
2
'
PACKAGE_VERSION='1.6.5rc
3
'
PACKAGE_STRING='cdi 1.6.5rc
3
'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
...
...
@@ -1444,7 +1444,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdi 1.6.5rc
2
to adapt to many kinds of systems.
\`configure' configures cdi 1.6.5rc
3
to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
...
...
@@ -1514,7 +1514,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.6.5rc
2
:";;
short | recursive ) echo "Configuration of cdi 1.6.5rc
3
:";;
esac
cat <<\_ACEOF
...
...
@@ -1702,7 +1702,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.6.5rc
2
cdi configure 1.6.5rc
3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
...
...
@@ -2463,7 +2463,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by cdi $as_me 1.6.5rc
2
, which was
It was created by cdi $as_me 1.6.5rc
3
, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
...
...
@@ -3408,7 +3408,7 @@ fi
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.6.5rc
2
'
VERSION='1.6.5rc
3
'
cat >>confdefs.h <<_ACEOF
...
...
@@ -28421,7 +28421,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdi $as_me 1.6.5rc
2
, which was
This file was extended by cdi $as_me 1.6.5rc
3
, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
...
...
@@ -28487,7 +28487,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cdi config.status 1.6.5rc
2
cdi config.status 1.6.5rc
3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
...
...
configure.ac
View file @
fd34e212
...
...
@@ -4,7 +4,7 @@
# autoconf 2.68
# libtool 2.4.2
AC_INIT([cdi], [1.6.5rc
2
], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.6.5rc
3
], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
...
...
src/stream_cdf.c
View file @
fd34e212
...
...
@@ -6741,7 +6741,7 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva
/* define all input zaxes */
static
void
define_all_zaxes
(
stream_t
*
streamptr
,
int
vlistID
,
ncdim_t
*
ncdims
,
int
nvars
,
ncvar_t
*
ncvars
,
size_t
vctsize
,
double
*
vct
)
size_t
vctsize
,
double
*
vct
,
char
*
uuidOfVGrid
)
{
int
ncvarid
,
ncvarid2
;
int
i
,
ilev
,
ndims
;
...
...
@@ -6861,6 +6861,12 @@ void define_all_zaxes(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva
ncvars
[
ncvarid
].
zaxisID
=
varDefZaxis
(
vlistID
,
zaxisType
,
(
int
)
zsize
,
zvar
,
with_bounds
,
lbounds
,
ubounds
,
vctsize
,
vct
,
pname
,
plongname
,
punits
,
zprec
,
1
,
0
);
if
(
uuidOfVGrid
[
0
]
!=
0
)
{
// printf("uuidOfVGrid: defined\n");
zaxisDefUUID
(
ncvars
[
ncvarid
].
zaxisID
,
uuidOfVGrid
);
}
if
(
positive
>
0
)
zaxisDefPositive
(
ncvars
[
ncvarid
].
zaxisID
,
positive
);
free
(
zvar
);
...
...
@@ -7201,7 +7207,7 @@ void define_all_vars(stream_t *streamptr, int vlistID, int instID, int modelID,
static
void
scan_global_attributes
(
int
fileID
,
int
vlistID
,
stream_t
*
streamptr
,
int
ngatts
,
int
*
instID
,
int
*
modelID
,
int
*
ucla_les
,
char
*
uuidOfHGrid
,
int
*
instID
,
int
*
modelID
,
int
*
ucla_les
,
char
*
uuidOfHGrid
,
char
*
uuidOfVGrid
,
char
*
gridfile
,
int
*
number_of_grid_used
,
char
*
fcreftime
)
{
nc_type
xtype
;
...
...
@@ -7272,6 +7278,11 @@ void scan_global_attributes(int fileID, int vlistID, stream_t *streamptr, int ng
str2uuid
(
attstring
,
uuidOfHGrid
);
// printf("uuid: %d %s\n", attlen, attstring);
}
else
if
(
strcmp
(
attname
,
"uuidOfVGrid"
)
==
0
&&
attstrlen
==
36
)
{
attstring
[
36
]
=
0
;
str2uuid
(
attstring
,
uuidOfVGrid
);
}
else
{
if
(
strcmp
(
attname
,
"ICON_grid_file_uri"
)
==
0
&&
gridfile
[
0
]
==
0
)
...
...
@@ -7477,11 +7488,13 @@ int cdfInqContents(stream_t *streamptr)
int
format
=
0
;
int
ucla_les
=
FALSE
;
char
uuidOfHGrid
[
17
];
char
uuidOfVGrid
[
17
];
char
gridfile
[
8912
];
char
fcreftime
[
CDI_MAX_NAME
];
int
number_of_grid_used
=
UNDEFID
;
uuidOfHGrid
[
0
]
=
0
;
uuidOfVGrid
[
0
]
=
0
;
gridfile
[
0
]
=
0
;
fcreftime
[
0
]
=
0
;
...
...
@@ -7553,7 +7566,8 @@ int cdfInqContents(stream_t *streamptr)
}
/* scan global attributes */
scan_global_attributes
(
fileID
,
vlistID
,
streamptr
,
ngatts
,
&
instID
,
&
modelID
,
&
ucla_les
,
uuidOfHGrid
,
gridfile
,
&
number_of_grid_used
,
fcreftime
);
scan_global_attributes
(
fileID
,
vlistID
,
streamptr
,
ngatts
,
&
instID
,
&
modelID
,
&
ucla_les
,
uuidOfHGrid
,
uuidOfVGrid
,
gridfile
,
&
number_of_grid_used
,
fcreftime
);
/* find time dim */
if
(
unlimdimid
>=
0
)
...
...
@@ -7800,7 +7814,7 @@ int cdfInqContents(stream_t *streamptr)
/* define all zaxes */
define_all_zaxes
(
streamptr
,
vlistID
,
ncdims
,
nvars
,
ncvars
,
vctsize
,
vct
);
define_all_zaxes
(
streamptr
,
vlistID
,
ncdims
,
nvars
,
ncvars
,
vctsize
,
vct
,
uuidOfVGrid
);
if
(
vct
)
free
(
vct
);
...
...
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