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
63dc52a4
Commit
63dc52a4
authored
Feb 03, 2014
by
Uwe Schulzweida
Browse files
make_fint.c: changed CBUF to PPSTRING
parent
5f73504d
Changes
8
Hide whitespace changes
Inline
Side-by-side
.gitattributes
View file @
63dc52a4
...
...
@@ -188,7 +188,6 @@ src/cdf_int.h -text
src/cdi.h -text
src/cdi.inc -text
src/cdiFortran.c -text
src/cdiFortran.h -text
src/cdi_cksum.c -text
src/cdi_cksum.h -text
src/cdi_error.c -text
...
...
src/Makefile.am
View file @
63dc52a4
...
...
@@ -27,7 +27,6 @@ libcdi_la_SOURCES = \
cdi_limits.h
\
cdi_util.c
\
cdiFortran.c
\
cdiFortran.h
\
cfortran.h
\
cgribex.h
\
cgribexlib.c
\
...
...
src/Makefile.in
View file @
63dc52a4
...
...
@@ -375,7 +375,6 @@ libcdi_la_SOURCES = \
cdi_limits.h
\
cdi_util.c
\
cdiFortran.c
\
cdiFortran.h
\
cfortran.h
\
cgribex.h
\
cgribexlib.c
\
...
...
src/cdi.inc
View file @
63dc52a4
...
...
@@ -4,7 +4,7 @@
!
!
Author
:
!
-------
!
Uwe
Schulzweida
,
MPI
-
MET
,
Hamburg
,
Jan
uary
2014
!
Uwe
Schulzweida
,
MPI
-
MET
,
Hamburg
,
Febr
uary
2014
!
INTEGER
CDI_MAX_NAME
...
...
src/cdiFortran.c
View file @
63dc52a4
...
...
@@ -14,10 +14,6 @@
# include "cfortran.h"
#endif
#if ! defined (_CDIFORTRAN_H)
# include "cdiFortran.h"
#endif
/* Byte order */
...
...
@@ -264,10 +260,10 @@ FCALLSCFUN6 (INT, vlistInqAtt, VLISTINQATT, vlistinqatt, INT, INT, INT, PSTRING,
FCALLSCFUN3
(
INT
,
vlistDelAtt
,
VLISTDELATT
,
vlistdelatt
,
INT
,
INT
,
STRING
)
FCALLSCFUN6
(
INT
,
vlistDefAttInt
,
VLISTDEFATTINT
,
vlistdefattint
,
INT
,
INT
,
STRING
,
INT
,
INT
,
PINT
)
FCALLSCFUN6
(
INT
,
vlistDefAttFlt
,
VLISTDEFATTFLT
,
vlistdefattflt
,
INT
,
INT
,
STRING
,
INT
,
INT
,
PDOUBLE
)
FCALLSCFUN5
(
INT
,
vlistDefAttTxt
,
VLISTDEFATTTXT
,
vlistdefatttxt
,
INT
,
INT
,
STRING
,
INT
,
CBUF
)
FCALLSCFUN5
(
INT
,
vlistDefAttTxt
,
VLISTDEFATTTXT
,
vlistdefatttxt
,
INT
,
INT
,
STRING
,
INT
,
PPSTRING
)
FCALLSCFUN5
(
INT
,
vlistInqAttInt
,
VLISTINQATTINT
,
vlistinqattint
,
INT
,
INT
,
STRING
,
INT
,
PINT
)
FCALLSCFUN5
(
INT
,
vlistInqAttFlt
,
VLISTINQATTFLT
,
vlistinqattflt
,
INT
,
INT
,
STRING
,
INT
,
PDOUBLE
)
FCALLSCFUN5
(
INT
,
vlistInqAttTxt
,
VLISTINQATTTXT
,
vlistinqatttxt
,
INT
,
INT
,
STRING
,
INT
,
CBUF
)
FCALLSCFUN5
(
INT
,
vlistInqAttTxt
,
VLISTINQATTTXT
,
vlistinqatttxt
,
INT
,
INT
,
STRING
,
INT
,
PPSTRING
)
/* GRID routines */
...
...
@@ -344,8 +340,8 @@ FCALLSCSUB2 (gridDefPosition, GRIDDEFPOSITION, griddefposition, INT, INT)
FCALLSCFUN1
(
INT
,
gridInqPosition
,
GRIDINQPOSITION
,
gridinqposition
,
INT
)
FCALLSCSUB2
(
gridDefReference
,
GRIDDEFREFERENCE
,
griddefreference
,
INT
,
STRING
)
FCALLSCFUN2
(
INT
,
gridInqReference
,
GRIDINQREFERENCE
,
gridinqreference
,
INT
,
PSTRING
)
FCALLSCSUB2
(
gridDefUUID
,
GRIDDEFUUID
,
griddefuuid
,
INT
,
CBUF
)
FCALLSCFUN2
(
STRING
,
gridInqUUID
,
GRIDINQUUID
,
gridinquuid
,
INT
,
CBUF
)
FCALLSCSUB2
(
gridDefUUID
,
GRIDDEFUUID
,
griddefuuid
,
INT
,
PPSTRING
)
FCALLSCFUN2
(
STRING
,
gridInqUUID
,
GRIDINQUUID
,
gridinquuid
,
INT
,
PPSTRING
)
/* Lambert Conformal Conic grid (GRIB version) */
...
...
@@ -394,8 +390,8 @@ FCALLSCSUB2 (zaxisDefNlevRef, ZAXISDEFNLEVREF, zaxisdefnlevref, INT, INT)
FCALLSCFUN1
(
INT
,
zaxisInqNlevRef
,
ZAXISINQNLEVREF
,
zaxisinqnlevref
,
INT
)
FCALLSCSUB2
(
zaxisDefNumber
,
ZAXISDEFNUMBER
,
zaxisdefnumber
,
INT
,
INT
)
FCALLSCFUN1
(
INT
,
zaxisInqNumber
,
ZAXISINQNUMBER
,
zaxisinqnumber
,
INT
)
FCALLSCSUB2
(
zaxisDefUUID
,
ZAXISDEFUUID
,
zaxisdefuuid
,
INT
,
CBUF
)
FCALLSCFUN2
(
STRING
,
zaxisInqUUID
,
ZAXISINQUUID
,
zaxisinquuid
,
INT
,
CBUF
)
FCALLSCSUB2
(
zaxisDefUUID
,
ZAXISDEFUUID
,
zaxisdefuuid
,
INT
,
PPSTRING
)
FCALLSCFUN2
(
STRING
,
zaxisInqUUID
,
ZAXISINQUUID
,
zaxisinquuid
,
INT
,
PPSTRING
)
FCALLSCSUB2
(
zaxisDefName
,
ZAXISDEFNAME
,
zaxisdefname
,
INT
,
STRING
)
FCALLSCSUB2
(
zaxisDefLongname
,
ZAXISDEFLONGNAME
,
zaxisdeflongname
,
INT
,
STRING
)
FCALLSCSUB2
(
zaxisDefUnits
,
ZAXISDEFUNITS
,
zaxisdefunits
,
INT
,
STRING
)
...
...
src/cdiFortran.h
deleted
100644 → 0
View file @
5f73504d
#ifndef _CDIFORTRAN_H
#define _CDIFORTRAN_H
/*******************************************************************************
* Character buffer:
*/
#define CBUF_cfINT(N,A,B,X,Y,Z) STRING_cfINT(N,A,B,X,Y,Z)
#define CBUF_cfSEP(T, B) STRING_cfSEP(T,B)
#define CBUF_cfN( T,A) STRING_cfN(T,A)
#define CBUF_cfSTR(N,T,A,B,C,D,E) STRING_cfSTR(N,T,A,B,C,D,E)
#if defined(vmsFortran)
# define CBUF_cfT(M,I,A,B,D) A->dsc$a_pointer
#elif defined(CRAYFortran)
# define CBUF_cfT(M,I,A,B,D) _fcdtocp(A)
#else
# define CBUF_cfT(M,I,A,B,D) A
#endif
#endif
src/make_cdilib
View file @
63dc52a4
...
...
@@ -172,7 +172,6 @@ echo "#undef calloc" >> ${PROG}
echo
"#undef free"
>>
${
PROG
}
echo
"#undef DOUBLE_PRECISION"
>>
${
PROG
}
cat
$srcdir
/cfortran.h
>>
${
PROG
}
cat
$srcdir
/cdiFortran.h
>>
${
PROG
}
echo
"#endif"
>>
${
PROG
}
cat
$srcdir
/cdiFortran.c
>>
${
PROG
}
...
...
src/make_fint.c
View file @
63dc52a4
...
...
@@ -154,7 +154,7 @@ static struct symbol funArgSym[]
"^"
WS
"*(const"
WS
"+)?float"
WS
"+
\\
*"
SYMRE
"?"
WS
"*[,
\\
)]"
,
2
,
0
,
0
},
{
"DOUBLEPRECISION"
,
"PDOUBLE"
,
"double *%.*s"
,
"^"
WS
"*(const"
WS
"+)?double"
WS
"+
\\
*"
SYMRE
"?"
WS
"*[,
\\
)]"
,
2
,
0
,
0
},
{
"CHARACTER*(*)"
,
"
CBUF
"
,
"char *%.*s"
,
{
"CHARACTER*(*)"
,
"
PPSTRING
"
,
"char *%.*s"
,
"^"
WS
"*(const"
WS
"+)?char"
WS
"+
\\
*""([A-Za-z_][A-Za-z_0-9]*_cbuf)"
WS
"*[,
\\
)]"
,
2
,
0
,
0
},
{
"CHARACTER*(*)"
,
"STRING"
,
"char *%.*s"
,
...
...
@@ -322,10 +322,6 @@ static void fortran_interface(char *fname, char *fnameinc, char *fnameint,
fprintf
(
fpint
,
"# include
\"
cfortran.h
\"\n
"
);
fprintf
(
fpint
,
"#endif
\n
"
);
fprintf
(
fpint
,
"
\n
"
);
fprintf
(
fpint
,
"#if ! defined (_CDIFORTRAN_H)
\n
"
);
fprintf
(
fpint
,
"# include
\"
cdiFortran.h
\"\n
"
);
fprintf
(
fpint
,
"#endif
\n
"
);
fprintf
(
fpint
,
"
\n
"
);
ssize_t
lineLen
;
while
((
lineLen
=
getline
(
&
line
,
&
lineBufSize
,
fpin
))
>=
0
)
...
...
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