Commit 2aa12865 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

grbScanTimestep: bug fix for unsorted codes

parent a30733ee
2007-01-?? Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* grbDefGrid: change generic grid to lonlat grid
* grbScanTimestep: bug fix for unsorted codes
* Version 1.0.6 released
2006-12-14 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for cdi 1.0.5.
# Generated by GNU Autoconf 2.59 for cdi 1.0.6.
#
# Report bugs to <Uwe.Schulzweida@zmaw.de>.
#
......@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.0.5'
PACKAGE_STRING='cdi 1.0.5'
PACKAGE_VERSION='1.0.6'
PACKAGE_STRING='cdi 1.0.6'
PACKAGE_BUGREPORT='Uwe.Schulzweida@zmaw.de'
# Factoring default headers for most tests.
......@@ -795,7 +795,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.0.5 to adapt to many kinds of systems.
\`configure' configures cdi 1.0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -862,7 +862,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.0.5:";;
short | recursive ) echo "Configuration of cdi 1.0.6:";;
esac
cat <<\_ACEOF
......@@ -996,7 +996,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.0.5
cdi configure 1.0.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
......@@ -1010,7 +1010,7 @@ cat >&5 <<_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.0.5, which was
It was created by cdi $as_me 1.0.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
......@@ -1697,7 +1697,7 @@ fi
# Define the identity of the package.
PACKAGE=cdi
VERSION=1.0.5
VERSION=1.0.6
cat >>confdefs.h <<_ACEOF
......@@ -5837,7 +5837,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by cdi $as_me 1.0.5, which was
This file was extended by cdi $as_me 1.0.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -5900,7 +5900,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
cdi config.status 1.0.5
cdi config.status 1.0.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT(cdi, 1.0.5, Uwe.Schulzweida@zmaw.de)
AC_INIT(cdi, 1.0.6, Uwe.Schulzweida@zmaw.de)
CONFIG_ABORT=yes
......
......@@ -383,7 +383,7 @@ void gridGenYvals(int gridtype, int ysize, double yfirst, double ylast, double y
}
else
{
Warning(func, "Cannot calculate gaussian latitudes for lat1 = %g latn %g", yfirst, ylast);
Warning(func, "Cannot calculate gaussian latitudes for lat1 = %g latn = %g", yfirst, ylast);
for ( i = 0; i < ysize; i++ ) yvals[i] = 0;
yvals[0] = yfirst;
yvals[ysize-1] = ylast;
......
......@@ -585,7 +585,7 @@ int grbScanTimestep(int streamID)
compVar.ltype = ISEC1_LevelType;
for ( vrecID = 0; vrecID < nrecs; vrecID++ )
{
recID = streamptr->tsteps[tsID].recIDs[vrecID];
recID = streamptr->tsteps[1].recIDs[vrecID];
compVar0.code = streamptr->tsteps[tsID].records[recID].code;
compVar0.table = streamptr->tsteps[tsID].records[recID].table;
compVar0.level1 = streamptr->tsteps[tsID].records[recID].ilevel;
......@@ -1709,6 +1709,11 @@ void grbDefGrid(int *isec1, int *isec2, int gridID)
gridtype = GRID_LONLAT;
gridChangeType(gridID, gridtype);
}
else if ( gridInqXvals(gridID, NULL) && gridInqYvals(gridID, NULL) )
{
gridtype = GRID_LONLAT;
gridChangeType(gridID, gridtype);
}
}
else if ( gridtype == GRID_CURVILINEAR )
{
......
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