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

cgribexlib update

parent 5db6c8ff
2010-06-01 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
2010-06-15 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.5
* Version 1.4.5 released
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for cdi 1.4.5r2.
# Generated by GNU Autoconf 2.64 for cdi 1.4.5.
#
# 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.5r2'
PACKAGE_STRING='cdi 1.4.5r2'
PACKAGE_VERSION='1.4.5'
PACKAGE_STRING='cdi 1.4.5'
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.5r2 to adapt to many kinds of systems.
\`configure' configures cdi 1.4.5 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.5r2:";;
short | recursive ) echo "Configuration of cdi 1.4.5:";;
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.5r2
cdi configure 1.4.5
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.5r2, which was
It was created by cdi $as_me 1.4.5, 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.5r2'
VERSION='1.4.5'
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.5r2, which was
This file was extended by cdi $as_me 1.4.5, 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.5r2
cdi config.status 1.4.5
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.5r2], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.4.5], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
......@@ -4,7 +4,7 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, February 2010
! Uwe Schulzweida, MPI-MET, Hamburg, June 2010
!
INTEGER CDI_UNDEFID
......@@ -41,6 +41,8 @@
PARAMETER (CDI_EUFSTRUCT = -23)
INTEGER CDI_EUNC4
PARAMETER (CDI_EUNC4 = -24)
INTEGER CDI_ELIMIT
PARAMETER (CDI_ELIMIT = -99)
!
! File types
!
......@@ -266,6 +268,12 @@
PARAMETER (TUNIT_YEAR = 6)
INTEGER TUNIT_QUARTER
PARAMETER (TUNIT_QUARTER = 7)
INTEGER TUNIT_3HOURS
PARAMETER (TUNIT_3HOURS = 8)
INTEGER TUNIT_6HOURS
PARAMETER (TUNIT_6HOURS = 9)
INTEGER TUNIT_12HOURS
PARAMETER (TUNIT_12HOURS = 10)
!
! TSTEP types
!
......@@ -1692,6 +1700,10 @@
! (INTEGER taxisID)
EXTERNAL taxisHasBounds
! taxisDeleteBounds
! (INTEGER taxisID)
EXTERNAL taxisDeleteBounds
! taxisDefVdateBounds
! (INTEGER taxisID,
! INTEGER vdate_lb,
......
......@@ -359,6 +359,7 @@ FCALLSCSUB2 (taxisDefVtime, TAXISDEFVTIME, taxisdefvtime, INT, INT)
FCALLSCSUB2 (taxisDefRdate, TAXISDEFRDATE, taxisdefrdate, INT, INT)
FCALLSCSUB2 (taxisDefRtime, TAXISDEFRTIME, taxisdefrtime, INT, INT)
FCALLSCFUN1 (INT, taxisHasBounds, TAXISHASBOUNDS, taxishasbounds, INT)
FCALLSCSUB1 (taxisDeleteBounds, TAXISDELETEBOUNDS, taxisdeletebounds, INT)
FCALLSCSUB3 (taxisDefVdateBounds, TAXISDEFVDATEBOUNDS, taxisdefvdatebounds, INT, INT, INT)
FCALLSCSUB3 (taxisDefVtimeBounds, TAXISDEFVTIMEBOUNDS, taxisdefvtimebounds, INT, INT, INT)
FCALLSCSUB3 (taxisInqVdateBounds, TAXISINQVDATEBOUNDS, taxisinqvdatebounds, INT, PINT, PINT)
......
/* Automatically generated by m214003 at 2010-06-01, do not edit */
/* Automatically generated by m214003 at 2010-06-16, do not edit */
/* CGRIBEXLIB_VERSION="1.4.5" */
......@@ -2859,7 +2859,7 @@ void encodeES(GRIBPACK *lGrib, long *gribLen, long bdsstart)
/* GRIB block 1 - product definition block. */
#define DWD_extension_253_len 37
#define DWD_extension_253_len 38
#define DWD_extension_254_len 26
#define ECMWF_extension_1_len 24
#define MCH_extension_254_len 19
......@@ -2940,6 +2940,7 @@ void encodePDS_DWD_local_Extension_253(GRIBPACK *lGrib, long *zs, int *isec1)
Put2Byte(isec1[54]); /* 62 Actual number of ensemble member */
Put1Byte(isec1[55]); /* 64 Model major version number */
Put1Byte(isec1[56]); /* 65 Model minor version number */
Put1Byte(0); /* 66 Blank for even buffer length */
*zs = z;
}
......@@ -8852,7 +8853,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
return (gribLen);
}
static const char grb_libvers[] = "1.4.5" " of ""Jun 1 2010"" ""21:25:25";
static const char grb_libvers[] = "1.4.5" " of ""Jun 16 2010"" ""14:01:12";
const char *
cgribexLibraryVersion(void)
{
......
......@@ -393,7 +393,7 @@ void gridGenYvals(int gridtype, int ysize, double yfirst, double ylast, double y
if ( fabs(yvals[0] - yfirst) > 0.001 || fabs(yvals[ysize-1] - ylast) > 0.001 )
{
double yinc = fabs(ylast-yfirst)/(ysize-1);
double *ytmp;
double *ytmp = NULL;
int nstart, lfound = 0;
int ny = (int) (180./yinc + 0.5);
ny -= ny%2;
......
......@@ -4284,7 +4284,8 @@ void scanVarAttributes(int fileID, int nvars, NCVAR *ncvars, NCDIM *ncdims,
if ( status == NC_NOERR )
{
ncvars[ncvarid].cellarea = nc_cell_id;
cdfSetVar(ncvars, ncvars[ncvarid].cellarea, FALSE);
/* ncvars[nc_cell_id].isvar = UNDEFID; */
cdfSetVar(ncvars, nc_cell_id, FALSE);
}
else
Warning(func, "%s - %s", nc_strerror(status), cell_var);
......@@ -4356,6 +4357,7 @@ void scanVarAttributes(int fileID, int nvars, NCVAR *ncvars, NCDIM *ncdims,
if ( lstop ) break;
}
cdfSetVar(ncvars, ncvarid, TRUE);
}
else if ( strcmp(attname, "grid_mapping") == 0 && atttype == NC_CHAR )
......
Supports Markdown
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