cdi.h: changed >char*< to >char *< (bug fix for fortran interface)

ChangeLog

 2013-04-02  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
+	* cdi.h: changed >char*< to >char *< (bug fix for fortran interface)
 	* make_cdilib: changed position of error.c and error.h (bug fix)
 
 2013-03-14  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>

doc/tex/c_quick_ref.tex

@@ -903,6 +903,24 @@ Get the code number of a Variable.
 Get the data type of a Variable.
 
 
+\section*{\tt \htmlref{vlistInqVarDblKey}{vlistInqVarDblKey}}
+
+\begin{verbatim}
+    double vlistInqVarDblKey (int streamID, const char *name);
+\end{verbatim}
+
+raw access to GRIB meta-data.
+
+
+\section*{\tt \htmlref{vlistInqVarIntKey}{vlistInqVarIntKey}}
+
+\begin{verbatim}
+    int vlistInqVarIntKey (int streamID, const char *name);
+\end{verbatim}
+
+raw access to GRIB meta-data.
+
+
 \section*{\tt \htmlref{vlistInqVarLongname}{vlistInqVarLongname}}
 
 \begin{verbatim}

doc/tex/f_quick_ref.tex

@@ -918,6 +918,24 @@ Get the code number of a Variable.
 Get the data type of a Variable.
 
 
+\section*{\tt \htmlref{vlistInqVarDblKey}{vlistInqVarDblKey}}
+
+\begin{verbatim}
+    DOUBLEPRECISION FUNCTION vlistInqVarDblKey (INTEGER streamID, CHARACTER*(*) name)
+\end{verbatim}
+
+raw access to GRIB meta-data.
+
+
+\section*{\tt \htmlref{vlistInqVarIntKey}{vlistInqVarIntKey}}
+
+\begin{verbatim}
+    INTEGER FUNCTION vlistInqVarIntKey (INTEGER streamID, CHARACTER*(*) name)
+\end{verbatim}
+
+raw access to GRIB meta-data.
+
+
 \section*{\tt \htmlref{vlistInqVarLongname}{vlistInqVarLongname}}
 
 \begin{verbatim}

src/cdi.h

@@ -544,9 +544,9 @@ void    vlistDefVarDblKey(int vlistID, int varID, const char *name, double value
 /* vlistInqVarRawBegin: Open GRIB record to retrieve raw meta-data in subsequent calls */
 void    vlistInqVarRawBegin(int streamID, int varID);
 /* vlistInqVarDblKey: raw access to GRIB meta-data */
-double  vlistInqVarDblKey(int streamID, const char* name);
+double  vlistInqVarDblKey(int streamID, const char *name);
 /* vlistInqVarIntKey: raw access to GRIB meta-data */
-int     vlistInqVarIntKey(int streamID, const char* name);
+int     vlistInqVarIntKey(int streamID, const char *name);
 /* vlistInqVarRawEnd: Free previously opened GRIB record */
 void    vlistInqVarRawEnd(int streamID);
 

src/cdi.inc

@@ -4,7 +4,7 @@
 !
 ! Author:
 ! -------
-! Uwe Schulzweida, MPI-MET, Hamburg,   March 2013
+! Uwe Schulzweida, MPI-MET, Hamburg,   April 2013
 !
 
       INTEGER    CDI_MAX_NAME          
@@ -1220,6 +1220,16 @@
 !                                     INTEGER         varID)
       EXTERNAL        vlistInqVarRawBegin
 
+      DOUBLEPRECISION vlistInqVarDblKey
+!                                    (INTEGER         streamID,
+!                                     CHARACTER*(*)   name)
+      EXTERNAL        vlistInqVarDblKey
+
+      INTEGER         vlistInqVarIntKey
+!                                    (INTEGER         streamID,
+!                                     CHARACTER*(*)   name)
+      EXTERNAL        vlistInqVarIntKey
+
 !                     vlistInqVarRawEnd
 !                                    (INTEGER         streamID)
       EXTERNAL        vlistInqVarRawEnd

src/cdiFortran.c

@@ -268,6 +268,8 @@ FCALLSCSUB4 (vlistDefVarDblKey, VLISTDEFVARDBLKEY, vlistdefvardblkey, INT, INT,
 /*  ----------------------------------  */
 
 FCALLSCSUB2 (vlistInqVarRawBegin, VLISTINQVARRAWBEGIN, vlistinqvarrawbegin, INT, INT)
+FCALLSCFUN2 (DOUBLE, vlistInqVarDblKey, VLISTINQVARDBLKEY, vlistinqvardblkey, INT, STRING)
+FCALLSCFUN2 (INT, vlistInqVarIntKey, VLISTINQVARINTKEY, vlistinqvarintkey, INT, STRING)
 FCALLSCSUB1 (vlistInqVarRawEnd, VLISTINQVARRAWEND, vlistinqvarrawend, INT)
 
 /*  VLIST attributes  */