Commit 6943cb05 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

stream_cdf: cleanup

parent 7e051db1
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for cdi 1.4.3.4.
# Generated by GNU Autoconf 2.64 for cdi 1.4.3.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.3.4'
PACKAGE_STRING='cdi 1.4.3.4'
PACKAGE_VERSION='1.4.3.5'
PACKAGE_STRING='cdi 1.4.3.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.3.4 to adapt to many kinds of systems.
\`configure' configures cdi 1.4.3.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.3.4:";;
short | recursive ) echo "Configuration of cdi 1.4.3.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.3.4
cdi configure 1.4.3.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.3.4, which was
It was created by cdi $as_me 1.4.3.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.3.4'
VERSION='1.4.3.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.3.4, which was
This file was extended by cdi $as_me 1.4.3.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.3.4
cdi config.status 1.4.3.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.3.4], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.4.3.5], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
......@@ -3893,6 +3893,24 @@ int isLatAxis(const char *units, const char *stdname)
return (lunit);
}
static
int unitsIsPressure(const char *units)
{
int lunit = FALSE;
if ( memcmp(units, "millibar", 8) == 0 ||
memcmp(units, "mb", 2) == 0 ||
memcmp(units, "hectopas", 8) == 0 ||
memcmp(units, "hPa", 3) == 0 ||
memcmp(units, "Pa", 2) == 0 )
{
lunit = TRUE;
}
return (lunit);
}
static
int isGaussGrid(long ysize, double yinc, double *yvals)
{
......@@ -4883,11 +4901,7 @@ int cdfInqContents(int streamID)
cdfSetDim(ncvars, ncvarid, 0, Y_AXIS);
ncdims[ncdimid].dimtype = Y_AXIS;
}
else if ( memcmp(ncvars[ncvarid].units, "millibar", 8) == 0 ||
memcmp(ncvars[ncvarid].units, "mb", 2) == 0 ||
memcmp(ncvars[ncvarid].units, "hectopas", 8) == 0 ||
memcmp(ncvars[ncvarid].units, "hPa", 3) == 0 ||
memcmp(ncvars[ncvarid].units, "Pa", 2) == 0 )
else if ( unitsIsPressure(ncvars[ncvarid].units) )
{
ncvars[ncvarid].zaxistype = ZAXIS_PRESSURE;
}
......@@ -4965,11 +4979,7 @@ int cdfInqContents(int streamID)
ncvars[ncvarid].islat = TRUE;
continue;
}
else if ( memcmp(ncvars[ncvarid].units, "millibar", 8) == 0 ||
memcmp(ncvars[ncvarid].units, "mb", 2) == 0 ||
memcmp(ncvars[ncvarid].units, "hectopas", 8) == 0 ||
memcmp(ncvars[ncvarid].units, "hPa", 3) == 0 ||
memcmp(ncvars[ncvarid].units, "Pa", 2) == 0 )
else if ( unitsIsPressure(ncvars[ncvarid].units) )
{
ncvars[ncvarid].zaxistype = ZAXIS_PRESSURE;
continue;
......
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