Commit 3d374096 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Select: added key levidx

parent 84abeaa1
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdo 1.5.8rc2.
# Generated by GNU Autoconf 2.68 for cdo 1.5.8rc3.
#
# Report bugs to <http://code.zmaw.de/projects/cdo>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdo'
PACKAGE_TARNAME='cdo'
PACKAGE_VERSION='1.5.8rc2'
PACKAGE_STRING='cdo 1.5.8rc2'
PACKAGE_VERSION='1.5.8rc3'
PACKAGE_STRING='cdo 1.5.8rc3'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdo'
PACKAGE_URL=''
 
......@@ -1368,7 +1368,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.5.8rc2 to adapt to many kinds of systems.
\`configure' configures cdo 1.5.8rc3 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1438,7 +1438,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdo 1.5.8rc2:";;
short | recursive ) echo "Configuration of cdo 1.5.8rc3:";;
esac
cat <<\_ACEOF
 
......@@ -1581,7 +1581,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdo configure 1.5.8rc2
cdo configure 1.5.8rc3
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2174,7 +2174,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.5.8rc2, which was
It was created by cdo $as_me 1.5.8rc3, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -3068,7 +3068,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdo'
VERSION='1.5.8rc2'
VERSION='1.5.8rc3'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -19686,7 +19686,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.5.8rc2, which was
This file was extended by cdo $as_me 1.5.8rc3, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -19752,7 +19752,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.5.8rc2
cdo config.status 1.5.8rc3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdo], [1.5.8rc2], [http://code.zmaw.de/projects/cdo])
AC_INIT([cdo], [1.5.8rc3], [http://code.zmaw.de/projects/cdo])
CONFIG_ABORT=yes
AC_CONFIG_AUX_DIR(config)
......
......@@ -143,9 +143,9 @@ void partab(FILE *fp, int vlistID, int option)
/* printf("3>%s<\n", varname); */
vlistInqVarUnits(vlistID, varID, varunits);
fprintf(fp, " name=%s\n", varname);
if ( code > 0 ) fprintf(fp, " code=%d\n", code);
if ( tabnum > 0 ) fprintf(fp, " table=%d\n", tabnum);
fprintf(fp, " name=%s\n", varname);
if ( strlen(varstdname) )
fprintf(fp, " standard_name=%s\n", varstdname);
if ( strlen(varlongname) )
......
......@@ -469,6 +469,7 @@ void *Select(void *argument)
PML_DEF_INT(day, 32, "Day");
PML_DEF_INT(code, 1024, "Code number");
PML_DEF_INT(ltype, 1024, "Level type");
PML_DEF_INT(levidx, 1024, "Level index");
PML_DEF_FLT(level, 1024, "Level");
PML_DEF_WORD(name, 1024, "Variable name");
PML_DEF_WORD(param, 1024, "Parameter");
......@@ -478,6 +479,7 @@ void *Select(void *argument)
PML_INIT_INT(day);
PML_INIT_INT(code);
PML_INIT_INT(ltype);
PML_INIT_INT(levidx);
PML_INIT_FLT(level);
PML_INIT_WORD(name);
PML_INIT_WORD(param);
......@@ -507,6 +509,7 @@ void *Select(void *argument)
PML_ADD_INT(pml, day);
PML_ADD_INT(pml, code);
PML_ADD_INT(pml, ltype);
PML_ADD_INT(pml, levidx);
PML_ADD_FLT(pml, level);
PML_ADD_WORD(pml, name);
PML_ADD_WORD(pml, param);
......@@ -520,6 +523,7 @@ void *Select(void *argument)
PML_NUM(pml, day);
PML_NUM(pml, code);
PML_NUM(pml, ltype);
PML_NUM(pml, levidx);
PML_NUM(pml, level);
PML_NUM(pml, name);
PML_NUM(pml, param);
......@@ -575,21 +579,42 @@ void *Select(void *argument)
param = paramstr;
zaxisID = vlistInqVarZaxis(vlistID1, varID);
nlevs = zaxisInqSize(zaxisID);
ltype = zaxis2ltype(zaxisID);
vars[varID] = FALSE;
if ( npar_ltype )
{
if ( npar_code && PAR_CHECK_INT(ltype) && PAR_CHECK_INT(code) ) vars[varID] = TRUE;
if ( npar_name && PAR_CHECK_INT(ltype) && PAR_CHECK_WORD(name) ) vars[varID] = TRUE;
if ( npar_param && PAR_CHECK_INT(ltype) && PAR_CHECK_WORD(param) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_code && PAR_CHECK_INT(ltype) && PAR_CHECK_INT(code) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_name && PAR_CHECK_INT(ltype) && PAR_CHECK_WORD(name) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_param && PAR_CHECK_INT(ltype) && PAR_CHECK_WORD(param) ) vars[varID] = TRUE;
if ( !vars[varID] && !npar_code && !npar_name && !npar_param )
{
for ( levID = 0; levID < nlevs; levID++ )
{
levidx = levID + 1;
level = zaxisInqLevel(zaxisID, levID);
if ( !vars[varID] && npar_levidx && PAR_CHECK_INT(ltype) && PAR_CHECK_INT(levidx) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_level && PAR_CHECK_INT(ltype) && PAR_CHECK_FLT(level) ) vars[varID] = TRUE;
}
}
}
else
{
if ( npar_code && PAR_CHECK_INT(code) ) vars[varID] = TRUE;
if ( npar_name && PAR_CHECK_WORD(name) ) vars[varID] = TRUE;
if ( npar_param && PAR_CHECK_WORD(param) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_code && PAR_CHECK_INT(code) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_name && PAR_CHECK_WORD(name) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_param && PAR_CHECK_WORD(param) ) vars[varID] = TRUE;
if ( !vars[varID] && !npar_code && !npar_name && !npar_param )
{
for ( levID = 0; levID < nlevs; levID++ )
{
levidx = levID + 1;
level = zaxisInqLevel(zaxisID, levID);
if ( !vars[varID] && npar_levidx && PAR_CHECK_INT(levidx) ) vars[varID] = TRUE;
if ( !vars[varID] && npar_level && PAR_CHECK_FLT(level) ) vars[varID] = TRUE;
}
}
}
}
......@@ -602,6 +627,7 @@ void *Select(void *argument)
for ( levID = 0; levID < nlevs; levID++ )
{
levidx = levID + 1;
level = zaxisInqLevel(zaxisID, levID);
if ( nlevs == 1 && IS_EQUAL(level, 0) )
......@@ -610,7 +636,12 @@ void *Select(void *argument)
}
else
{
if ( npar_level )
if ( npar_levidx )
{
if ( PAR_CHECK_INT(levidx) )
vlistDefFlag(vlistID1, varID, levID, result);
}
else if ( npar_level )
{
if ( PAR_CHECK_FLT(level) )
vlistDefFlag(vlistID1, varID, levID, result);
......@@ -626,6 +657,7 @@ void *Select(void *argument)
PAR_CHECK_INT_FLAG(code);
PAR_CHECK_INT_FLAG(ltype);
PAR_CHECK_INT_FLAG(levidx);
PAR_CHECK_FLT_FLAG(level);
PAR_CHECK_WORD_FLAG(name);
PAR_CHECK_WORD_FLAG(param);
......
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