Skip to content

GitLab

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

Fix merge conflict.

parents 1471ee4a 9415c76d
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ ed243d7c
2017-11-05 Uwe Schulzweida
* Version 1.9.2 released
2017-10-09 Uwe Schulzweida
* changed type of gridsize from int to size_t
2017-10-05 Uwe Schulzweida
* using CGRIBEX library version 1.9.0
......
app/cdi.c
View file @ ed243d7c
......@@ -178,16 +178,16 @@ void usage(void)
fprintf(stderr, " jpeg JPEG compression of GRIB2 records\n");
fprintf(stderr, " zip[_1-9] Deflate compression of netCDF4 variables\n");
fprintf(stderr, "\n");
fprintf(stderr, " Report bugs to <http://code.zmaw.de/projects/cdi>\n");
fprintf(stderr, " Report bugs to <https://code.mpimet.mpg.de/projects/cdi>\n");
}
static
void printInfo(int vdate, int vtime, char *varname, double level,
int datasize, int number, int nmiss, double missval, const double *data, int vardis)
size_t datasize, int number, size_t nmiss, double missval, const double *data, int vardis)
{
static int rec = 0;
int i, ivals = 0, imiss = 0;
size_t ivals = 0, imiss = 0;
double arrmean, arrmin, arrmax;
char vdatestr[32], vtimestr[32];
......@@ -208,9 +208,9 @@ void printInfo(int vdate, int vtime, char *varname, double level,
fprintf(stdout, "%6d :%s %s %7g ", ++rec, vdatestr, vtimestr, level);
fprintf(stdout, "%8d ", datasize);
fprintf(stdout, "%8zu ", datasize);
fprintf(stdout, "%7d :", nmiss);
fprintf(stdout, "%7zu :", nmiss);
if ( number == CDI_REAL )
{
......@@ -219,7 +219,7 @@ void printInfo(int vdate, int vtime, char *varname, double level,
arrmean = 0;
arrmin = 1.e300;
arrmax = -1.e300;
for ( i = 0; i < datasize; i++ )
for ( size_t i = 0; i < datasize; i++ )
{
if ( !DBL_IS_EQUAL(data[i], missval) )
{
......@@ -237,7 +237,7 @@ void printInfo(int vdate, int vtime, char *varname, double level,
arrmean = data[0];
arrmin = data[0];
arrmax = data[0];
for ( i = 1; i < datasize; i++ )
for ( size_t i = 1; i < datasize; i++ )
{
if ( data[i] < arrmin ) arrmin = data[i];
if ( data[i] > arrmax ) arrmax = data[i];
......@@ -251,10 +251,10 @@ void printInfo(int vdate, int vtime, char *varname, double level,
}
else
{
int nvals_r = 0, nvals_i = 0;
size_t nvals_r = 0, nvals_i = 0;
double arrsum_r = 0, arrsum_i = 0, arrmean_r = 0, arrmean_i = 0;
for ( i = 0; i < datasize; i++ )
for ( size_t i = 0; i < datasize; i++ )
{
if ( !DBL_IS_EQUAL(data[i*2], missval) )
{
......@@ -278,7 +278,7 @@ void printInfo(int vdate, int vtime, char *varname, double level,
fprintf(stdout, " : %-14s\n", varname);
if ( imiss != nmiss && nmiss > 0 )
fprintf(stdout, "Found %d of %d missing values!\n", imiss, nmiss);
fprintf(stdout, "Found %zu of %zu missing values!\n", imiss, nmiss);
}
static const char *tunit2str(int tunits)
......@@ -406,8 +406,8 @@ void printShortinfo(int streamID, int vlistID, int vardis)
fprintf(stdout, "%3d ", vlistZaxisIndex(vlistID, zaxisID) + 1);
/* grid info */
int gridsize = gridInqSize(gridID);
fprintf(stdout, "%9d ", gridsize);
size_t gridsize = gridInqSize(gridID);
fprintf(stdout, "%9zu ", gridsize);
fprintf(stdout, "%3d ", vlistGridIndex(vlistID, gridID) + 1);
/* datatype */
......@@ -836,9 +836,9 @@ int main(int argc, char *argv[])
if ( fname1 )
{
int nmiss;
size_t nmiss;
int number;
int datasize = 0;
size_t datasize = 0;
int streamID2 = CDI_UNDEFID;
int filetype;
int gridID, zaxisID;
......@@ -846,7 +846,7 @@ int main(int argc, char *argv[])
int nrecs;
int levelID, levelsize;
int nts = 0;
int gridsize = 0;
size_t gridsize = 0;
int recID;
int taxisID2 = CDI_UNDEFID;
int vlistID2 = CDI_UNDEFID;
......@@ -911,7 +911,7 @@ int main(int argc, char *argv[])
}
if ( vlistNumber(vlistID1) != CDI_REAL ) datasize *= 2;
double *data = (double *) malloc((size_t)datasize * sizeof (double));
double *data = (double *) malloc(datasize * sizeof (double));
/*
nts = cdiInqTimeSize(streamID1);
......@@ -925,6 +925,7 @@ int main(int argc, char *argv[])
printShortinfo(streamID1, vlistID1, Vardis);
}
size_t idum;
int tsID = 0;
if ( Info || fname2 )
while ( (nrecs = streamInqTimestep(streamID1, tsID)) > 0 )
......@@ -945,7 +946,8 @@ int main(int argc, char *argv[])
for ( recID = 0; recID < nrecs; recID++ )
{
streamInqRecord(streamID1, &varID, &levelID);
streamReadRecord(streamID1, data, &nmiss);
streamReadRecord(streamID1, data, &idum);
nmiss = idum;
number = vlistInqVarNumber(vlistID1, varID);
gridID = vlistInqVarGrid(vlistID1, varID);
......@@ -973,7 +975,7 @@ int main(int argc, char *argv[])
if ( Move )
streamCopyRecord(streamID2, streamID1);
else
streamWriteRecord(streamID2, data, nmiss);
streamWriteRecord(streamID2, data, idum);
}
}
}
......@@ -1004,7 +1006,8 @@ int main(int argc, char *argv[])
for ( levelID = 0; levelID < levelsize; levelID++ )
{
double level = zaxisInqLevels(zaxisID, NULL) ? zaxisInqLevel(zaxisID, levelID) : levelID+1;
streamReadVarSlice(streamID1, varID, levelID, data, &nmiss);
streamReadVarSlice(streamID1, varID, levelID, data, &idum);
nmiss = idum;
if ( Info )
printInfo(vdate, vtime, varname, level, gridsize, number, nmiss, missval, data, Vardis);
......
configure
View file @ ed243d7c
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdi 1.9.1.
# Generated by GNU Autoconf 2.68 for cdi 1.9.2.
#
# Report bugs to <http://mpimet.mpg.de/cdi>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.9.1'
PACKAGE_STRING='cdi 1.9.1'
PACKAGE_VERSION='1.9.2'
PACKAGE_STRING='cdi 1.9.2'
PACKAGE_BUGREPORT='http://mpimet.mpg.de/cdi'
PACKAGE_URL=''
 
......@@ -1466,7 +1466,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.9.1 to adapt to many kinds of systems.
\`configure' configures cdi 1.9.2 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1536,7 +1536,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.9.1:";;
short | recursive ) echo "Configuration of cdi 1.9.2:";;
esac
cat <<\_ACEOF
 
......@@ -1735,7 +1735,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.9.1
cdi configure 1.9.2
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2580,7 +2580,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.9.1, which was
It was created by cdi $as_me 1.9.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -3532,7 +3532,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.9.1'
VERSION='1.9.2'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -23449,7 +23449,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
 
lt_cl_version="\
cdi config.lt 1.9.1
cdi config.lt 1.9.2
configured by $0, generated by GNU Autoconf 2.68.
 
Copyright (C) 2011 Free Software Foundation, Inc.
......@@ -30808,7 +30808,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.9.1, which was
This file was extended by cdi $as_me 1.9.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -30874,7 +30874,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.9.1
cdi config.status 1.9.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
configure.ac
View file @ ed243d7c
......@@ -4,7 +4,7 @@
# autoconf 2.68
# libtool 2.4.2
AC_INIT([cdi], [1.9.1], [http://mpimet.mpg.de/cdi])
AC_INIT([cdi], [1.9.2], [http://mpimet.mpg.de/cdi])
AC_DEFINE_UNQUOTED(CDI, ["$PACKAGE_VERSION"], [CDI version])
......
doc/pio/tex/intro.tex
View file @ ed243d7c
......@@ -3,7 +3,7 @@ The scalability of Earth System Models (ESMs) is the leading target of the
}{ScalES}
project, in particular with regard to future computer development. Our work
focuses on overcoming the I/O bottleneck. The
\href{https://code.zmaw.de/projects/cdi}{Climate Data Interface} ({\CDI}) is a
\href{https://code.mpimet.mpg.de/projects/cdi}{Climate Data Interface} ({\CDI}) is a
sophisticated data handling library of
the Max-Planck-Institute for Meteorology with broad acceptence in the
community.
......
doc/tex/c_grid.tex
View file @ ed243d7c
......@@ -9,7 +9,7 @@ The function {\texttt{gridCreate}} creates a horizontal Grid.
\subsubsection*{Usage}
\begin{verbatim}
int gridCreate(int gridtype, int size);
int gridCreate(int gridtype, size_t size);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -137,7 +137,7 @@ The function {\texttt{gridInqSize}} returns the size of a Grid.
\subsubsection*{Usage}
\begin{verbatim}
int gridInqSize(int gridID);
size_t gridInqSize(int gridID);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -163,7 +163,7 @@ The function {\texttt{gridDefXsize}} defines the number of values of a X-axis.
\subsubsection*{Usage}
\begin{verbatim}
void gridDefXsize(int gridID, int xsize);
void gridDefXsize(int gridID, size_t xsize);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -186,7 +186,7 @@ The function {\texttt{gridInqXsize}} returns the number of values of a X-axis.
\subsubsection*{Usage}
\begin{verbatim}
int gridInqXsize(int gridID);
size_t gridInqXsize(int gridID);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -212,7 +212,7 @@ The function {\texttt{gridDefYsize}} defines the number of values of a Y-axis.
\subsubsection*{Usage}
\begin{verbatim}
void gridDefYsize(int gridID, int ysize);
void gridDefYsize(int gridID, size_t ysize);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -235,7 +235,7 @@ The function {\texttt{gridInqYsize}} returns the number of values of a Y-axis.
\subsubsection*{Usage}
\begin{verbatim}
int gridInqYsize(int gridID);
size_t gridInqYsize(int gridID);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -335,7 +335,7 @@ The function {\texttt{gridInqXvals}} returns all values of the X-axis.
\subsubsection*{Usage}
\begin{verbatim}
int gridInqXvals(int gridID, double *xvals);
size_t gridInqXvals(int gridID, double *xvals);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -389,7 +389,7 @@ The function {\texttt{gridInqYvals}} returns all values of the Y-axis.
\subsubsection*{Usage}
\begin{verbatim}
int gridInqYvals(int gridID, double *yvals);
size_t gridInqYvals(int gridID, double *yvals);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -443,7 +443,7 @@ The function {\texttt{gridInqXbounds}} returns the bounds of the X-axis.
\subsubsection*{Usage}
\begin{verbatim}
int gridInqXbounds(int gridID, double *xbounds);
size_t gridInqXbounds(int gridID, double *xbounds);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -497,7 +497,7 @@ The function {\texttt{gridInqYbounds}} returns the bounds of the Y-axis.
\subsubsection*{Usage}
\begin{verbatim}
int gridInqYbounds(int gridID, double *ybounds);
size_t gridInqYbounds(int gridID, double *ybounds);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......
doc/tex/c_quick_ref.tex
View file @ ed243d7c
......@@ -102,7 +102,7 @@ Get number of attributes assigned to this variable.
\section*{\tt \htmlref{gridCreate}{gridCreate}}
\begin{verbatim}
int gridCreate (int gridtype, int size);
int gridCreate (int gridtype, size_t size);
\end{verbatim}
Create a horizontal Grid.
......@@ -210,7 +210,7 @@ Define the name of a X-axis.
\section*{\tt \htmlref{gridDefXsize}{gridDefXsize}}
\begin{verbatim}
void gridDefXsize (int gridID, int xsize);
void gridDefXsize (int gridID, size_t xsize);
\end{verbatim}
Define the size of a X-axis.
......@@ -264,7 +264,7 @@ Define the name of a Y-axis.
\section*{\tt \htmlref{gridDefYsize}{gridDefYsize}}
\begin{verbatim}
void gridDefYsize (int gridID, int ysize);
void gridDefYsize (int gridID, size_t ysize);
\end{verbatim}
Define the size of a Y-axis.
......@@ -381,7 +381,7 @@ Get the reference URI to an unstructured grid.
\section*{\tt \htmlref{gridInqSize}{gridInqSize}}
\begin{verbatim}
int gridInqSize (int gridID);
size_t gridInqSize (int gridID);
\end{verbatim}
Get the size of a Grid.
......@@ -417,7 +417,7 @@ Find out whether X-coordinate is of type CHAR.
\section*{\tt \htmlref{gridInqXbounds}{gridInqXbounds}}
\begin{verbatim}
int gridInqXbounds (int gridID, double xbounds[]);
size_t gridInqXbounds (int gridID, double xbounds[]);
\end{verbatim}
Get the bounds of a X-axis.
......@@ -444,7 +444,7 @@ Get the name of a X-axis.
\section*{\tt \htmlref{gridInqXsize}{gridInqXsize}}
\begin{verbatim}
int gridInqXsize (int gridID);
size_t gridInqXsize (int gridID);
\end{verbatim}
Get the size of a X-axis.
......@@ -471,7 +471,7 @@ Get the units of a X-axis.
\section*{\tt \htmlref{gridInqXval}{gridInqXval}}
\begin{verbatim}
double gridInqXval (int gridID, int index);
double gridInqXval (int gridID, size_t index);
\end{verbatim}
Get one value of a X-axis.
......@@ -480,7 +480,7 @@ Get one value of a X-axis.
\section*{\tt \htmlref{gridInqXvals}{gridInqXvals}}
\begin{verbatim}
int gridInqXvals (int gridID, double xvals[]);
size_t gridInqXvals (int gridID, double xvals[]);
\end{verbatim}
Get all values of a X-axis.
......@@ -498,7 +498,7 @@ Find out whether Y-coordinate is of type CHAR.
\section*{\tt \htmlref{gridInqYbounds}{gridInqYbounds}}
\begin{verbatim}
int gridInqYbounds (int gridID, double ybounds[]);
size_t gridInqYbounds (int gridID, double ybounds[]);
\end{verbatim}
Get the bounds of a Y-axis.
......@@ -525,7 +525,7 @@ Get the name of a Y-axis.
\section*{\tt \htmlref{gridInqYsize}{gridInqYsize}}
\begin{verbatim}
int gridInqYsize (int gridID);
size_t gridInqYsize (int gridID);
\end{verbatim}
Get the size of a Y-axis.
......@@ -552,7 +552,7 @@ Get the units of a Y-axis.
\section*{\tt \htmlref{gridInqYval}{gridInqYval}}
\begin{verbatim}
double gridInqYval (int gridID, int index);
double gridInqYval (int gridID, size_t index);
\end{verbatim}
Get one value of a Y-axis.
......@@ -561,7 +561,7 @@ Get one value of a Y-axis.
\section*{\tt \htmlref{gridInqYvals}{gridInqYvals}}
\begin{verbatim}
int gridInqYvals (int gridID, double yvals[]);
size_t gridInqYvals (int gridID, double yvals[]);
\end{verbatim}
Get all values of a Y-axis.
......@@ -696,7 +696,7 @@ Create a new dataset.
\section*{\tt \htmlref{streamReadVar}{streamReadVar}}
\begin{verbatim}
void streamReadVar (int streamID, int varID, double data[], int *nmiss);
void streamReadVar (int streamID, int varID, double data[], size_t *nmiss);
\end{verbatim}
Read a variable.
......@@ -706,7 +706,7 @@ Read a variable.
\begin{verbatim}
void streamReadVarSlice (int streamID, int varID, int levelID, double data[],
int *nmiss);
size_t *nmiss);
\end{verbatim}
Read a horizontal slice of a variable.
......@@ -724,7 +724,7 @@ Synchronize an Open Dataset to Disk.
\section*{\tt \htmlref{streamWriteVar}{streamWriteVar}}
\begin{verbatim}
void streamWriteVar (int streamID, int varID, const double data[], int nmiss);
void streamWriteVar (int streamID, int varID, const double data[], size_t nmiss);
\end{verbatim}
Write a variable.
......@@ -734,7 +734,7 @@ Write a variable.
\begin{verbatim}
void streamWriteVarSlice (int streamID, int varID, int levelID,
const double data[], int nmiss);
const double data[], size_t nmiss);
\end{verbatim}
Write a horizontal slice of a variable.
......
doc/tex/c_ref.tex
View file @ ed243d7c
......@@ -130,7 +130,7 @@ gridCreate
\fi
}}
\begin{verbatim}
int gridCreate(int gridtype, int size);
int gridCreate(int gridtype, size_t size);
\end{verbatim}
Create a horizontal Grid
......@@ -265,7 +265,7 @@ gridDefXsize
\fi
}}
\begin{verbatim}
void gridDefXsize(int gridID, int xsize);
void gridDefXsize(int gridID, size_t xsize);
\end{verbatim}
Define the number of values of a X-axis
......@@ -355,7 +355,7 @@ gridDefYsize
\fi
}}
\begin{verbatim}
void gridDefYsize(int gridID, int ysize);
void gridDefYsize(int gridID, size_t ysize);
\end{verbatim}
Define the number of values of a Y-axis
......@@ -490,7 +490,7 @@ gridInqSize
\fi
}}
\begin{verbatim}
int gridInqSize(int gridID);
size_t gridInqSize(int gridID);
\end{verbatim}
Get the size of a Grid
......@@ -535,7 +535,7 @@ gridInqXbounds
\fi
}}
\begin{verbatim}
int gridInqXbounds(int gridID, double *xbounds);
size_t gridInqXbounds(int gridID, double *xbounds);
\end{verbatim}
Get the bounds of a X-axis
......@@ -580,7 +580,7 @@ gridInqXsize
\fi
}}
\begin{verbatim}
int gridInqXsize(int gridID);
size_t gridInqXsize(int gridID);
\end{verbatim}
Get the number of values of a X-axis
......@@ -610,7 +610,7 @@ gridInqXvals
\fi
}}
\begin{verbatim}
int gridInqXvals(int gridID, double *xvals);
size_t gridInqXvals(int gridID, double *xvals);
\end{verbatim}
Get all values of a X-axis
......@@ -625,7 +625,7 @@ gridInqYbounds
\fi
}}
\begin{verbatim}
int gridInqYbounds(int gridID, double *ybounds);
size_t gridInqYbounds(int gridID, double *ybounds);
\end{verbatim}
Get the bounds of a Y-axis
......@@ -670,7 +670,7 @@ gridInqYsize
\fi
}}
\begin{verbatim}
int gridInqYsize(int gridID);
size_t gridInqYsize(int gridID);
\end{verbatim}
Get the number of values of a Y-axis
......@@ -700,7 +700,7 @@ gridInqYvals
\fi
}}
\begin{verbatim}
int gridInqYvals(int gridID, double *yvals);
size_t gridInqYvals(int gridID, double *yvals);
\end{verbatim}
Get all values of a Y-axis
......@@ -880,7 +880,7 @@ streamReadVar
\fi
}}
\begin{verbatim}
void streamReadVar(int streamID, int varID, double *data, int *nmiss);
void streamReadVar(int streamID, int varID, double *data, size_t *nmiss);
\end{verbatim}
Read a variable
......@@ -895,7 +895,7 @@ streamReadVarF
\fi
}}
\begin{verbatim}
void streamReadVar(int streamID, int varID, float *data, int *nmiss);
void streamReadVar(int streamID, int varID, float *data, size_t *nmiss);
\end{verbatim}
Read a variable
......@@ -911,7 +911,7 @@ streamReadVarSlice
}}
\begin{verbatim}
void streamReadVarSlice(int streamID, int varID, int levelID, double *data,
int *nmiss);
size_t *nmiss);
\end{verbatim}
Read a horizontal slice of a variable
......@@ -927,7 +927,7 @@ streamReadVarSliceF
}}
\begin{verbatim}
void streamReadVarSliceF(int streamID, int varID, int levelID, float *data,
int *nmiss);
size_t *nmiss);
\end{verbatim}
Read a horizontal slice of a variable
......@@ -942,7 +942,7 @@ streamWriteVar
\fi
}}
\begin{verbatim}
void streamWriteVar(int streamID, int varID, const double *data, int nmiss);
void streamWriteVar(int streamID, int varID, const double *data, size_t nmiss);
\end{verbatim}
Write a variable
......@@ -957,7 +957,7 @@ streamWriteVarF
\fi
}}
\begin{verbatim}
void streamWriteVarF(int streamID, int varID, const float *data, int nmiss);
void streamWriteVarF(int streamID, int varID, const float *data, size_t nmiss);
\end{verbatim}
Write a variable
......@@ -973,7 +973,7 @@ streamWriteVarSlice
}}
\begin{verbatim}
void streamWriteVarSlice(int streamID, int varID, int levelID, const double *data,
int nmiss);
size_t nmiss);
\end{verbatim}
Write a horizontal slice of a variable
......@@ -989,7 +989,7 @@ streamWriteVarSliceF
}}
\begin{verbatim}
void streamWriteVarSliceF(int streamID, int varID, int levelID, const float *data,
int nmiss);
size_t nmiss);
\end{verbatim}
Write a horizontal slice of a variable
......@@ -1259,7 +1259,7 @@ vlistDefVar
\fi
}}
\begin{verbatim}
int vlistDefVar(int vlistID, int gridID, int zaxisID, int tsteptype);
int vlistDefVar(int vlistID, int gridID, int zaxisID, int timetype);
\end{verbatim}
Define a Variable
......
doc/tex/c_stream_read.tex
View file @ ed243d7c
......@@ -9,7 +9,7 @@ from an open dataset.
\subsubsection*{Usage}
\begin{verbatim}
void streamReadVar(int streamID, int varID, double *data, int *nmiss);
void streamReadVar(int streamID, int varID, double *data, size_t *nmiss);
\end{verbatim}
\hspace*{4mm}\begin{minipage}[]{15cm}
......@@ -37,7 +37,7 @@ from an open dataset.
\subsubsection*{Usage}
\begin{verbatim}