Commit 30277221 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Fortran interface update.

parent 1e9e2e9d
......@@ -1399,15 +1399,6 @@ Define the number of half levels of a generalized Z-axis.
Define the reference number for a generalized Z-axis.
\section*{\tt \htmlref{zaxisDefPsName}{zaxisDefPsName}}
\begin{verbatim}
void zaxisDefPsName (int zaxisID, const char *psname_optional);
\end{verbatim}
Define the name of the surface pressure variable of a hybrid sigma pressure Z-axis.
\section*{\tt \htmlref{zaxisDefUUID}{zaxisDefUUID}}
\begin{verbatim}
......@@ -1456,7 +1447,7 @@ Get one level of a Z-axis.
\section*{\tt \htmlref{zaxisInqLevels}{zaxisInqLevels}}
\begin{verbatim}
void zaxisInqLevels (int zaxisID, double levels[]);
int zaxisInqLevels (int zaxisID, double levels[]);
\end{verbatim}
Get all levels of a Z-axis.
......@@ -1498,15 +1489,6 @@ Get the number of half levels of a generalized Z-axis.
Get the reference number to a generalized Z-axis.
\section*{\tt \htmlref{zaxisInqPsName}{zaxisInqPsName}}
\begin{verbatim}
void zaxisInqPsName (int zaxisID, char *psname);
\end{verbatim}
Get the name of the surface pressure variable of a hybrid sigma pressure Z-axis.
\section*{\tt \htmlref{zaxisInqSize}{zaxisInqSize}}
\begin{verbatim}
......
......@@ -1417,15 +1417,6 @@ Define the number of half levels of a generalized Z-axis.
Define the reference number for a generalized Z-axis.
\section*{\tt \htmlref{zaxisDefPsName}{zaxisDefPsName}}
\begin{verbatim}
SUBROUTINE zaxisDefPsName (INTEGER zaxisID, CHARACTER*(*) psname_optional)
\end{verbatim}
Define the name of the surface pressure variable of a hybrid sigma pressure Z-axis.
\section*{\tt \htmlref{zaxisDefUUID}{zaxisDefUUID}}
\begin{verbatim}
......@@ -1474,7 +1465,7 @@ Get one level of a Z-axis.
\section*{\tt \htmlref{zaxisInqLevels}{zaxisInqLevels}}
\begin{verbatim}
SUBROUTINE zaxisInqLevels (INTEGER zaxisID, DOUBLEPRECISION levels(*))
INTEGER FUNCTION zaxisInqLevels (INTEGER zaxisID, DOUBLEPRECISION levels(*))
\end{verbatim}
Get all levels of a Z-axis.
......@@ -1516,15 +1507,6 @@ Get the number of half levels of a generalized Z-axis.
Get the reference number to a generalized Z-axis.
\section*{\tt \htmlref{zaxisInqPsName}{zaxisInqPsName}}
\begin{verbatim}
SUBROUTINE zaxisInqPsName (INTEGER zaxisID, CHARACTER*(*) psname)
\end{verbatim}
Get the name of the surface pressure variable of a hybrid sigma pressure Z-axis.
\section*{\tt \htmlref{zaxisInqSize}{zaxisInqSize}}
\begin{verbatim}
......
......@@ -4,7 +4,7 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, August 2016
! Uwe Schulzweida, MPI-MET, Hamburg, September 2016
!
INTEGER CDI_MAX_NAME
......@@ -602,7 +602,7 @@
EXTERNAL streamInqNvars
!
! STREAM var I/O routines
! STREAM var I/O routines (random access)
!
! streamWriteVar
! (INTEGER streamID,
......@@ -673,7 +673,7 @@
EXTERNAL streamWriteVarChunk
!
! STREAM record I/O routines
! STREAM record I/O routines (sequential access)
!
! streamDefRecord
! (INTEGER streamID,
......@@ -1548,26 +1548,39 @@
!
INTEGER CDI_KEY_XNAME
PARAMETER (CDI_KEY_XNAME = 901)
INTEGER CDI_KEY_YNAME
PARAMETER (CDI_KEY_YNAME = 902)
INTEGER CDI_KEY_XDIMNAME
PARAMETER (CDI_KEY_XDIMNAME = 903)
INTEGER CDI_KEY_YDIMNAME
PARAMETER (CDI_KEY_YDIMNAME = 904)
INTEGER CDI_KEY_VDIMNAME
PARAMETER (CDI_KEY_VDIMNAME = 905)
PARAMETER (CDI_KEY_XDIMNAME = 902)
INTEGER CDI_KEY_XLONGNAME
PARAMETER (CDI_KEY_XLONGNAME = 906)
INTEGER CDI_KEY_YLONGNAME
PARAMETER (CDI_KEY_YLONGNAME = 907)
PARAMETER (CDI_KEY_XLONGNAME = 903)
INTEGER CDI_KEY_XUNITS
PARAMETER (CDI_KEY_XUNITS = 908)
PARAMETER (CDI_KEY_XUNITS = 904)
INTEGER CDI_KEY_YNAME
PARAMETER (CDI_KEY_YNAME = 911)
INTEGER CDI_KEY_YDIMNAME
PARAMETER (CDI_KEY_YDIMNAME = 912)
INTEGER CDI_KEY_YLONGNAME
PARAMETER (CDI_KEY_YLONGNAME = 913)
INTEGER CDI_KEY_YUNITS
PARAMETER (CDI_KEY_YUNITS = 909)
PARAMETER (CDI_KEY_YUNITS = 914)
INTEGER CDI_KEY_VDIMNAME
PARAMETER (CDI_KEY_VDIMNAME = 920)
INTEGER CDI_KEY_MAPNAME
PARAMETER (CDI_KEY_MAPNAME = 920)
PARAMETER (CDI_KEY_MAPNAME = 921)
INTEGER CDI_KEY_MAPPING
PARAMETER (CDI_KEY_MAPPING = 921)
PARAMETER (CDI_KEY_MAPPING = 922)
!
! CDI zaxis string key values
!
INTEGER CDI_KEY_NAME
PARAMETER (CDI_KEY_NAME = 941)
INTEGER CDI_KEY_DIMNAME
PARAMETER (CDI_KEY_DIMNAME = 942)
INTEGER CDI_KEY_LONGNAME
PARAMETER (CDI_KEY_LONGNAME = 943)
INTEGER CDI_KEY_UNITS
PARAMETER (CDI_KEY_UNITS = 944)
INTEGER CDI_KEY_PSNAME
PARAMETER (CDI_KEY_PSNAME = 950)
INTEGER cdiGridDefKeyStr
! (INTEGER gridID,
! INTEGER key,
......@@ -1895,11 +1908,6 @@
! (INTEGER zaxisID)
EXTERNAL zaxisDuplicate
! zaxisResize
! (INTEGER zaxisID,
! INTEGER size)
EXTERNAL zaxisResize
! zaxisPrint
! (INTEGER zaxisID,
! INTEGER index)
......@@ -1910,7 +1918,7 @@
! DOUBLEPRECISION levels(*))
EXTERNAL zaxisDefLevels
! zaxisInqLevels
INTEGER zaxisInqLevels
! (INTEGER zaxisID,
! DOUBLEPRECISION levels(*))
EXTERNAL zaxisInqLevels
......@@ -1954,32 +1962,19 @@
! INTEGER*1(16) uuid)
EXTERNAL zaxisInqUUID
!
! CDI zaxis string key values
!
INTEGER CDI_ZAXIS_NAME
PARAMETER (CDI_ZAXIS_NAME = 801)
INTEGER CDI_ZAXIS_DIMNAME
PARAMETER (CDI_ZAXIS_DIMNAME = 802)
INTEGER CDI_ZAXIS_VDIMNAME
PARAMETER (CDI_ZAXIS_VDIMNAME = 803)
INTEGER CDI_ZAXIS_LONGNAME
PARAMETER (CDI_ZAXIS_LONGNAME = 804)
INTEGER CDI_ZAXIS_UNITS
PARAMETER (CDI_ZAXIS_UNITS = 805)
INTEGER cdiZaxisDefString
INTEGER cdiZaxisDefKeyStr
! (INTEGER zaxisID,
! INTEGER key,
! INTEGER size,
! CHARACTER*(*) mesg)
EXTERNAL cdiZaxisDefString
EXTERNAL cdiZaxisDefKeyStr
INTEGER cdiZaxisInqString
INTEGER cdiZaxisInqKeyStr
! (INTEGER zaxisID,
! INTEGER key,
! INTEGER size,
! CHARACTER*(*) mesg)
EXTERNAL cdiZaxisInqString
EXTERNAL cdiZaxisInqKeyStr
! zaxisDefName
! (INTEGER zaxisID,
......@@ -2016,16 +2011,6 @@
! CHARACTER*(*) stdname)
EXTERNAL zaxisInqStdname
! zaxisDefPsName
! (INTEGER zaxisID,
! CHARACTER*(*) psname_optional)
EXTERNAL zaxisDefPsName
! zaxisInqPsName
! (INTEGER zaxisID,
! CHARACTER*(*) psname)
EXTERNAL zaxisInqPsName
! zaxisDefPrec
! (INTEGER zaxisID,
! INTEGER prec)
......
......@@ -134,7 +134,7 @@ FCALLSCFUN1 (STRING, streamFilename, STREAMFILENAME, streamfilename, INT)
FCALLSCFUN1 (STRING, streamFilesuffix, STREAMFILESUFFIX, streamfilesuffix, INT)
FCALLSCFUN1 (INT, streamInqNvars, STREAMINQNVARS, streaminqnvars, INT)
/* STREAM var I/O routines */
/* STREAM var I/O routines (random access) */
FCALLSCSUB4 (streamWriteVar, STREAMWRITEVAR, streamwritevar, INT, INT, DOUBLEV, INT)
FCALLSCSUB4 (streamWriteVarF, STREAMWRITEVARF, streamwritevarf, INT, INT, FLOATV, INT)
......@@ -146,7 +146,7 @@ FCALLSCSUB5 (streamReadVarSlice, STREAMREADVARSLICE, streamreadvarslice, INT, IN
FCALLSCSUB5 (streamReadVarSliceF, STREAMREADVARSLICEF, streamreadvarslicef, INT, INT, INT, FLOATV, PINT)
FCALLSCSUB5 (streamWriteVarChunk, STREAMWRITEVARCHUNK, streamwritevarchunk, INT, INT, INTVV, DOUBLEV, INT)
/* STREAM record I/O routines */
/* STREAM record I/O routines (sequential access) */
FCALLSCSUB3 (streamDefRecord, STREAMDEFRECORD, streamdefrecord, INT, INT, INT)
FCALLSCSUB3 (streamInqRecord, STREAMINQRECORD, streaminqrecord, INT, PINT, PINT)
......@@ -331,6 +331,9 @@ FCALLSCFUN2 (INT, gridInqYvals, GRIDINQYVALS, gridinqyvals, INT, DOUBLEV)
/* CDI grid string key values */
/* CDI zaxis string key values */
FCALLSCFUN4 (INT, cdiGridDefKeyStr, CDIGRIDDEFKEYSTR, cdigriddefkeystr, INT, INT, INT, STRING)
FCALLSCFUN4 (INT, cdiGridInqKeyStr, CDIGRIDINQKEYSTR, cdigridinqkeystr, INT, INT, INT, PSTRING)
FCALLSCSUB2 (gridDefXname, GRIDDEFXNAME, griddefxname, INT, STRING)
......@@ -405,10 +408,9 @@ FCALLSCSUB1 (zaxisDestroy, ZAXISDESTROY, zaxisdestroy, INT)
FCALLSCFUN1 (INT, zaxisInqType, ZAXISINQTYPE, zaxisinqtype, INT)
FCALLSCFUN1 (INT, zaxisInqSize, ZAXISINQSIZE, zaxisinqsize, INT)
FCALLSCFUN1 (INT, zaxisDuplicate, ZAXISDUPLICATE, zaxisduplicate, INT)
FCALLSCSUB2 (zaxisResize, ZAXISRESIZE, zaxisresize, INT, INT)
FCALLSCSUB2 (zaxisPrint, ZAXISPRINT, zaxisprint, INT, INT)
FCALLSCSUB2 (zaxisDefLevels, ZAXISDEFLEVELS, zaxisdeflevels, INT, DOUBLEV)
FCALLSCSUB2 (zaxisInqLevels, ZAXISINQLEVELS, zaxisinqlevels, INT, DOUBLEV)
FCALLSCFUN2 (INT, zaxisInqLevels, ZAXISINQLEVELS, zaxisinqlevels, INT, DOUBLEV)
FCALLSCSUB3 (zaxisDefLevel, ZAXISDEFLEVEL, zaxisdeflevel, INT, INT, DOUBLE)
FCALLSCFUN2 (DOUBLE, zaxisInqLevel, ZAXISINQLEVEL, zaxisinqlevel, INT, INT)
FCALLSCSUB2 (zaxisDefNlevRef, ZAXISDEFNLEVREF, zaxisdefnlevref, INT, INT)
......@@ -417,11 +419,8 @@ FCALLSCSUB2 (zaxisDefNumber, ZAXISDEFNUMBER, zaxisdefnumber, INT, INT)
FCALLSCFUN1 (INT, zaxisInqNumber, ZAXISINQNUMBER, zaxisinqnumber, INT)
FCALLSCSUB2 (zaxisDefUUID, ZAXISDEFUUID, zaxisdefuuid, INT, PVOID)
FCALLSCSUB2 (zaxisInqUUID, ZAXISINQUUID, zaxisinquuid, INT, PVOID)
/* CDI zaxis string key values */
FCALLSCFUN4 (INT, cdiZaxisDefKeyStr, CDIZAXISDEFSTRING, cdizaxisdefstring, INT, INT, INT, STRING)
FCALLSCFUN4 (INT, cdiZaxisInqKeyStr, CDIZAXISINQSTRING, cdizaxisinqstring, INT, INT, INT, PSTRING)
FCALLSCFUN4 (INT, cdiZaxisDefKeyStr, CDIZAXISDEFKEYSTR, cdizaxisdefkeystr, INT, INT, INT, STRING)
FCALLSCFUN4 (INT, cdiZaxisInqKeyStr, CDIZAXISINQKEYSTR, cdizaxisinqkeystr, INT, INT, INT, PSTRING)
FCALLSCSUB2 (zaxisDefName, ZAXISDEFNAME, zaxisdefname, INT, STRING)
FCALLSCSUB2 (zaxisInqName, ZAXISINQNAME, zaxisinqname, INT, PSTRING)
FCALLSCSUB2 (zaxisDefLongname, ZAXISDEFLONGNAME, zaxisdeflongname, INT, STRING)
......@@ -429,8 +428,6 @@ FCALLSCSUB2 (zaxisInqLongname, ZAXISINQLONGNAME, zaxisinqlongname, INT, PSTRING)
FCALLSCSUB2 (zaxisDefUnits, ZAXISDEFUNITS, zaxisdefunits, INT, STRING)
FCALLSCSUB2 (zaxisInqUnits, ZAXISINQUNITS, zaxisinqunits, INT, PSTRING)
FCALLSCSUB2 (zaxisInqStdname, ZAXISINQSTDNAME, zaxisinqstdname, INT, PSTRING)
FCALLSCSUB2 (zaxisDefPsName, ZAXISDEFPSNAME, zaxisdefpsname, INT, STRING)
FCALLSCSUB2 (zaxisInqPsName, ZAXISINQPSNAME, zaxisinqpsname, INT, PSTRING)
FCALLSCSUB2 (zaxisDefPrec, ZAXISDEFPREC, zaxisdefprec, INT, INT)
FCALLSCFUN1 (INT, zaxisInqPrec, ZAXISINQPREC, zaxisinqprec, INT)
FCALLSCSUB2 (zaxisDefPositive, ZAXISDEFPOSITIVE, zaxisdefpositive, INT, INT)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment