Commit 738380f8 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Merge trunk into cdi-pio

parent a9b8ae71
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>
* Version 1.6.0 released
......
......@@ -913,6 +913,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}
......
......@@ -929,6 +929,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}
......
......@@ -302,7 +302,7 @@ int main(void)
int year, month, day, hour, minute, second;
int value = 30;
int factor = 86400;
calendar = CALENDAR_360DAYS;
year=1979; month=1; day=15; hour=12; minute=30; second = 0;
......
......@@ -559,9 +559,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);
......
......@@ -4,7 +4,7 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, March 2013
! Uwe Schulzweida, MPI-MET, Hamburg, April 2013
!
INTEGER CDI_MAX_NAME
......@@ -1238,6 +1238,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
......
......@@ -291,6 +291,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 */
......
......@@ -90,8 +90,6 @@ EOR
c="dmemory.c \
dmemory.h \
error.c \
error.h \
taxis.c \
timebase.c \
calendar.c \
......@@ -146,7 +144,7 @@ c="dmemory.c \
h="cdi_limits.h taxis.h dtypes.h file.h service.h extra.h \
ieg.h cdi.h timebase.h calendar.h basetime.h datetime.h \
stream_int.h cgribex.h gribapi.h \
error.c error.h stream_int.h cgribex.h gribapi.h \
stream_cgribex.h stream_gribapi.h stream_grb.h stream_cdf.h \
tablepar.h table.h gaussgrid.h grid.h zaxis.h varscan.h binary.h swap.h \
service.h stream_srv.h stream_ext.h stream_ieg.h cdf_int.h \
......
......@@ -3,7 +3,7 @@
#include <math.h> /* for floor() */
#include "cdi.h"
#include "timebase.h"
/* convert Julian date into year, months, day */
void decode_julday(int calendar,
......
#ifndef _TIMEBASE_H
#define _TIMEBASE_H
#include <inttypes.h>
/* date format: YYYYMMDD */
/* time format: hhmmss */
......
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