Commit 414583a0 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

Merge branch 'develop' of git.mpimet.mpg.de:cdo into develop

parents 2a6c554b 23633f58
......@@ -66,7 +66,7 @@ Building and installing it:
Porting:
This package was designed for maximum portability. It is written entirely
in ANSI C99, and will compile on most UNIX platforms.
in ISO C++11 and ANSI C99, and will compile on most UNIX platforms.
Contact:
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdo 1.9.0rc1.
# Generated by GNU Autoconf 2.68 for cdo 1.9.0rc2.
#
# Report bugs to <http://mpimet.mpg.de/cdo>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdo'
PACKAGE_TARNAME='cdo'
PACKAGE_VERSION='1.9.0rc1'
PACKAGE_STRING='cdo 1.9.0rc1'
PACKAGE_VERSION='1.9.0rc2'
PACKAGE_STRING='cdo 1.9.0rc2'
PACKAGE_BUGREPORT='http://mpimet.mpg.de/cdo'
PACKAGE_URL=''
......@@ -1401,7 +1401,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 cdo 1.9.0rc1 to adapt to many kinds of systems.
\`configure' configures cdo 1.9.0rc2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1471,7 +1471,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdo 1.9.0rc1:";;
short | recursive ) echo "Configuration of cdo 1.9.0rc2:";;
esac
cat <<\_ACEOF
......@@ -1623,7 +1623,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdo configure 1.9.0rc1
cdo configure 1.9.0rc2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2216,7 +2216,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 cdo $as_me 1.9.0rc1, which was
It was created by cdo $as_me 1.9.0rc2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -3165,7 +3165,7 @@ fi
# Define the identity of the package.
PACKAGE='cdo'
VERSION='1.9.0rc1'
VERSION='1.9.0rc2'
cat >>confdefs.h <<_ACEOF
......@@ -22983,7 +22983,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 cdo $as_me 1.9.0rc1, which was
This file was extended by cdo $as_me 1.9.0rc2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -23049,7 +23049,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="\\
cdo config.status 1.9.0rc1
cdo config.status 1.9.0rc2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
......
......@@ -4,7 +4,7 @@
# autoconf 2.68
# libtool 2.4.2
AC_INIT([cdo], [1.9.0rc1], [http://mpimet.mpg.de/cdo])
AC_INIT([cdo], [1.9.0rc2], [http://mpimet.mpg.de/cdo])
AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
......
......@@ -1610,7 +1610,7 @@ void *Importcmsaf(void *argument)
status = H5Fclose(file_id);
UNUSED(status);
processDefVarNum(vlistNvars(vlistID), streamID);
processDefVarNum(vlistNvars(vlistID));
pstreamClose(streamID);
......
......@@ -84,7 +84,7 @@ pipe_t::pipe_init()
nvals = 0;
nmiss = 0;
data = NULL;
hasdata = 0;
hasdata = false;
usedata = true;
// pstreamptr_in = 0;
......@@ -141,7 +141,7 @@ pipe_t::pipeInqTimestep(int p_tsID)
{
if (PipeDebug)
Message("%s has data", name.c_str());
hasdata = 0;
hasdata = false;
data = NULL;
pthread_cond_signal(readCond);
}
......@@ -299,7 +299,7 @@ pipe_t::pipeInqRecord(int *p_varID, int *p_levelID)
Message("%s has no data %d %d", name.c_str(), recIDr, recIDw);
if (hasdata || usedata)
{
hasdata = 0;
hasdata = false;
data = NULL;
usedata = false;
condSignal = true;
......@@ -361,7 +361,7 @@ pipe_t::pipeDefRecord(int p_varID, int p_levelID)
Message("%s has data %d %d", name.c_str(), recIDr, recIDw);
if (hasdata)
{
hasdata = 0;
hasdata = false;
data = NULL;
condSignal = true;
}
......@@ -437,7 +437,7 @@ pipeGetReadTarget(pstream_t *pstreamptr, pstream_t *pstreamptr_in)
break;
}
if (pstreamptr->pipe->hasdata != 1)
if (pstreamptr->pipe->hasdata == false)
{
Error("Internal problem! istream undefined");
}
......@@ -454,14 +454,14 @@ pipe_t::pipeReadRecord(int p_vlistID, double *data, int *nmiss)
// LOCK
pthread_mutex_lock(mutex);
while (hasdata == 0)
while (!hasdata)
{
if (PipeDebug)
Message("%s wait of writeCond", name.c_str());
pthread_cond_wait(writeCond, mutex);
}
if (hasdata == 1)
if (hasdata)
{
pipeReadPipeRecord(data, p_vlistID, nmiss);
}
......@@ -473,7 +473,7 @@ pipe_t::pipeReadRecord(int p_vlistID, double *data, int *nmiss)
if (PipeDebug)
Message("%s read record %d", name.c_str(), recIDr);
hasdata = 0;
hasdata = false;
data = NULL;
pthread_mutex_unlock(mutex);
// UNLOCK
......@@ -489,7 +489,7 @@ pipe_t::pipeWriteRecord(double *p_data, int p_nmiss)
*/
// LOCK
pthread_mutex_lock(mutex);
hasdata = 1; /* data pointer */
hasdata = true; /* data pointer */
data = p_data;
nmiss = p_nmiss;
pthread_mutex_unlock(mutex);
......
......@@ -56,7 +56,7 @@ public:
bool EOP;
bool usedata;
short hasdata;
bool hasdata;
int nrecs;
int varID, levelID;
int recIDr, recIDw, tsIDr, tsIDw;
......
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