Commit dafc4dc3 authored by Uwe Schulzweida's avatar Uwe Schulzweida

Merge branch 'develop'

parents a3036db9 541a1d7f
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdo 1.9.1rc4.
# Generated by GNU Autoconf 2.68 for cdo 1.9.1.
#
# 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.1rc4'
PACKAGE_STRING='cdo 1.9.1rc4'
PACKAGE_VERSION='1.9.1'
PACKAGE_STRING='cdo 1.9.1'
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.1rc4 to adapt to many kinds of systems.
\`configure' configures cdo 1.9.1 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.1rc4:";;
short | recursive ) echo "Configuration of cdo 1.9.1:";;
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.1rc4
cdo configure 1.9.1
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.1rc4, which was
It was created by cdo $as_me 1.9.1, 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.1rc4'
VERSION='1.9.1'
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.1rc4, which was
This file was extended by cdo $as_me 1.9.1, 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.1rc4
cdo config.status 1.9.1
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.1rc4], [http://mpimet.mpg.de/cdo])
AC_INIT([cdo], [1.9.1], [http://mpimet.mpg.de/cdo])
AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
......
libcdi @ 4114be8a
Subproject commit 906a08462a0439daca5d259f9ecc2f6b6d618537
Subproject commit 4114be8ac84dd4d7f7a60f5f9762ac95ed6381f3
......@@ -74,11 +74,6 @@ void *Detrend(void *argument)
double missval;
field_type ***vars = NULL;
dtlist_type *dtlist = dtlist_new();
typedef struct
{
double *array1;
double *array2;
} memory_t;
cdoInitialize(argument);
......
......@@ -507,7 +507,6 @@ void farsetmiss(field_type *field1, field_type field2)
int grid2 = field2.grid;
int nmiss1 = field1->nmiss;
double missval1 = field1->missval;
double missval2 = field2.missval;
double *restrict array1 = field1->ptr;
const double *restrict array2 = field2.ptr;
......
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