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
0fd5fd66
Commit
0fd5fd66
authored
Apr 23, 2013
by
Uwe Schulzweida
Browse files
gridXXXUUID: use cdi fortran datatype CBUF (char *) for the last argument (bug fix) [Bug #3424]
parent
9069ac95
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
0fd5fd66
...
...
@@ -2,6 +2,8 @@
* cfortran.h::kill_trailing: wrong result with gcc -O3, use prama for -O2 (bug fix) [report: Luis Kornblueh]
* vlistXXXAttTxt: use cdi fortran datatype CBUF (char *) for the last argument (bug fix) [report: Luis Kornblueh]
* gridXXXUUID: use cdi fortran datatype CBUF (char *) for the last argument (bug fix) [Bug #3424]
* zaxisXXXUUID: use cdi fortran datatype CBUF (char *) for the last argument (bug fix)
2013-04-19 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
...
...
src/cdi.h
View file @
0fd5fd66
...
...
@@ -724,8 +724,8 @@ int gridInqPosition(int gridID);
void
gridDefPosition
(
int
gridID
,
int
position
);
int
gridInqReference
(
int
gridID
,
char
*
reference
);
void
gridDefReference
(
int
gridID
,
const
char
*
reference
);
char
*
gridInqUUID
(
int
gridID
,
char
*
uuid
);
void
gridDefUUID
(
int
gridID
,
const
char
*
uuid
);
char
*
gridInqUUID
(
int
gridID
,
char
*
uuid
_cbuf
);
void
gridDefUUID
(
int
gridID
,
const
char
*
uuid
_cbuf
);
/* Lambert Conformal Conic grid (GRIB version) */
...
...
@@ -809,10 +809,10 @@ double zaxisInqLevel(int zaxisID, int levelID);
void
zaxisDefReference
(
int
zaxisID
,
int
refID
);
/* zaxisDefUUID: Define the uuid of a generalized Z-axis */
void
zaxisDefUUID
(
int
zaxisID
,
const
char
*
uuid
);
void
zaxisDefUUID
(
int
zaxisID
,
const
char
*
uuid
_cbuf
);
/* zaxisInqUUID: Get the reference of a generalized Z-axis */
char
*
zaxisInqUUID
(
int
zaxisID
,
char
*
uuid
);
char
*
zaxisInqUUID
(
int
zaxisID
,
char
*
uuid
_cbuf
);
/* zaxisInqReference: Get the reference of a generalized Z-axis */
int
zaxisInqReference
(
int
zaxisID
);
...
...
src/cdiFortran.c
View file @
0fd5fd66
...
...
@@ -365,8 +365,8 @@ FCALLSCFUN1 (INT, gridInqPosition, GRIDINQPOSITION, gridinqposition, INT)
FCALLSCSUB2
(
gridDefPosition
,
GRIDDEFPOSITION
,
griddefposition
,
INT
,
INT
)
FCALLSCFUN2
(
INT
,
gridInqReference
,
GRIDINQREFERENCE
,
gridinqreference
,
INT
,
PSTRING
)
FCALLSCSUB2
(
gridDefReference
,
GRIDDEFREFERENCE
,
griddefreference
,
INT
,
STRING
)
FCALLSCFUN2
(
STRING
,
gridInqUUID
,
GRIDINQUUID
,
gridinquuid
,
INT
,
PSTRING
)
FCALLSCSUB2
(
gridDefUUID
,
GRIDDEFUUID
,
griddefuuid
,
INT
,
STRING
)
FCALLSCFUN2
(
STRING
,
gridInqUUID
,
GRIDINQUUID
,
gridinquuid
,
INT
,
CBUF
)
FCALLSCSUB2
(
gridDefUUID
,
GRIDDEFUUID
,
griddefuuid
,
INT
,
CBUF
)
/* Lambert Conformal Conic grid (GRIB version) */
...
...
@@ -412,8 +412,8 @@ FCALLSCSUB2 (zaxisInqLevels, ZAXISINQLEVELS, zaxisinqlevels, INT, PDOUBLE)
FCALLSCSUB3
(
zaxisDefLevel
,
ZAXISDEFLEVEL
,
zaxisdeflevel
,
INT
,
INT
,
DOUBLE
)
FCALLSCFUN2
(
DOUBLE
,
zaxisInqLevel
,
ZAXISINQLEVEL
,
zaxisinqlevel
,
INT
,
INT
)
FCALLSCSUB2
(
zaxisDefReference
,
ZAXISDEFREFERENCE
,
zaxisdefreference
,
INT
,
INT
)
FCALLSCSUB2
(
zaxisDefUUID
,
ZAXISDEFUUID
,
zaxisdefuuid
,
INT
,
STRING
)
FCALLSCFUN2
(
STRING
,
zaxisInqUUID
,
ZAXISINQUUID
,
zaxisinquuid
,
INT
,
PSTRING
)
FCALLSCSUB2
(
zaxisDefUUID
,
ZAXISDEFUUID
,
zaxisdefuuid
,
INT
,
CBUF
)
FCALLSCFUN2
(
STRING
,
zaxisInqUUID
,
ZAXISINQUUID
,
zaxisinquuid
,
INT
,
CBUF
)
FCALLSCFUN1
(
INT
,
zaxisInqReference
,
ZAXISINQREFERENCE
,
zaxisinqreference
,
INT
)
FCALLSCSUB2
(
zaxisDefName
,
ZAXISDEFNAME
,
zaxisdefname
,
INT
,
STRING
)
FCALLSCSUB2
(
zaxisDefLongname
,
ZAXISDEFLONGNAME
,
zaxisdeflongname
,
INT
,
STRING
)
...
...
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