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

added vlistDefVarProductDefinitionTemplate() to define GRIB2 Product Definition Template Number

parent d57bb37a
......@@ -3,6 +3,10 @@
* Version 1.7.0 released
* using CGRIBEX library version 1.7.0
2014-07-22 Uwe Schulzweida
* added vlistDefVarProductDefinitionTemplate() to define GRIB2 Product Definition Template Number
2014-07-21 Uwe Schulzweida
* gribapiDefSteptype: changed proDefTempNum to 1/11 for typeOfGeneratingProcess=4
......
......@@ -24,7 +24,7 @@ case "${HOSTNAME}" in
--with-szlib=$HOME/local \
CC=icc CFLAGS="-g -D_REENTRANT -Wall -O3 -march=native -Df2cFortran -fp-model source"
;;
bailung*)
bailung*|d133*|d134*)
./configure --prefix=$HOME/local \
--enable-maintainer-mode \
--enable-iso-c-interface \
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdi 1.6.5.
# Generated by GNU Autoconf 2.68 for cdi 1.6.5rc1.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.6.5'
PACKAGE_STRING='cdi 1.6.5'
PACKAGE_VERSION='1.6.5rc1'
PACKAGE_STRING='cdi 1.6.5rc1'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
 
......@@ -1442,7 +1442,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.6.5 to adapt to many kinds of systems.
\`configure' configures cdi 1.6.5rc1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1512,7 +1512,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.6.5:";;
short | recursive ) echo "Configuration of cdi 1.6.5rc1:";;
esac
cat <<\_ACEOF
 
......@@ -1699,7 +1699,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.6.5
cdi configure 1.6.5rc1
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2460,7 +2460,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.6.5, which was
It was created by cdi $as_me 1.6.5rc1, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -3405,7 +3405,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.6.5'
VERSION='1.6.5rc1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -28417,7 +28417,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.6.5, which was
This file was extended by cdi $as_me 1.6.5rc1, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -28483,7 +28483,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="\\
cdi config.status 1.6.5
cdi config.status 1.6.5rc1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
......
......@@ -4,7 +4,7 @@
# autoconf 2.68
# libtool 2.4.2
AC_INIT([cdi], [1.6.5], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.6.5rc1], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
......@@ -522,6 +522,9 @@ int vlistInqVarTimaccu(int vlistID, int varID);
void vlistDefVarTypeOfGeneratingProcess(int vlistID, int varID, int typeOfGeneratingProcess);
int vlistInqVarTypeOfGeneratingProcess(int vlistID, int varID);
void vlistDefVarProductDefinitionTemplate(int vlistID, int varID, int productDefinitionTemplate);
int vlistInqVarProductDefinitionTemplate(int vlistID, int varID);
int vlistInqVarSize(int vlistID, int varID);
void vlistDefIndex(int vlistID, int varID, int levID, int index);
......
......@@ -4,7 +4,7 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, February 2014
! Uwe Schulzweida, MPI-MET, Hamburg, July 2014
!
INTEGER CDI_MAX_NAME
......@@ -502,6 +502,9 @@
! (INTEGER streamID)
EXTERNAL streamInqVlist
!
! PIO:
!
INTEGER streamInqVlistIDorig
! (INTEGER streamID)
EXTERNAL streamInqVlistIDorig
......@@ -524,15 +527,15 @@
! INTEGER comptype)
EXTERNAL streamDefCompType
INTEGER streamInqCompType
! (INTEGER streamID)
EXTERNAL streamInqCompType
! streamDefCompLevel
! (INTEGER streamID,
! INTEGER complevel)
EXTERNAL streamDefCompLevel
INTEGER streamInqCompType
! (INTEGER streamID)
EXTERNAL streamInqCompType
INTEGER streamInqCompLevel
! (INTEGER streamID)
EXTERNAL streamInqCompLevel
......@@ -542,18 +545,15 @@
! INTEGER tsID)
EXTERNAL streamDefTimestep
!
! query currently set timestep id
!
INTEGER streamInqCurTimestepID
! (INTEGER streamID)
EXTERNAL streamInqCurTimestepID
INTEGER streamInqTimestep
! (INTEGER streamID,
! INTEGER tsID)
EXTERNAL streamInqTimestep
INTEGER streamInqCurTimestepID
! (INTEGER streamID)
EXTERNAL streamInqCurTimestepID
CHARACTER(80) streamFilename
! (INTEGER streamID)
EXTERNAL streamFilename
......@@ -573,13 +573,6 @@
!
! STREAM var I/O routines
!
! streamReadVar
! (INTEGER streamID,
! INTEGER varID,
! DOUBLEPRECISION data_vec,
! INTEGER nmiss)
EXTERNAL streamReadVar
! streamWriteVar
! (INTEGER streamID,
! INTEGER varID,
......@@ -594,13 +587,19 @@
! INTEGER nmiss)
EXTERNAL streamWriteVarF
! streamReadVarSlice
! streamReadVar
! (INTEGER streamID,
! INTEGER varID,
! INTEGER levelID,
! DOUBLEPRECISION data_vec,
! INTEGER nmiss)
EXTERNAL streamReadVarSlice
EXTERNAL streamReadVar
! streamReadVarF
! (INTEGER streamID,
! INTEGER varID,
! REAL data_vec,
! INTEGER nmiss)
EXTERNAL streamReadVarF
! streamWriteVarSlice
! (INTEGER streamID,
......@@ -618,6 +617,22 @@
! INTEGER nmiss)
EXTERNAL streamWriteVarSliceF
! streamReadVarSlice
! (INTEGER streamID,
! INTEGER varID,
! INTEGER levelID,
! DOUBLEPRECISION data_vec,
! INTEGER nmiss)
EXTERNAL streamReadVarSlice
! streamReadVarSliceF
! (INTEGER streamID,
! INTEGER varID,
! INTEGER levelID,
! REAL data_vec,
! INTEGER nmiss)
EXTERNAL streamReadVarSliceF
! streamWriteVarChunk
! (INTEGER streamID,
! INTEGER varID,
......@@ -629,23 +644,17 @@
!
! STREAM record I/O routines
!
! streamInqRecord
! (INTEGER streamID,
! INTEGER varID,
! INTEGER levelID)
EXTERNAL streamInqRecord
! streamDefRecord
! (INTEGER streamID,
! INTEGER varID,
! INTEGER levelID)
EXTERNAL streamDefRecord
! streamReadRecord
! streamInqRecord
! (INTEGER streamID,
! DOUBLEPRECISION data_vec,
! INTEGER nmiss)
EXTERNAL streamReadRecord
! INTEGER varID,
! INTEGER levelID)
EXTERNAL streamInqRecord
! streamWriteRecord
! (INTEGER streamID,
......@@ -659,6 +668,12 @@
! INTEGER nmiss)
EXTERNAL streamWriteRecordF
! streamReadRecord
! (INTEGER streamID,
! DOUBLEPRECISION data_vec,
! INTEGER nmiss)
EXTERNAL streamReadRecord
! streamCopyRecord
! (INTEGER streamIDdest,
! INTEGER streamIDsrc)
......@@ -867,17 +882,17 @@
! INTEGER code)
EXTERNAL vlistInqVarID
INTEGER vlistInqVarTsteptype
! (INTEGER vlistID,
! INTEGER varID)
EXTERNAL vlistInqVarTsteptype
! vlistDefVarTsteptype
! (INTEGER vlistID,
! INTEGER varID,
! INTEGER tsteptype)
EXTERNAL vlistDefVarTsteptype
INTEGER vlistInqVarTsteptype
! (INTEGER vlistID,
! INTEGER varID)
EXTERNAL vlistInqVarTsteptype
! vlistDefVarCompType
! (INTEGER vlistID,
! INTEGER varID,
......@@ -1119,6 +1134,17 @@
! INTEGER varID)
EXTERNAL vlistInqVarTypeOfGeneratingProcess
! vlistDefVarProductDefinitionTemplate
! (INTEGER vlistID,
! INTEGER varID,
! INTEGER productDefinitionTemplate)
EXTERNAL vlistDefVarProductDefinitionTemplate
INTEGER vlistInqVarProductDefinitionTemplate
! (INTEGER vlistID,
! INTEGER varID)
EXTERNAL vlistInqVarProductDefinitionTemplate
INTEGER vlistInqVarSize
! (INTEGER vlistID,
! INTEGER varID)
......@@ -1418,71 +1444,71 @@
! CHARACTER*(*) xname)
EXTERNAL gridDefXname
! gridInqXname
! (INTEGER gridID,
! CHARACTER*(*) xname)
EXTERNAL gridInqXname
! gridDefXlongname
! (INTEGER gridID,
! CHARACTER*(*) xlongname)
EXTERNAL gridDefXlongname
! gridInqXlongname
! (INTEGER gridID,
! CHARACTER*(*) xlongname)
EXTERNAL gridInqXlongname
! gridDefXunits
! (INTEGER gridID,
! CHARACTER*(*) xunits)
EXTERNAL gridDefXunits
! gridInqXunits
! (INTEGER gridID,
! CHARACTER*(*) xunits)
EXTERNAL gridInqXunits
! gridDefYname
! (INTEGER gridID,
! CHARACTER*(*) yname)
EXTERNAL gridDefYname
! gridInqYname
! (INTEGER gridID,
! CHARACTER*(*) yname)
EXTERNAL gridInqYname
! gridDefYlongname
! (INTEGER gridID,
! CHARACTER*(*) ylongname)
EXTERNAL gridDefYlongname
! gridInqYlongname
! (INTEGER gridID,
! CHARACTER*(*) ylongname)
EXTERNAL gridInqYlongname
! gridDefYunits
! (INTEGER gridID,
! CHARACTER*(*) yunits)
EXTERNAL gridDefYunits
! gridInqXname
! (INTEGER gridID,
! CHARACTER*(*) xname)
EXTERNAL gridInqXname
! gridInqXlongname
! gridInqYunits
! (INTEGER gridID,
! CHARACTER*(*) xlongname)
EXTERNAL gridInqXlongname
! CHARACTER*(*) yunits)
EXTERNAL gridInqYunits
! gridInqXstdname
! (INTEGER gridID,
! CHARACTER*(*) xstdname)
EXTERNAL gridInqXstdname
! gridInqXunits
! (INTEGER gridID,
! CHARACTER*(*) xunits)
EXTERNAL gridInqXunits
! gridInqYname
! (INTEGER gridID,
! CHARACTER*(*) yname)
EXTERNAL gridInqYname
! gridInqYlongname
! (INTEGER gridID,
! CHARACTER*(*) ylongname)
EXTERNAL gridInqYlongname
! gridInqYstdname
! (INTEGER gridID,
! CHARACTER*(*) ystdname)
EXTERNAL gridInqYstdname
! gridInqYunits
! (INTEGER gridID,
! CHARACTER*(*) yunits)
EXTERNAL gridInqYunits
! gridDefPrec
! (INTEGER gridID,
! INTEGER prec)
......@@ -1518,81 +1544,81 @@
! (INTEGER gridID)
EXTERNAL gridIsRotated
DOUBLEPRECISION gridInqXpole
! (INTEGER gridID)
EXTERNAL gridInqXpole
! gridDefXpole
! (INTEGER gridID,
! DOUBLEPRECISION xpole)
EXTERNAL gridDefXpole
DOUBLEPRECISION gridInqYpole
DOUBLEPRECISION gridInqXpole
! (INTEGER gridID)
EXTERNAL gridInqYpole
EXTERNAL gridInqXpole
! gridDefYpole
! (INTEGER gridID,
! DOUBLEPRECISION ypole)
EXTERNAL gridDefYpole
DOUBLEPRECISION gridInqAngle
DOUBLEPRECISION gridInqYpole
! (INTEGER gridID)
EXTERNAL gridInqAngle
EXTERNAL gridInqYpole
! gridDefAngle
! (INTEGER gridID,
! DOUBLEPRECISION angle)
EXTERNAL gridDefAngle
! gridDefTrunc
! (INTEGER gridID,
! INTEGER trunc)
EXTERNAL gridDefTrunc
DOUBLEPRECISION gridInqAngle
! (INTEGER gridID)
EXTERNAL gridInqAngle
INTEGER gridInqTrunc
! (INTEGER gridID)
EXTERNAL gridInqTrunc
! gridDefTrunc
! (INTEGER gridID,
! INTEGER trunc)
EXTERNAL gridDefTrunc
!
! Hexagonal GME grid
!
INTEGER gridInqGMEnd
! (INTEGER gridID)
EXTERNAL gridInqGMEnd
! gridDefGMEnd
! (INTEGER gridID,
! INTEGER nd)
EXTERNAL gridDefGMEnd
INTEGER gridInqGMEni
INTEGER gridInqGMEnd
! (INTEGER gridID)
EXTERNAL gridInqGMEni
EXTERNAL gridInqGMEnd
! gridDefGMEni
! (INTEGER gridID,
! INTEGER ni)
EXTERNAL gridDefGMEni
INTEGER gridInqGMEni2
INTEGER gridInqGMEni
! (INTEGER gridID)
EXTERNAL gridInqGMEni2
EXTERNAL gridInqGMEni
! gridDefGMEni2
! (INTEGER gridID,
! INTEGER ni2)
EXTERNAL gridDefGMEni2
INTEGER gridInqGMEni3
INTEGER gridInqGMEni2
! (INTEGER gridID)
EXTERNAL gridInqGMEni3
EXTERNAL gridInqGMEni2
! gridDefGMEni3
! (INTEGER gridID,
! INTEGER ni3)
EXTERNAL gridDefGMEni3
INTEGER gridInqGMEni3
! (INTEGER gridID)
EXTERNAL gridInqGMEni3
!
! Reference of an unstructured grid
!
......@@ -1861,36 +1887,36 @@
! CHARACTER*(*) name)
EXTERNAL zaxisDefName
! zaxisDefLongname
! (INTEGER zaxisID,
! CHARACTER*(*) longname)
EXTERNAL zaxisDefLongname
! zaxisDefUnits
! (INTEGER zaxisID,
! CHARACTER*(*) units)
EXTERNAL zaxisDefUnits
! zaxisInqName
! (INTEGER zaxisID,
! CHARACTER*(*) name)
EXTERNAL zaxisInqName
! zaxisDefLongname
! (INTEGER zaxisID,
! CHARACTER*(*) longname)
EXTERNAL zaxisDefLongname
! zaxisInqLongname
! (INTEGER zaxisID,
! CHARACTER*(*) longname)
EXTERNAL zaxisInqLongname
! zaxisInqStdname
! zaxisDefUnits
! (INTEGER zaxisID,
! CHARACTER*(*) stdname)
EXTERNAL zaxisInqStdname
! CHARACTER*(*) units)
EXTERNAL zaxisDefUnits
! zaxisInqUnits
! (INTEGER zaxisID,
! CHARACTER*(*) units)
EXTERNAL zaxisInqUnits
! zaxisInqStdname
! (INTEGER zaxisID,
! CHARACTER*(*) stdname)
EXTERNAL zaxisInqStdname
! zaxisDefPrec
! (INTEGER zaxisID,
! INTEGER prec)
......@@ -1933,46 +1959,46 @@
! (INTEGER zaxisID)
EXTERNAL zaxisInqVctSize
INTEGER zaxisInqLbounds
! zaxisDefLbounds
! (INTEGER zaxisID,
! DOUBLEPRECISION lbounds_vec)
EXTERNAL zaxisInqLbounds
INTEGER zaxisInqUbounds
! (INTEGER zaxisID,
! DOUBLEPRECISION ubounds_vec)
EXTERNAL zaxisInqUbounds
EXTERNAL zaxisDefLbounds
INTEGER zaxisInqWeights
INTEGER zaxisInqLbounds
! (INTEGER zaxisID,
! DOUBLEPRECISION weights_vec)
EXTERNAL zaxisInqWeights
! DOUBLEPRECISION lbounds_vec)
EXTERNAL zaxisInqLbounds
DOUBLEPRECISION zaxisInqLbound
! (INTEGER zaxisID,
! INTEGER index)
EXTERNAL zaxisInqLbound
DOUBLEPRECISION zaxisInqUbound
! zaxisDefUbounds
! (INTEGER zaxisID,
! INTEGER index)
EXTERNAL zaxisInqUbound
! DOUBLEPRECISION ubounds_vec)
EXTERNAL zaxisDefUbounds
! zaxisDefLbounds
INTEGER zaxisInqUbounds
! (INTEGER zaxisID,
! DOUBLEPRECISION lbounds_vec)
EXTERNAL zaxisDefLbounds
! DOUBLEPRECISION ubounds_vec)
EXTERNAL zaxisInqUbounds
! zaxisDefUbounds
DOUBLEPRECISION zaxisInqUbound
! (INTEGER zaxisID,
! DOUBLEPRECISION ubounds_vec)
EXTERNAL zaxisDefUbounds
! INTEGER index)
EXTERNAL zaxisInqUbound
! zaxisDefWeights
! (INTEGER zaxisID,
! DOUBLEPRECISION weights_vec)
EXTERNAL zaxisDefWeights
INTEGER zaxisInqWeights
! (INTEGER zaxisID,
! DOUBLEPRECISION weights_vec)
EXTERNAL zaxisInqWeights