Skip to content

GitLab

Commit 0233d43d authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Version 1.4.2

parent 99708e2d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 415 deletions
ChangeLog
View file @ 0233d43d
2010-02-08 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Version 1.4.2 released
2010-01-25 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added support for timerange 1,2,3,4,5 (GRIB1)
......
configure
View file @ 0233d43d
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for cdi 1.4.1.6.
# Generated by GNU Autoconf 2.61 for cdi 1.4.2.
#
# Report bugs to <Uwe.Schulzweida@zmaw.de>.
#
......@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.4.1.6'
PACKAGE_STRING='cdi 1.4.1.6'
PACKAGE_VERSION='1.4.2'
PACKAGE_STRING='cdi 1.4.2'
PACKAGE_BUGREPORT='Uwe.Schulzweida@zmaw.de'
# Factoring default headers for most tests.
......@@ -1258,7 +1258,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.1.6 to adapt to many kinds of systems.
\`configure' configures cdi 1.4.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1329,7 +1329,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.4.1.6:";;
short | recursive ) echo "Configuration of cdi 1.4.2:";;
esac
cat <<\_ACEOF
......@@ -1462,7 +1462,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.4.1.6
cdi configure 1.4.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1476,7 +1476,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.1.6, which was
It was created by cdi $as_me 1.4.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2303,7 +2303,7 @@ fi
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.4.1.6'
VERSION='1.4.2'
cat >>confdefs.h <<_ACEOF
......@@ -9031,7 +9031,7 @@ exec 6>&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.1.6, which was
This file was extended by cdi $as_me 1.4.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -9084,7 +9084,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
cdi config.status 1.4.1.6
cdi config.status 1.4.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
configure.ac
View file @ 0233d43d
# Process this file with autoconf to produce a configure script.
AC_INIT(cdi, 1.4.1.6, Uwe.Schulzweida@zmaw.de)
AC_INIT(cdi, 1.4.2, Uwe.Schulzweida@zmaw.de)
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
src/cdi.inc
View file @ 0233d43d
......@@ -4,15 +4,13 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, January 2010
! Uwe Schulzweida, MPI-MET, Hamburg, February 2010
!
INTEGER CDI_UNDEFID
PARAMETER (CDI_UNDEFID = -1)
INTEGER CDI_GLOBAL
PARAMETER (CDI_GLOBAL = -1)
INTEGER CDI_UNDEFPARAM
PARAMETER (CDI_UNDEFPARAM = 2147483647)
!
! Byte order
!
......@@ -269,6 +267,27 @@
INTEGER TUNIT_QUARTER
PARAMETER (TUNIT_QUARTER = 7)
!
! TSTEP types
!
INTEGER TSTEP_INSTANT
PARAMETER (TSTEP_INSTANT = 1)
INTEGER TSTEP_AVG
PARAMETER (TSTEP_AVG = 2)
INTEGER TSTEP_ACCUM
PARAMETER (TSTEP_ACCUM = 3)
INTEGER TSTEP_MAX
PARAMETER (TSTEP_MAX = 4)
INTEGER TSTEP_MIN
PARAMETER (TSTEP_MIN = 5)
INTEGER TSTEP_DIFF
PARAMETER (TSTEP_DIFF = 6)
INTEGER TSTEP_RANGE
PARAMETER (TSTEP_RANGE = 7)
INTEGER TSTEP_INSTANT2
PARAMETER (TSTEP_INSTANT2 = 8)
INTEGER TSTEP_INSTANT3
PARAMETER (TSTEP_INSTANT3 = 9)
!
! CALENDAR types
!
INTEGER CALENDAR_STANDARD
......@@ -315,6 +334,15 @@
!
! CDI converter routines
!
!
! parameter
!
! cdiParamToString
! (INTEGER param,
! CHARACTER*(*) paramstr,
! INTEGER maxlen)
EXTERNAL cdiParamToString
! cdiDecodeParam
! (INTEGER param,
! INTEGER pnum,
......@@ -879,6 +907,17 @@
! INTEGER varID)
EXTERNAL vlistInqVarAddoffset
! vlistDefVarTsteptype
! (INTEGER vlistID,
! INTEGER varID,
! INTEGER tsteptype)
EXTERNAL vlistDefVarTsteptype
INTEGER vlistInqVarTsteptype
! (INTEGER vlistID,
! INTEGER varID)
EXTERNAL vlistInqVarTsteptype
! vlistDefVarTimave
! (INTEGER vlistID,
! INTEGER varID,
......
src/cdiFortran.c
View file @ 0233d43d
......@@ -46,6 +46,9 @@
/* TUNIT types */
/* TSTEP types */
/* CALENDAR types */
......@@ -61,6 +64,10 @@ FCALLSCSUB2 (cdiDefGlobal, CDIDEFGLOBAL, cdidefglobal, STRING, INT)
/* CDI converter routines */
/* parameter */
FCALLSCSUB3 (cdiParamToString, CDIPARAMTOSTRING, cdiparamtostring, INT, PSTRING, INT)
FCALLSCSUB4 (cdiDecodeParam, CDIDECODEPARAM, cdidecodeparam, INT, PINT, PINT, PINT)
FCALLSCFUN3 (INT, cdiEncodeParam, CDIENCODEPARAM, cdiencodeparam, INT, INT, INT)
FCALLSCSUB4 (cdiDecodeDate, CDIDECODEDATE, cdidecodedate, INT, PINT, PINT, PINT)
......@@ -181,6 +188,8 @@ FCALLSCSUB3 (vlistDefVarScalefactor, VLISTDEFVARSCALEFACTOR, vlistdefvarscalefac
FCALLSCFUN2 (DOUBLE, vlistInqVarScalefactor, VLISTINQVARSCALEFACTOR, vlistinqvarscalefactor, INT, INT)
FCALLSCSUB3 (vlistDefVarAddoffset, VLISTDEFVARADDOFFSET, vlistdefvaraddoffset, INT, INT, DOUBLE)
FCALLSCFUN2 (DOUBLE, vlistInqVarAddoffset, VLISTINQVARADDOFFSET, vlistinqvaraddoffset, INT, INT)
FCALLSCSUB3 (vlistDefVarTsteptype, VLISTDEFVARTSTEPTYPE, vlistdefvartsteptype, INT, INT, INT)
FCALLSCFUN2 (INT, vlistInqVarTsteptype, VLISTINQVARTSTEPTYPE, vlistinqvartsteptype, INT, INT)
FCALLSCSUB3 (vlistDefVarTimave, VLISTDEFVARTIMAVE, vlistdefvartimave, INT, INT, INT)
FCALLSCFUN2 (INT, vlistInqVarTimave, VLISTINQVARTIMAVE, vlistinqvartimave, INT, INT)
FCALLSCSUB3 (vlistDefVarTimaccu, VLISTDEFVARTIMACCU, vlistdefvartimaccu, INT, INT, INT)
......
src/cgribexlib.c
View file @ 0233d43d
This diff is collapsed.
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