Commit e0ecf58a authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Merge trunk into branch cdi-pio.

parent 738380f8
......@@ -107,14 +107,18 @@ examples/cdi_copy_f.f -text
examples/cdi_copy_file.c -text
examples/cdi_open.c -text
examples/cdi_read.c -text
examples/cdi_read_atts.f -text
examples/cdi_read_example.f90 -text
examples/cdi_read_f.f -text
examples/cdi_read_f2003.f90 -text
examples/cdi_read_records.c -text
examples/cdi_read_simple.f -text
examples/cdi_read_sst.f -text
examples/cdi_write.c -text
examples/cdi_write_ens.c -text
examples/cdi_write_f.f -text
examples/cdi_write_f2003.f90 -text
examples/cdi_write_hybrid.c -text
examples/cdi_write_reset.c -text
examples/compf -text
examples/pio/Makefile.am -text
......@@ -180,7 +184,10 @@ src/cdf_int.h -text
src/cdi.h -text
src/cdi.inc -text
src/cdiFortran.c -text
src/cdiFortran.h -text
src/cdi_error.c -text
src/cdi_int.c -text
src/cdi_int.h -text
src/cdi_limits.h -text
src/cdi_util.c -text
src/cdilib.c -text
......@@ -259,8 +266,6 @@ src/stream_gribapi.h -text
src/stream_history.c -text
src/stream_ieg.c -text
src/stream_ieg.h -text
src/stream_int.c -text
src/stream_int.h -text
src/stream_record.c -text
src/stream_srv.c -text
src/stream_srv.h -text
......
2013-06-18 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Version 1.6.1 released
2013-06-11 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* GRIB2: added support for snow level (level type 114)
* GRIB2: added support for layers with zaxis type ZAXIS_PRESSURE
2013-06-06 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfDefVarMissval: changed xtype from NC_BYTE to NC_INT for missvals > 127 (workaround for a netCDF bug)
* use 'number_of_grid_used' only for undefined grid types
2013-06-03 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added patch from Florian Prill: Lesen von 'number_of_grid_used', GRID_REFERENCE (bug fix)
2013-05-29 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* netCDF: skip 4D variables without time dimension (bug fix)
2013-05-28 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* GRIB2: added support for pressure levels with 3 fractional digits
2013-05-27 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gribapiGetEndStep: use stepUnits for timeunits2
* grib2GetLevel: set level bounds if 0 < leveltype2 < 255
2013-05-23 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* netCDF: missing_value attribute removed [Bug #3592]
2013-05-17 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added CDI function cdiHaveFiletype() to check whether a filetype is available
2013-05-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added patch from Florian Prill: Lesen von "Nicht-Standard" GRIB-Keys (bug fix)
2013-04-26 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added patch from Florian Prill: Lesen von "Nicht-Standard" GRIB-Keys
2013-04-25 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* institutInq: check contents of name and longname (bug fix) [Bug #3419]
2013-04-23 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cfortran.h::kill_trailing: wrong result with gcc -O3, use prama for -O2 (bug fix) [report: Luis Kornblueh]
* vlistXXXAttTxt: use cdi fortran datatype CBUF (char *) for the last argument (bug fix) [report: Luis Kornblueh]
* gridXXXUUID: use cdi fortran datatype CBUF (char *) for the last argument (bug fix) [Bug #3424]
* zaxisXXXUUID: use cdi fortran datatype CBUF (char *) for the last argument (bug fix)
2013-04-19 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* stream_gribapi: replaced function getLevelFactor() [Bug #3446]
2013-04-18 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added function vlistDefVarExtra() and vlistInqVarExtra()
2013-04-04 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* vlistDefVarDatatype: changed default missing values of signed integers to -TYPE_MAX
2013-04-02 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdi.h: changed >char*< to >char *< (bug fix for fortran interface)
......
CDI NEWS
--------
Version 1.6.1 (18 June 2013):
New features:
* GRIB2: added support for snow level (level type 114)
* GRIB2: added support for layers with zaxis type ZAXIS_PRESSURE
New functions:
* cdiHaveFiletype(): Check whether a filetype is available
Fixed bugs:
* stream_gribapi: replaced function getLevelFactor() [Bug #3446]
* gridXXXUUID: use cdi fortran datatype CBUF (char *) for the last argument (bug fix) [Bug #3424]
* institutInq: check contents of name and longname (bug fix) [Bug #3419]
* netCDF: missing_value attribute removed [Bug #3592]
Version 1.6.0 (14 March 2013):
New features:
......
......@@ -56,6 +56,9 @@ int complevel = 0; // Compression level
static
void version(void)
{
int filetypes[] = {FILETYPE_SRV, FILETYPE_EXT, FILETYPE_IEG, FILETYPE_GRB, FILETYPE_GRB2, FILETYPE_NC, FILETYPE_NC2, FILETYPE_NC4, FILETYPE_NC4C};
char *typenames[] = { "srv", "ext", "ieg", "grb", "grb2", "nc", "nc2", "nc4", "nc4c"};
fprintf(stderr, "CDI version 1.8\n");
#if defined (COMPILER)
fprintf(stderr, "Compiler: %s\n", COMPILER);
......@@ -63,6 +66,16 @@ void version(void)
#if defined (COMP_VERSION)
fprintf(stderr, " version: %s\n", COMP_VERSION);
#endif
#if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
fprintf(stderr, "Compiled: by %s on %s (%s) %s %s\n",
USER_NAME, HOST_NAME, SYSTEM_TYPE, __DATE__, __TIME__);
#endif
fprintf(stderr, "filetype: ");
for ( size_t i = 0; i < sizeof(filetypes)/sizeof(int); ++i )
if ( cdiHaveFiletype(filetypes[i]) ) fprintf(stderr, "%s ", typenames[i]);
fprintf(stderr, "\n");
fprintf(stderr, " with:");
#if defined (HAVE_LIBPTHREAD)
fprintf(stderr, " PTHREADS");
......@@ -95,10 +108,6 @@ void version(void)
fprintf(stderr, " CURL");
#endif
fprintf(stderr, "\n");
#if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
fprintf(stderr, "Compiled: by %s on %s (%s) %s %s\n",
USER_NAME, HOST_NAME, SYSTEM_TYPE, __DATE__, __TIME__);
#endif
cdiPrintVersion();
fprintf(stderr, "\n");
/*
......
......@@ -18,10 +18,10 @@ case "${HOSTNAME}" in
--enable-swig \
--enable-python \
--with-jasper=/opt/local \
--with-grib_api=$HOME/local/gribapi-1.9.16 \
--with-grib_api=$HOME/local/gribapi-1.10.4 \
--with-netcdf=$HOME/local \
--with-szlib=$HOME/local \
CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -march=native -Df2cFortran" LIBS="-L/opt/local/lib -lopenjpeg"
CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -march=native -Df2cFortran"
;;
cinglung*|feilung*|wanglung*)
./configure --prefix=$HOME/local \
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdi 1.6.0.
# Generated by GNU Autoconf 2.68 for cdi 1.6.1.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.6.0'
PACKAGE_STRING='cdi 1.6.0'
PACKAGE_VERSION='1.6.1'
PACKAGE_STRING='cdi 1.6.1'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
 
......@@ -685,6 +685,9 @@ PTHREAD_CFLAGS
PTHREAD_LIBS
PTHREAD_CC
ax_pthread_config
SYSTEM_TYPE
HOST_NAME
USER_NAME
AS
CXXCPP
am__fastdepCXX_FALSE
......@@ -769,9 +772,6 @@ am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
SYSTEM_TYPE
HOST_NAME
USER_NAME
host_os
host_vendor
host_cpu
......@@ -1421,7 +1421,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdi 1.6.0 to adapt to many kinds of systems.
\`configure' configures cdi 1.6.1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1491,7 +1491,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.6.0:";;
short | recursive ) echo "Configuration of cdi 1.6.1:";;
esac
cat <<\_ACEOF
 
......@@ -1659,7 +1659,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.6.0
cdi configure 1.6.1
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2420,7 +2420,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by cdi $as_me 1.6.0, which was
It was created by cdi $as_me 1.6.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -2878,41 +2878,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
# Checks for username, hostname and system type
USERNAME=$LOGNAME
if test -z "$USERNAME" ; then USERNAME=$USER; fi;
if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
cat >>confdefs.h <<_ACEOF
#define USER_NAME "$USERNAME"
_ACEOF
USER_NAME="$USERNAME"
if test -z "$HOST"; then :
HOST=unknown
if test -x /bin/hostname; then :
HOST=$(hostname)
else
if test -x /bin/uname; then :
HOST=$(uname -n)
fi
fi
fi
cat >>confdefs.h <<_ACEOF
#define HOST_NAME "$HOST"
_ACEOF
HOST_NAME="$HOST"
cat >>confdefs.h <<_ACEOF
#define SYSTEM_TYPE "$ac_cv_build"
_ACEOF
SYSTEM_TYPE="$ac_cv_build"
 
am__api_version='1.11'
 
......@@ -3352,7 +3317,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.6.0'
VERSION='1.6.1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -23916,6 +23881,62 @@ cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_ISNAN $ac_have_decl
_ACEOF
 
# Check compiler version
case "$CC" in
pgcc*) COMP_VERSION=`$CC -V | head -2 | tail -n 1`;;
*gcc*) COMP_VERSION=`$CC --version | head -n 1`;;
g++*) COMP_VERSION=`$CC --version | head -n 1`;;
clang*) COMP_VERSION=`$CC --version | head -n 1`;;
sxc*) COMP_VERSION=`$CC -V 2>&1 | tail -n 1`;;
xlc*) COMP_VERSION=`$CC -qversion 2>&1 | head -n 1`;;
*) COMP_VERSION=`$CC -V 2>&1 | head -n 1`;;
esac
if test -z "$COMP_VERSION" ; then COMP_VERSION="unknown"; fi;
cat >>confdefs.h <<_ACEOF
#define COMP_VERSION "$COMP_VERSION"
_ACEOF
# Checks for username, hostname and system type
USERNAME=$LOGNAME
if test -z "$USERNAME" ; then USERNAME=$USER; fi;
if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
cat >>confdefs.h <<_ACEOF
#define USER_NAME "$USERNAME"
_ACEOF
USER_NAME="$USERNAME"
if test -z "$HOST"; then :
HOST=unknown
if test -x /bin/hostname; then :
HOST=$(hostname)
else
if test -x /bin/uname; then :
HOST=$(uname -n)
fi
fi
fi
cat >>confdefs.h <<_ACEOF
#define HOST_NAME "$HOST"
_ACEOF
HOST_NAME="$HOST"
cat >>confdefs.h <<_ACEOF
#define SYSTEM_TYPE "$ac_cv_build"
_ACEOF
SYSTEM_TYPE="$ac_cv_build"
# ----------------------------------------------------------------------
# Check for math library
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5
......@@ -27270,6 +27291,14 @@ fi
 
 
 
# Checks for compiler
COMPILER="$CC $CFLAGS"
cat >>confdefs.h <<_ACEOF
#define COMPILER "$COMPILER"
_ACEOF
ac_config_files="$ac_config_files tests/test_cksum_grib tests/test_cksum_nc tests/test_cksum_nc2 tests/test_cksum_nc4 tests/test_cksum_extra tests/test_cksum_service tests/test_cksum_ieg tests/pio_write_run tests/pio_cksum_mpinonb tests/pio_cksum_fpguard tests/pio_cksum_asynch tests/pio_cksum_writer tests/pio_cksum_cdf util/serialrun"
 
 
......@@ -27853,7 +27882,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdi $as_me 1.6.0, which was
This file was extended by cdi $as_me 1.6.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -27919,7 +27948,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cdi config.status 1.6.0
cdi config.status 1.6.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdi], [1.6.0], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.6.1], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......@@ -10,21 +10,6 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
# Checks for username, hostname and system type
USERNAME=$LOGNAME
if test -z "$USERNAME" ; then USERNAME=$USER; fi;
if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
AC_DEFINE_UNQUOTED([USER_NAME],["$USERNAME"], [User name])
AC_SUBST([USER_NAME],["$USERNAME"])
AS_IF([test -z "$HOST"],
[HOST=unknown
AS_IF([test -x /bin/hostname],[HOST=$(hostname)],
[AS_IF([test -x /bin/uname],
[HOST=$(uname -n)])])])
AC_DEFINE_UNQUOTED([HOST_NAME],["$HOST"],[Host name])
AC_SUBST([HOST_NAME],["$HOST"])
AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([src/config.h])
......@@ -80,6 +65,38 @@ AC_CHECK_FUNCS([getline])
# Checks for the availability of ANSI-C99 functions
AC_CHECK_DECLS([isnan],,,[AC_INCLUDES_DEFAULT
@%:@include <math.h>])
# Check compiler version
case "$CC" in
pgcc*) COMP_VERSION=`$CC -V | head -2 | tail -n 1`;;
*gcc*) COMP_VERSION=`$CC --version | head -n 1`;;
g++*) COMP_VERSION=`$CC --version | head -n 1`;;
clang*) COMP_VERSION=`$CC --version | head -n 1`;;
sxc*) COMP_VERSION=`$CC -V 2>&1 | tail -n 1`;;
xlc*) COMP_VERSION=`$CC -qversion 2>&1 | head -n 1`;;
*) COMP_VERSION=`$CC -V 2>&1 | head -n 1`;;
esac
if test -z "$COMP_VERSION" ; then COMP_VERSION="unknown"; fi;
AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
# Checks for username, hostname and system type
USERNAME=$LOGNAME
if test -z "$USERNAME" ; then USERNAME=$USER; fi;
if test -z "$USERNAME" ; then USERNAME="unknown"; fi;
AC_DEFINE_UNQUOTED([USER_NAME],["$USERNAME"], [User name])
AC_SUBST([USER_NAME],["$USERNAME"])
AS_IF([test -z "$HOST"],
[HOST=unknown
AS_IF([test -x /bin/hostname],[HOST=$(hostname)],
[AS_IF([test -x /bin/uname],
[HOST=$(uname -n)])])])
AC_DEFINE_UNQUOTED([HOST_NAME],["$HOST"],[Host name])
AC_SUBST([HOST_NAME],["$HOST"])
AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
# ----------------------------------------------------------------------
# Check for math library
AC_CHECK_LIB(m, floor)
......@@ -262,6 +279,10 @@ AM_CONDITIONAL([USE_FC],[test -n "$FC" && test "X$FC" != "Xno" && test x$acx_cv_
AC_SUBST([CPPFLAGS])
# Checks for compiler
COMPILER="$CC $CFLAGS"
AC_DEFINE_UNQUOTED(COMPILER, ["$COMPILER"], [Compiler])
AC_CONFIG_FILES([tests/test_cksum_grib \
tests/test_cksum_nc \
tests/test_cksum_nc2 \
......
......@@ -4,6 +4,15 @@
This appendix provide a brief listing of the C language bindings of the
CDI library routines:
\section*{\tt \htmlref{cdiDefAdditionalKey}{cdiDefAdditionalKey}}
\begin{verbatim}
void cdiDefAdditionalKey (const char *string);
\end{verbatim}
Register an additional GRIB key which is read when file is opened..
\section*{\tt \htmlref{gridCreate}{gridCreate}}
\begin{verbatim}
......@@ -706,7 +715,7 @@ Define an integer attribute.
\begin{verbatim}
int vlistDefAttTxt (int vlistID, int varID, const char *name, int len,
const char *tp);
const char *tp_cbuf);
\end{verbatim}
Define a text attribute.
......@@ -757,6 +766,15 @@ Define the data type of a Variable.
Set an arbitrary keyword/double value pair for GRIB API.
\section*{\tt \htmlref{vlistDefVarExtra}{vlistDefVarExtra}}
\begin{verbatim}
void vlistDefVarExtra (int vlistID, int varID, const char *extra);
\end{verbatim}
Define extra information of a Variable.
\section*{\tt \htmlref{vlistDefVarIntKey}{vlistDefVarIntKey}}
\begin{verbatim}
......@@ -871,7 +889,8 @@ Get the value(s) of an integer attribute.
\section*{\tt \htmlref{vlistInqAttTxt}{vlistInqAttTxt}}
\begin{verbatim}
int vlistInqAttTxt (int vlistID, int varID, const char *name, int mlen, char *tp);
int vlistInqAttTxt (int vlistID, int varID, const char *name, int mlen,
char *tp_cbuf);
\end{verbatim}
Get the value(s) of a text attribute.
......@@ -916,16 +935,25 @@ Get the data type of a Variable.
\section*{\tt \htmlref{vlistInqVarDblKey}{vlistInqVarDblKey}}
\begin{verbatim}
double vlistInqVarDblKey (int streamID, const char *name);
double vlistInqVarDblKey (int vlistID, int varID, const char *name);
\end{verbatim}
raw access to GRIB meta-data.
\section*{\tt \htmlref{vlistInqVarExtra}{vlistInqVarExtra}}
\begin{verbatim}
void vlistInqVarExtra (int vlistID, int varID, char *extra);
\end{verbatim}
Get extra information of a Variable.
\section*{\tt \htmlref{vlistInqVarIntKey}{vlistInqVarIntKey}}
\begin{verbatim}
int vlistInqVarIntKey (int streamID, const char *name);
int vlistInqVarIntKey (int vlistID, int varID, const char *name);
\end{verbatim}
raw access to GRIB meta-data.
......@@ -967,24 +995,6 @@ Get the name of a Variable.
Get the parameter number of a Variable.
\section*{\tt \htmlref{vlistInqVarRawBegin}{vlistInqVarRawBegin}}
\begin{verbatim}
void vlistInqVarRawBegin (int streamID, int varID);
\end{verbatim}
Open GRIB record to retrieve raw meta-data in subsequent calls.
\section*{\tt \htmlref{vlistInqVarRawEnd}{vlistInqVarRawEnd}}
\begin{verbatim}
void vlistInqVarRawEnd (int streamID);
\end{verbatim}
Free previously opened GRIB record.
\section*{\tt \htmlref{vlistInqVarStdname}{vlistInqVarStdname}}
\begin{verbatim}
......@@ -1105,7 +1115,7 @@ Define the reference of a generalized Z-axis.
\section*{\tt \htmlref{zaxisDefUUID}{zaxisDefUUID}}
\begin{verbatim}
void zaxisDefUUID (int zaxisID, const char *uuid);
void zaxisDefUUID (int zaxisID, const char *uuid_cbuf);
\end{verbatim}
Define the uuid of a generalized Z-axis.
......@@ -1213,7 +1223,7 @@ Get the type of a Z-axis.
\section*{\tt \htmlref{zaxisInqUUID}{zaxisInqUUID}}
\begin{verbatim}
char * zaxisInqUUID (int zaxisID, char *uuid);
char * zaxisInqUUID (int zaxisID, char *uuid_cbuf);
\end{verbatim}
Get the reference of a generalized Z-axis.
......
......@@ -1183,7 +1183,7 @@ vlistInqAttFlt
\fi
}
\begin{verbatim}
int vlistInqAttFlt(int vlistID, int varID, const char *name, int mlen, int *dp);
int vlistInqAttFlt(int vlistID, int varID, const char *name, int mlen, double *dp);
\end{verbatim}
Get the value(s) of a floating point attribute
......@@ -1213,7 +1213,7 @@ vlistInqAttTxt
\fi
}
\begin{verbatim}
int vlistInqAttTxt(int vlistID, int varID, const char *name, int mlen, int *tp);
int vlistInqAttTxt(int vlistID, int varID, const char *name, int mlen, char *tp);
\end{verbatim}
Get the value(s) of a text attribute
......
......@@ -160,7 +160,7 @@ The function {\tt vlistInqAttFlt} gets the values(s) of a floating point attribu
\subsubsection*{Usage}
\begin{verbatim}
int vlistInqAttFlt(int vlistID, int varID, const char *name, int mlen, int *dp);
int vlistInqAttFlt(int vlistID, int varID, const char *name, int mlen, double *dp);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -218,7 +218,7 @@ The function {\tt vlistInqAttTxt} gets the values(s) of a text attribute.
\subsubsection*{Usage}
\begin{verbatim}
int vlistInqAttTxt(int vlistID, int varID, const char *name, int mlen, int *tp);
int vlistInqAttTxt(int vlistID, int varID, const char *name, int mlen, char *tp);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......
......@@ -381,7 +381,7 @@ Variable list ID, from a previous call to {\htmlref{\tt vlistCreate}{vlistCreate
\item[{\tt varID}]
Variable identifier.
\item[{\tt units}]
Units of the variable. The caller must allocate space for the
Units of the variable. The caller must allocate space for the
returned string. The maximum possible length, in characters, of
the string is given by the predefined constant {\tt CDI\_MAX\_NAME}.
......
......@@ -20,7 +20,7 @@ The type of the Z-axis, one of the set of predefined {\CDI} Z-axis types.
{\tt ZAXIS\_HYBRID}, {\tt ZAXIS\_SIGMA}, {\tt ZAXIS\_PRESSURE}, {\tt ZAXIS\_HEIGHT},
{\tt ZAXIS\_ISENTROPIC}, {\tt ZAXIS\_ALTITUDE}, {\tt ZAXIS\_MEANSEA}, {\tt ZAXIS\_TOA},
{\tt ZAXIS\_SEA\_BOTTOM}, {\tt ZAXIS\_ATMOSPHERE}, {\tt ZAXIS\_CLOUD\_BASE},
{\tt ZAXIS\_CLOUD\_TOP}, {\tt ZAXIS\_ISOTHERM\_ZERO},
{\tt ZAXIS\_CLOUD\_TOP}, {\tt ZAXIS\_ISOTHERM\_ZERO}, {\tt ZAXIS\_SNOW},