set revision number to 1.7.0rc2

d3eedb0a · Uwe Schulzweida · 33401a96 · d3eedb0a · d3eedb0a · d3eedb0a
Commit d3eedb0a authored Jun 16, 2015 by Uwe Schulzweida
--- a/configure
+++ b/configure
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for cdi 1.7.0rc1.
+# Generated by GNU Autoconf 2.68 for cdi 1.7.0rc2.
 #
 # Report bugs to <http://mpimet.mpg.de/cdi>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cdi'
 PACKAGE_TARNAME='cdi'
-PACKAGE_VERSION='1.7.0rc1'
-PACKAGE_STRING='cdi 1.7.0rc1'
+PACKAGE_VERSION='1.7.0rc2'
+PACKAGE_STRING='cdi 1.7.0rc2'
 PACKAGE_BUGREPORT='http://mpimet.mpg.de/cdi'
 PACKAGE_URL=''
  
@@ -1470,7 +1470,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.7.0rc1 to adapt to many kinds of systems.
+\`configure' configures cdi 1.7.0rc2 to adapt to many kinds of systems.
  
 Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@ -1540,7 +1540,7 @@ fi
  
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of cdi 1.7.0rc1:";;
+     short | recursive ) echo "Configuration of cdi 1.7.0rc2:";;
   esac
  cat <<\_ACEOF
  
@@ -1748,7 +1748,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-cdi configure 1.7.0rc1
+cdi configure 1.7.0rc2
 generated by GNU Autoconf 2.68
  
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2551,7 +2551,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.7.0rc1, which was
+It was created by cdi $as_me 1.7.0rc2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
  
  $ $0 $@
@@ -3497,7 +3497,7 @@ fi
  
 # Define the identity of the package.
 PACKAGE='cdi'
- VERSION='1.7.0rc1'
+ VERSION='1.7.0rc2'
  
  
 cat >>confdefs.h <<_ACEOF
@@ -28910,7 +28910,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.7.0rc1, which was
+This file was extended by cdi $as_me 1.7.0rc2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
  
  CONFIG_FILES    = $CONFIG_FILES
@@ -28976,7 +28976,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.7.0rc1
+cdi config.status 1.7.0rc2
 configured by $0, generated by GNU Autoconf 2.68,
  with options \\"\$ac_cs_config\\"
  

--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 #  autoconf 2.68
 #  libtool  2.4.2

-AC_INIT([cdi], [1.7.0rc1], [http://mpimet.mpg.de/cdi])
+AC_INIT([cdi], [1.7.0rc2], [http://mpimet.mpg.de/cdi])

 echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"


--- a/doc/tex/c_quick_ref.tex
+++ b/doc/tex/c_quick_ref.tex
@@ -1210,6 +1210,15 @@ Merge two variable lists.
 Number of grids in a variable list.


+\section*{\tt \htmlref{vlistNsubtypes}{vlistNsubtypes}}
+
+\begin{verbatim}
+    int vlistNsubtypes (int vlistID);
+\end{verbatim}
+
+Number of subtypes in a variable list.
+
+
 \section*{\tt \htmlref{vlistNumber}{vlistNumber}}

 \begin{verbatim}

--- a/doc/tex/f_quick_ref.tex
+++ b/doc/tex/f_quick_ref.tex
@@ -1230,6 +1230,15 @@ Merge two variable lists.
 Number of grids in a variable list.


+\section*{\tt \htmlref{vlistNsubtypes}{vlistNsubtypes}}
+
+\begin{verbatim}
+    INTEGER FUNCTION vlistNsubtypes (INTEGER vlistID)
+\end{verbatim}
+
+Number of subtypes in a variable list.
+
+
 \section*{\tt \htmlref{vlistNumber}{vlistNumber}}

 \begin{verbatim}

--- a/src/cdi.inc
+++ b/src/cdi.inc
 ! This file was automatically generated, don't edit!
 !
-! Fortran interface for CDI library version 1.6.9
+! Fortran interface for CDI library version 1.7.0
 !
 ! Author:
 ! -------
-! Uwe Schulzweida, MPI-MET, Hamburg,   April 2015
+! Uwe Schulzweida, MPI-MET, Hamburg,   June 2015
 !

      INTEGER    CDI_MAX_NAME          
@@ -293,7 +293,7 @@
      PARAMETER (MAX_KV_PAIRS_MATCH     = 10)
 !
 !  Data structure defining a key-value search, possibly with multiple
-!  key-value pairs in combination. 
+!  key-value pairs in combination.
 !  
 !  Currently, only multiple pairs combined by AND are supported.
 !
@@ -774,6 +774,10 @@
 !                                    (INTEGER         vlistID)
      EXTERNAL        vlistNzaxis

+      INTEGER         vlistNsubtypes
+!                                    (INTEGER         vlistID)
+      EXTERNAL        vlistNsubtypes
+
 !                     vlistDefNtsteps
 !                                    (INTEGER         vlistID,
 !                                     INTEGER         nts)
@@ -835,6 +839,16 @@
 !                                    (INTEGER         vlistID)
      EXTERNAL        vlistNrecs

+      INTEGER         vlistSubtype
+!                                    (INTEGER         vlistID,
+!                                     INTEGER         index)
+      EXTERNAL        vlistSubtype
+
+      INTEGER         vlistSubtypeIndex
+!                                    (INTEGER         vlistID,
+!                                     INTEGER         subtypeID)
+      EXTERNAL        vlistSubtypeIndex
+
 !                     vlistDefTaxis
 !                                    (INTEGER         vlistID,
 !                                     INTEGER         taxisID)

--- a/src/cdiFortran.c
+++ b/src/cdiFortran.c
@@ -46,7 +46,7 @@


 /*  Data structure defining a key-value search, possibly with multiple
-   key-value pairs in combination. 
+   key-value pairs in combination.

   Currently, only multiple pairs combined by AND are supported.  */

@@ -181,6 +181,7 @@ FCALLSCFUN1 (INT, vlistNumber, VLISTNUMBER, vlistnumber, INT)
 FCALLSCFUN1 (INT, vlistNvars, VLISTNVARS, vlistnvars, INT)
 FCALLSCFUN1 (INT, vlistNgrids, VLISTNGRIDS, vlistngrids, INT)
 FCALLSCFUN1 (INT, vlistNzaxis, VLISTNZAXIS, vlistnzaxis, INT)
+FCALLSCFUN1 (INT, vlistNsubtypes, VLISTNSUBTYPES, vlistnsubtypes, INT)
 FCALLSCSUB2 (vlistDefNtsteps, VLISTDEFNTSTEPS, vlistdefntsteps, INT, INT)
 FCALLSCFUN1 (INT, vlistNtsteps, VLISTNTSTEPS, vlistntsteps, INT)
 FCALLSCFUN1 (INT, vlistGridsizeMax, VLISTGRIDSIZEMAX, vlistgridsizemax, INT)
@@ -193,6 +194,8 @@ FCALLSCFUN2 (INT, vlistZaxisIndex, VLISTZAXISINDEX, vlistzaxisindex, INT, INT)
 FCALLSCSUB3 (vlistChangeZaxisIndex, VLISTCHANGEZAXISINDEX, vlistchangezaxisindex, INT, INT, INT)
 FCALLSCSUB3 (vlistChangeZaxis, VLISTCHANGEZAXIS, vlistchangezaxis, INT, INT, INT)
 FCALLSCFUN1 (INT, vlistNrecs, VLISTNRECS, vlistnrecs, INT)
+FCALLSCFUN2 (INT, vlistSubtype, VLISTSUBTYPE, vlistsubtype, INT, INT)
+FCALLSCFUN2 (INT, vlistSubtypeIndex, VLISTSUBTYPEINDEX, vlistsubtypeindex, INT, INT)
 FCALLSCSUB2 (vlistDefTaxis, VLISTDEFTAXIS, vlistdeftaxis, INT, INT)
 FCALLSCFUN1 (INT, vlistInqTaxis, VLISTINQTAXIS, vlistinqtaxis, INT)
 FCALLSCSUB2 (vlistDefTable, VLISTDEFTABLE, vlistdeftable, INT, INT)

--- a/src/make_fint.c
+++ b/src/make_fint.c
@@ -15,7 +15,7 @@
 #endif

 //#include "config.h"
-#define VERSION "1.6.9"
+#define VERSION "1.7.0"
 typedef struct
 {
  size_t naline;