Commit 5db6c8ff authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

using CGRIBEX library version 1.4.5

parent 1ba1db0b
2010-06-01 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.5
* Version 1.4.5 released
2010-05-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfDefXYaxis: check also dimnames (bug fix) [report: Mikhail Itkin]
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for cdi 1.4.5.1.
# Generated by GNU Autoconf 2.64 for cdi 1.4.5r2.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
......@@ -549,8 +549,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.4.5.1'
PACKAGE_STRING='cdi 1.4.5.1'
PACKAGE_VERSION='1.4.5r2'
PACKAGE_STRING='cdi 1.4.5r2'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
......@@ -1297,7 +1297,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.4.5.1 to adapt to many kinds of systems.
\`configure' configures cdi 1.4.5r2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1368,7 +1368,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.4.5.1:";;
short | recursive ) echo "Configuration of cdi 1.4.5r2:";;
esac
cat <<\_ACEOF
......@@ -1505,7 +1505,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.4.5.1
cdi configure 1.4.5r2
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
......@@ -2047,7 +2047,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.4.5.1, which was
It was created by cdi $as_me 1.4.5r2, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
......@@ -2847,7 +2847,7 @@ fi
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.4.5.1'
VERSION='1.4.5r2'
cat >>confdefs.h <<_ACEOF
......@@ -7556,7 +7556,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.4.5.1, which was
This file was extended by cdi $as_me 1.4.5r2, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -7620,7 +7620,7 @@ Report bugs to <http://code.zmaw.de/projects/cdi>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
cdi config.status 1.4.5.1
cdi config.status 1.4.5r2
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdi], [1.4.5.1], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.4.5r2], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
/* Automatically generated by m214003 at 2010-04-09, do not edit */
/* Automatically generated by m214003 at 2010-06-01, do not edit */
/* CGRIBEXLIB_VERSION="1.4.4" */
/* CGRIBEXLIB_VERSION="1.4.5" */
#if defined (HAVE_CONFIG_H)
# include "config.h"
......@@ -4707,7 +4707,13 @@ int decodeBDS(int decscale, unsigned char *bds, int *isec2, int *isec4,
ISEC4_NumValues = len*8/ISEC4_NumBits;
if ( lspherc ) ISEC4_NumValues++;
if ( lspherc )
{
if ( lcomplex )
ISEC4_NumValues += ioff;
else
ISEC4_NumValues++;
}
}
if ( dfunc == 'J' ) return (bdsLen);
......@@ -8846,7 +8852,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
return (gribLen);
}
static const char grb_libvers[] = "1.4.4" " of ""Apr 9 2010"" ""10:32:05";
static const char grb_libvers[] = "1.4.5" " of ""Jun 1 2010"" ""21:25:25";
const char *
cgribexLibraryVersion(void)
{
......
......@@ -294,13 +294,17 @@ void varAddRecord(int recID, int param, int gridID, int zaxistype, int lbounds,
{
if ( vartable[varID].gridID != gridID )
{
Message(func, "param = %d gridID = %d", param, gridID);
Error(func, "horizontal grid must not change for same param");
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Message(func, "param = %s gridID = %d", paramstr, gridID);
Error(func, "horizontal grid must not change for same param!");
}
if ( vartable[varID].zaxistype != zaxistype )
{
Message(func, "param = %d zaxistype = %d", param, zaxistype);
Error(func, "zaxistype must not change for same param");
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Message(func, "param = %s zaxistype = %d", paramstr, zaxistype);
Error(func, "zaxistype must not change for same param!");
}
}
......
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