Skip to content

GitLab

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

Fortran interface update.

parent 530da8f2
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 61 deletions
ChangeLog
View file @ b41b3dc5
2019-11-20 Uwe Schulzweida
* Replaced gridInqXstdname()/gridInqYstdname() by cdiInqKeyInt() with CDI_KEY_STDNAME
* Replaced gridInqXstdname()/gridInqYstdname() by cdiInqKeyString() with CDI_KEY_STDNAME
* Replaced gridDefScannigMode()/gridInqScanningMode() by cdiDefKeyInt()/cdiInqKeyInt() with CDI_KEY_SCANNINGMODE
2019-11-12 Uwe Schulzweida
......
doc/tex/c_quick_ref.tex
View file @ b41b3dc5
......@@ -503,15 +503,6 @@ Get the name of a X-axis.
Get the size of a X-axis.
\section*{\tt \htmlref{gridInqXstdname}{gridInqXstdname}}
\begin{verbatim}
void gridInqXstdname (int gridID, char *xstdname);
\end{verbatim}
Get the standard name of a X-axis.
\section*{\tt \htmlref{gridInqXunits}{gridInqXunits}}
\begin{verbatim}
......@@ -584,15 +575,6 @@ Get the name of a Y-axis.
Get the size of a Y-axis.
\section*{\tt \htmlref{gridInqYstdname}{gridInqYstdname}}
\begin{verbatim}
void gridInqYstdname (int gridID, char *ystdname);
\end{verbatim}
Get the standard name of a Y-axis.
\section*{\tt \htmlref{gridInqYunits}{gridInqYunits}}
\begin{verbatim}
......
doc/tex/f_quick_ref.tex
View file @ b41b3dc5
......@@ -511,15 +511,6 @@ Get the name of a X-axis.
Get the size of a X-axis.
\section*{\tt \htmlref{gridInqXstdname}{gridInqXstdname}}
\begin{verbatim}
SUBROUTINE gridInqXstdname (INTEGER gridID, CHARACTER*(*) xstdname)
\end{verbatim}
Get the standard name of a X-axis.
\section*{\tt \htmlref{gridInqXunits}{gridInqXunits}}
\begin{verbatim}
......@@ -592,15 +583,6 @@ Get the name of a Y-axis.
Get the size of a Y-axis.
\section*{\tt \htmlref{gridInqYstdname}{gridInqYstdname}}
\begin{verbatim}
SUBROUTINE gridInqYstdname (INTEGER gridID, CHARACTER*(*) ystdname)
\end{verbatim}
Get the standard name of a Y-axis.
\section*{\tt \htmlref{gridInqYunits}{gridInqYunits}}
\begin{verbatim}
......
src/cdi.inc
View file @ b41b3dc5
......@@ -4,7 +4,7 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, November 2019
! Uwe Schulzweida, MPI-MET, Hamburg, December 2019
!
INTEGER CDI_MAX_NAME
......@@ -1614,6 +1614,8 @@
PARAMETER (CDI_KEY_TYPEOFFIRSTFIXEDSURFACE = 824)
INTEGER CDI_KEY_TYPEOFSECONDFIXEDSURFACE
PARAMETER (CDI_KEY_TYPEOFSECONDFIXEDSURFACE = 825)
INTEGER CDI_KEY_SCANNINGMODE
PARAMETER (CDI_KEY_SCANNINGMODE = 826)
INTEGER CDI_KEY_VDIMNAME
PARAMETER (CDI_KEY_VDIMNAME = 920)
INTEGER CDI_KEY_GRIDMAP_VARTYPE
......@@ -1638,6 +1640,18 @@
PARAMETER (CDI_KEY_P0NAME = 951)
INTEGER CDI_KEY_P0VALUE
PARAMETER (CDI_KEY_P0VALUE = 952)
INTEGER CDI_KEY_UUID
PARAMETER (CDI_KEY_UUID = 960)
INTEGER CDI_KEY_NUMBEROFVGRIDUSED
PARAMETER (CDI_KEY_NUMBEROFVGRIDUSED = 961)
INTEGER CDI_KEY_NLEV
PARAMETER (CDI_KEY_NLEV = 962)
INTEGER CDI_KEY_NUMBEROFGRIDUSED
PARAMETER (CDI_KEY_NUMBEROFGRIDUSED = 963)
INTEGER CDI_KEY_NUMBEROFGRIDINREFERENCE
PARAMETER (CDI_KEY_NUMBEROFGRIDINREFERENCE = 964)
INTEGER CDI_KEY_REFERENCEURI
PARAMETER (CDI_KEY_REFERENCEURI = 965)
INTEGER cdiDefKeyInt
! (INTEGER cdiID,
! INTEGER varID,
......@@ -1768,16 +1782,6 @@
! CHARACTER*(*) yunits)
EXTERNAL gridInqYunits
! gridInqXstdname
! (INTEGER gridID,
! CHARACTER*(*) xstdname)
EXTERNAL gridInqXstdname
! gridInqYstdname
! (INTEGER gridID,
! CHARACTER*(*) ystdname)
EXTERNAL gridInqYstdname
! gridDefDatatype
! (INTEGER gridID,
! INTEGER prec)
......@@ -2039,15 +2043,6 @@
! (INTEGER gridID)
EXTERNAL gridInqComplexPacking
! gridDefScanningMode
! (INTEGER gridID,
! INTEGER mode)
EXTERNAL gridDefScanningMode
INTEGER gridInqScanningMode
! (INTEGER gridID)
EXTERNAL gridInqScanningMode
!
! ZAXIS routines
!
......
src/cdiFortran.c
View file @ b41b3dc5
......@@ -559,8 +559,6 @@ FCALLSCSUB2 (gridDefYlongname, GRIDDEFYLONGNAME, griddefylongname, INT, STRING)
FCALLSCSUB2 (gridInqYlongname, GRIDINQYLONGNAME, gridinqylongname, INT, PSTRING)
FCALLSCSUB2 (gridDefYunits, GRIDDEFYUNITS, griddefyunits, INT, STRING)
FCALLSCSUB2 (gridInqYunits, GRIDINQYUNITS, gridinqyunits, INT, PSTRING)
FCALLSCSUB2 (gridInqXstdname, GRIDINQXSTDNAME, gridinqxstdname, INT, PSTRING)
FCALLSCSUB2 (gridInqYstdname, GRIDINQYSTDNAME, gridinqystdname, INT, PSTRING)
FCALLSCSUB2 (gridDefDatatype, GRIDDEFDATATYPE, griddefdatatype, INT, INT)
FCALLSCFUN1 (INT, gridInqDatatype, GRIDINQDATATYPE, gridinqdatatype, INT)
static double gridInqXval_fwrap(int gridID, int index)
......@@ -653,8 +651,6 @@ FCALLSCSUB2 (gridInqReducedPoints, GRIDINQREDUCEDPOINTS, gridinqreducedpoints, I
FCALLSCSUB2 (gridChangeType, GRIDCHANGETYPE, gridchangetype, INT, INT)
FCALLSCSUB2 (gridDefComplexPacking, GRIDDEFCOMPLEXPACKING, griddefcomplexpacking, INT, INT)
FCALLSCFUN1 (INT, gridInqComplexPacking, GRIDINQCOMPLEXPACKING, gridinqcomplexpacking, INT)
FCALLSCSUB2 (gridDefScanningMode, GRIDDEFSCANNINGMODE, griddefscanningmode, INT, INT)
FCALLSCFUN1 (INT, gridInqScanningMode, GRIDINQSCANNINGMODE, gridinqscanningmode, INT)
/* ZAXIS routines */
......
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