merged trunk into cdi-conversion_c++

e176c882 · Oliver Heidmann · f8a564dc · e871cd20 · e176c882 · e176c882
Commit e176c882 authored Aug 05, 2015 by Oliver Heidmann
--- a/app/printinfo.h
+++ b/app/printinfo.h
@@ -6,8 +6,10 @@ void uuid2str(const unsigned char uuid[CDI_UUID_SIZE], char *uuidstr);
 static inline
 int cdiUUIDIsNull(const unsigned char uuid[CDI_UUID_SIZE])
 {
-  static unsigned char uuid_nil[CDI_UUID_SIZE];
-  return !memcmp(uuid, uuid_nil, CDI_UUID_SIZE);
+  int isNull = 1;
+  for (size_t i = 0; i < CDI_UUID_SIZE; ++i)
+    isNull &= (uuid[i] == 0);
+  return isNull;
 }



--- 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.0rc3.
+# Generated by GNU Autoconf 2.68 for cdi 1.7.0rc4.
 #
 # 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.0rc3'
-PACKAGE_STRING='cdi 1.7.0rc3'
+PACKAGE_VERSION='1.7.0rc4'
+PACKAGE_STRING='cdi 1.7.0rc4'
 PACKAGE_BUGREPORT='http://mpimet.mpg.de/cdi'
 PACKAGE_URL=''
  
@@ -639,7 +639,6 @@ PYTHON
 ENABLE_RUBY
 ENABLE_RUBY_FALSE
 ENABLE_RUBY_TRUE
-RUBY
 ENABLE_SWIG_FALSE
 ENABLE_SWIG_TRUE
 SWIG
@@ -650,6 +649,7 @@ FC_MOD_FLAG
 ENABLE_F2003_ISOC
 CREATE_ISOC_FALSE
 CREATE_ISOC_TRUE
+RUBY
 ENABLE_MPI
 USE_MPI
 USE_PPM_CORE_FALSE
@@ -1471,7 +1471,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.0rc3 to adapt to many kinds of systems.
+\`configure' configures cdi 1.7.0rc4 to adapt to many kinds of systems.
  
 Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@ -1541,7 +1541,7 @@ fi
  
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of cdi 1.7.0rc3:";;
+     short | recursive ) echo "Configuration of cdi 1.7.0rc4:";;
   esac
  cat <<\_ACEOF
  
@@ -1750,7 +1750,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-cdi configure 1.7.0rc3
+cdi configure 1.7.0rc4
 generated by GNU Autoconf 2.68
  
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2553,7 +2553,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.0rc3, which was
+It was created by cdi $as_me 1.7.0rc4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
  
  $ $0 $@
@@ -3499,7 +3499,7 @@ fi
  
 # Define the identity of the package.
 PACKAGE='cdi'
- VERSION='1.7.0rc3'
+ VERSION='1.7.0rc4'
  
  
 cat >>confdefs.h <<_ACEOF
@@ -23368,7 +23368,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
  
 lt_cl_version="\
-cdi config.lt 1.7.0rc3
+cdi config.lt 1.7.0rc4
 configured by $0, generated by GNU Autoconf 2.68.
  
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -29616,6 +29616,46 @@ ENABLE_MPI=`test x"$enable_mpi" = xyes && echo true || echo false`
  
 #  ----------------------------------------------------------------------
 #  Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
+#
+# the test for ruby itself is unconditional because ruby is also used in
+# the Fortran 2003 ISO C generator
+# Extract the first word of "ruby", so it can be a program name with args.
+set dummy ruby; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RUBY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RUBY"; then
+  ac_cv_prog_RUBY="$RUBY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RUBY="ruby"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RUBY=$ac_cv_prog_RUBY
+if test -n "$RUBY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
+$as_echo "$RUBY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Check whether --enable-iso-c-interface was given.
 if test "${enable_iso_c_interface+set}" = set; then :
  enableval=$enable_iso_c_interface; enable_isoc=${enableval}
@@ -29685,7 +29725,7 @@ $as_echo "yes" >&6; }
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-
+enable_isoc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
@@ -29920,46 +29960,10 @@ fi
  
 #  ----------------------------------------------------------------------
 #  Create the Ruby Interface via swig
+#
 # Check whether --enable-ruby was given.
 if test "${enable_ruby+set}" = set; then :
-  enableval=$enable_ruby; # Extract the first word of "ruby", so it can be a program name with args.
-set dummy ruby; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RUBY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RUBY"; then
-  ac_cv_prog_RUBY="$RUBY" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RUBY="ruby"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RUBY=$ac_cv_prog_RUBY
-if test -n "$RUBY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
-$as_echo "$RUBY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-   RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
+  enableval=$enable_ruby; RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
   save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
   ac_fn_c_check_header_mongrel "$LINENO" "ruby.h" "ac_cv_header_ruby_h" "$ac_includes_default"
@@ -31172,7 +31176,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.0rc3, which was
+This file was extended by cdi $as_me 1.7.0rc4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
  
  CONFIG_FILES    = $CONFIG_FILES
@@ -31238,7 +31242,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.0rc3
+cdi config.status 1.7.0rc4
 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.0rc3], [http://mpimet.mpg.de/cdi])
+AC_INIT([cdi], [1.7.0rc4], [http://mpimet.mpg.de/cdi])

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

@@ -236,12 +236,16 @@ AC_SUBST([USE_MPI])
 AC_SUBST([ENABLE_MPI],[`test x"$enable_mpi" = xyes && echo true || echo false`])
 #  ----------------------------------------------------------------------
 #  Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
+#
+# the test for ruby itself is unconditional because ruby is also used in
+# the Fortran 2003 ISO C generator
+AC_CHECK_PROG([RUBY],[ruby],[ruby])
 AC_ARG_ENABLE([iso-c-interface],
              [AS_HELP_STRING([--enable-iso-c-interface],
                 [Create Fortran Interface via iso_c_bindings facility of F2003 [default=no].])],
              [enable_isoc=${enableval}],[enable_isoc=no])
 AS_IF([test x"$enable_isoc" = xyes],
-  [ACX_FC_CHECK_STRPTR_CONVERT],[enable_isoc=no])
+  [ACX_FC_CHECK_STRPTR_CONVERT(,[enable_isoc=no])],[enable_isoc=no])
 AM_CONDITIONAL([CREATE_ISOC],[test $enable_isoc = 'yes'])
 AC_SUBST([ENABLE_F2003_ISOC],[$enable_isoc])
 AM_SUBST_NOTMAKE([ENABLE_F2003_ISOC])
@@ -267,10 +271,10 @@ AC_ARG_ENABLE(swig,
 AM_CONDITIONAL(ENABLE_SWIG,[test "x$SWIG" != "x"])
 #  ----------------------------------------------------------------------
 #  Create the Ruby Interface via swig
-AC_ARG_ENABLE(ruby,
+#
+AC_ARG_ENABLE([ruby],
  [AS_HELP_STRING([--enable-ruby],[ruby language bindings [default=no] (EXPERIMENTAL)])],
-  [AC_CHECK_PROG(RUBY,ruby,ruby)
-   RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
+  [RUBY_INCLUDES="$($RUBY $srcdir/config/interface.rb)"
   save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
   AC_CHECK_HEADER([ruby.h],,[enable_ruby=no

--- a/doc/tex/c_quick_ref.tex
+++ b/doc/tex/c_quick_ref.tex
@@ -97,7 +97,7 @@ Define the UUID of an unstructured grid.
 \section*{\tt \htmlref{gridDefXbounds}{gridDefXbounds}}

 \begin{verbatim}
-    void gridDefXbounds (int gridID, const double *xbounds_vec);
+    void gridDefXbounds (int gridID, const double xbounds[]);
 \end{verbatim}

 Define the bounds of a X-axis.
@@ -142,7 +142,7 @@ Define the units of a X-axis.
 \section*{\tt \htmlref{gridDefXvals}{gridDefXvals}}

 \begin{verbatim}
-    void gridDefXvals (int gridID, const double *xvals_vec);
+    void gridDefXvals (int gridID, const double xvals[]);
 \end{verbatim}

 Define the values of a X-axis.
@@ -151,7 +151,7 @@ Define the values of a X-axis.
 \section*{\tt \htmlref{gridDefYbounds}{gridDefYbounds}}

 \begin{verbatim}
-    void gridDefYbounds (int gridID, const double *ybounds_vec);
+    void gridDefYbounds (int gridID, const double ybounds[]);
 \end{verbatim}

 Define the bounds of a Y-axis.
@@ -196,7 +196,7 @@ Define the units of a Y-axis.
 \section*{\tt \htmlref{gridDefYvals}{gridDefYvals}}

 \begin{verbatim}
-    void gridDefYvals (int gridID, const double *yvals_vec);
+    void gridDefYvals (int gridID, const double yvals[]);
 \end{verbatim}

 Define the values of a Y-axis.
@@ -304,7 +304,7 @@ Get the UUID of an unstructured grid.
 \section*{\tt \htmlref{gridInqXbounds}{gridInqXbounds}}

 \begin{verbatim}
-    int gridInqXbounds (int gridID, double *xbounds_vec);
+    int gridInqXbounds (int gridID, double xbounds[]);
 \end{verbatim}

 Get the bounds of a X-axis.
@@ -367,7 +367,7 @@ Get one value of a X-axis.
 \section*{\tt \htmlref{gridInqXvals}{gridInqXvals}}

 \begin{verbatim}
-    int gridInqXvals (int gridID, double *xvals_vec);
+    int gridInqXvals (int gridID, double xvals[]);
 \end{verbatim}

 Get all values of a X-axis.
@@ -376,7 +376,7 @@ Get all values of a X-axis.
 \section*{\tt \htmlref{gridInqYbounds}{gridInqYbounds}}

 \begin{verbatim}
-    int gridInqYbounds (int gridID, double *ybounds_vec);
+    int gridInqYbounds (int gridID, double ybounds[]);
 \end{verbatim}

 Get the bounds of a Y-axis.
@@ -439,7 +439,7 @@ Get one value of a Y-axis.
 \section*{\tt \htmlref{gridInqYvals}{gridInqYvals}}

 \begin{verbatim}
-    int gridInqYvals (int gridID, double *yvals_vec);
+    int gridInqYvals (int gridID, double yvals[]);
 \end{verbatim}

 Get all values of a Y-axis.
@@ -574,7 +574,7 @@ Create a new dataset.
 \section*{\tt \htmlref{streamReadVar}{streamReadVar}}

 \begin{verbatim}
-    void streamReadVar (int streamID, int varID, double *data_vec, int *nmiss);
+    void streamReadVar (int streamID, int varID, double data[], int *nmiss);
 \end{verbatim}

 Read a variable.
@@ -583,7 +583,7 @@ Read a variable.
 \section*{\tt \htmlref{streamReadVarSlice}{streamReadVarSlice}}

 \begin{verbatim}
-    void streamReadVarSlice (int streamID, int varID, int levelID, double *data_vec,
+    void streamReadVarSlice (int streamID, int varID, int levelID, double data[],
                             int *nmiss);
 \end{verbatim}

@@ -602,7 +602,7 @@ Synchronize an Open Dataset to Disk.
 \section*{\tt \htmlref{streamWriteVar}{streamWriteVar}}

 \begin{verbatim}
-    void streamWriteVar (int streamID, int varID, const double *data_vec, int nmiss);
+    void streamWriteVar (int streamID, int varID, const double data[], int nmiss);
 \end{verbatim}

 Write a variable.
@@ -612,7 +612,7 @@ Write a variable.

 \begin{verbatim}
    void streamWriteVarSlice (int streamID, int varID, int levelID,
-                              const double *data_vec, int nmiss);
+                              const double data[], int nmiss);
 \end{verbatim}

 Write a horizontal slice of a variable.
@@ -663,6 +663,33 @@ Get the size of a subtype (e.g. no. of tiles)..
 Specialized version of subtypeInqSubEntry looking for tile/attribute pair..


+\section*{\tt \htmlref{tableRead}{tableRead}}
+
+\begin{verbatim}
+    int tableRead (const char *tablefile);
+\end{verbatim}
+
+read table of parameters from file in tabular format.
+
+
+\section*{\tt \htmlref{tableWrite}{tableWrite}}
+
+\begin{verbatim}
+    void tableWrite (const char *filename, int tableID);
+\end{verbatim}
+
+write table of parameters to file in tabular format.
+
+
+\section*{\tt \htmlref{tableWriteC}{tableWriteC}}
+
+\begin{verbatim}
+    void tableWriteC (const char *filename, int tableID);
+\end{verbatim}
+
+write table of parameters to file in C language format.
+
+
 \section*{\tt \htmlref{taxisCreate}{taxisCreate}}

 \begin{verbatim}
@@ -856,7 +883,7 @@ Create a variable list.

 \begin{verbatim}
    int vlistDefAttFlt (int vlistID, int varID, const char *name, int type, int len,
-                        const double *dp_vec);
+                        const double dp[]);
 \end{verbatim}

 Define a floating point attribute.
@@ -866,7 +893,7 @@ Define a floating point attribute.

 \begin{verbatim}
    int vlistDefAttInt (int vlistID, int varID, const char *name, int type, int len,
-                        const int *ip_vec);
+                        const int ip[]);
 \end{verbatim}

 Define an integer attribute.
@@ -1050,7 +1077,7 @@ Get information about an attribute.

 \begin{verbatim}
    int vlistInqAttFlt (int vlistID, int varID, const char *name, int mlen,
-                        double *dp_vec);
+                        double dp[]);
 \end{verbatim}

 Get the value(s) of a floating point attribute.
@@ -1059,8 +1086,7 @@ Get the value(s) of a floating point attribute.
 \section*{\tt \htmlref{vlistInqAttInt}{vlistInqAttInt}}

 \begin{verbatim}
-    int vlistInqAttInt (int vlistID, int varID, const char *name, int mlen,
-                        int *ip_vec);
+    int vlistInqAttInt (int vlistID, int varID, const char *name, int mlen, int ip[]);
 \end{verbatim}

 Get the value(s) of an integer attribute.
@@ -1277,7 +1303,7 @@ Define one level of a Z-axis.
 \section*{\tt \htmlref{zaxisDefLevels}{zaxisDefLevels}}

 \begin{verbatim}
-    void zaxisDefLevels (int zaxisID, const double *levels_vec);
+    void zaxisDefLevels (int zaxisID, const double levels[]);
 \end{verbatim}

 Define the levels of a Z-axis.
@@ -1286,7 +1312,7 @@ Define the levels of a Z-axis.
 \section*{\tt \htmlref{zaxisDefLongname}{zaxisDefLongname}}

 \begin{verbatim}
-    void zaxisDefLongname (int zaxisID, const char *longname);
+    void zaxisDefLongname (int zaxisID, const char *longname_optional);
 \end{verbatim}

 Define the longname of a Z-axis.
@@ -1295,7 +1321,7 @@ Define the longname of a Z-axis.
 \section*{\tt \htmlref{zaxisDefName}{zaxisDefName}}

 \begin{verbatim}
-    void zaxisDefName (int zaxisID, const char *name);
+    void zaxisDefName (int zaxisID, const char *name_optional);
 \end{verbatim}

 Define the name of a Z-axis.
@@ -1331,7 +1357,7 @@ Define the UUID of a generalized Z-axis.
 \section*{\tt \htmlref{zaxisDefUnits}{zaxisDefUnits}}

 \begin{verbatim}
-    void zaxisDefUnits (int zaxisID, const char *units);
+    void zaxisDefUnits (int zaxisID, const char *units_optional);
 \end{verbatim}

 Define the units of a Z-axis.
@@ -1367,7 +1393,7 @@ Get one level of a Z-axis.
 \section*{\tt \htmlref{zaxisInqLevels}{zaxisInqLevels}}

 \begin{verbatim}
-    void zaxisInqLevels (int zaxisID, double *levels_vec);
+    void zaxisInqLevels (int zaxisID, double levels[]);
 \end{verbatim}

 Get all levels of a Z-axis.

--- a/doc/tex/f_quick_ref.tex
+++ b/doc/tex/f_quick_ref.tex
@@ -97,7 +97,7 @@ Define the UUID of an unstructured grid.
 \section*{\tt \htmlref{gridDefXbounds}{gridDefXbounds}}

 \begin{verbatim}
-    SUBROUTINE gridDefXbounds (INTEGER gridID, DOUBLEPRECISION xbounds_vec)
+    SUBROUTINE gridDefXbounds (INTEGER gridID, DOUBLEPRECISION xbounds(*))
 \end{verbatim}

 Define the bounds of a X-axis.
@@ -142,7 +142,7 @@ Define the units of a X-axis.
 \section*{\tt \htmlref{gridDefXvals}{gridDefXvals}}

 \begin{verbatim}
-    SUBROUTINE gridDefXvals (INTEGER gridID, DOUBLEPRECISION xvals_vec)
+    SUBROUTINE gridDefXvals (INTEGER gridID, DOUBLEPRECISION xvals(*))
 \end{verbatim}

 Define the values of a X-axis.
@@ -151,7 +151,7 @@ Define the values of a X-axis.
 \section*{\tt \htmlref{gridDefYbounds}{gridDefYbounds}}

 \begin{verbatim}
-    SUBROUTINE gridDefYbounds (INTEGER gridID, DOUBLEPRECISION ybounds_vec)
+    SUBROUTINE gridDefYbounds (INTEGER gridID, DOUBLEPRECISION ybounds(*))
 \end{verbatim}

 Define the bounds of a Y-axis.
@@ -196,7 +196,7 @@ Define the units of a Y-axis.
 \section*{\tt \htmlref{gridDefYvals}{gridDefYvals}}

 \begin{verbatim}
-    SUBROUTINE gridDefYvals (INTEGER gridID, DOUBLEPRECISION yvals_vec)
+    SUBROUTINE gridDefYvals (INTEGER gridID, DOUBLEPRECISION yvals(*))
 \end{verbatim}

 Define the values of a Y-axis.
@@ -304,7 +304,7 @@ Get the UUID of an unstructured grid.
 \section*{\tt \htmlref{gridInqXbounds}{gridInqXbounds}}

 \begin{verbatim}
-    INTEGER FUNCTION gridInqXbounds (INTEGER gridID, DOUBLEPRECISION xbounds_vec)
+    INTEGER FUNCTION gridInqXbounds (INTEGER gridID, DOUBLEPRECISION xbounds(*))
 \end{verbatim}

 Get the bounds of a X-axis.
@@ -367,7 +367,7 @@ Get one value of a X-axis.
 \section*{\tt \htmlref{gridInqXvals}{gridInqXvals}}

 \begin{verbatim}
-    INTEGER FUNCTION gridInqXvals (INTEGER gridID, DOUBLEPRECISION xvals_vec)
+    INTEGER FUNCTION gridInqXvals (INTEGER gridID, DOUBLEPRECISION xvals(*))
 \end{verbatim}

 Get all values of a X-axis.
@@ -376,7 +376,7 @@ Get all values of a X-axis.
 \section*{\tt \htmlref{gridInqYbounds}{gridInqYbounds}}

 \begin{verbatim}
-    INTEGER FUNCTION gridInqYbounds (INTEGER gridID, DOUBLEPRECISION ybounds_vec)
+    INTEGER FUNCTION gridInqYbounds (INTEGER gridID, DOUBLEPRECISION ybounds(*))
 \end{verbatim}

 Get the bounds of a Y-axis.
@@ -439,7 +439,7 @@ Get one value of a Y-axis.
 \section*{\tt \htmlref{gridInqYvals}{gridInqYvals}}

 \begin{verbatim}
-    INTEGER FUNCTION gridInqYvals (INTEGER gridID, DOUBLEPRECISION yvals_vec)
+    INTEGER FUNCTION gridInqYvals (INTEGER gridID, DOUBLEPRECISION yvals(*))
 \end{verbatim}

 Get all values of a Y-axis.
@@ -575,7 +575,7 @@ Create a new dataset.

 \begin{verbatim}
    SUBROUTINE streamReadVar (INTEGER streamID, INTEGER varID,
-                              DOUBLEPRECISION data_vec, INTEGER nmiss)
+                              DOUBLEPRECISION data(*), INTEGER nmiss)
 \end{verbatim}

 Read a variable.
@@ -585,7 +585,7 @@ Read a variable.

 \begin{verbatim}
    SUBROUTINE streamReadVarSlice (INTEGER streamID, INTEGER varID, INTEGER levelID,
-                                   DOUBLEPRECISION data_vec, INTEGER nmiss)
+                                   DOUBLEPRECISION data(*), INTEGER nmiss)
 \end{verbatim}

 Read a horizontal slice of a variable.
@@ -604,7 +604,7 @@ Synchronize an Open Dataset to Disk.

 \begin{verbatim}
    SUBROUTINE streamWriteVar (INTEGER streamID, INTEGER varID,
-                               DOUBLEPRECISION data_vec, INTEGER nmiss)
+                               DOUBLEPRECISION data(*), INTEGER nmiss)
 \end{verbatim}

 Write a variable.
@@ -614,7 +614,7 @@ Write a variable.

 \begin{verbatim}
    SUBROUTINE streamWriteVarSlice (INTEGER streamID, INTEGER varID, INTEGER levelID,
-                                    DOUBLEPRECISION data_vec, INTEGER nmiss)
+                                    DOUBLEPRECISION data(*), INTEGER nmiss)
 \end{verbatim}

 Write a horizontal slice of a variable.
@@ -666,6 +666,33 @@ Get the size of a subtype (e.g. no. of tiles)..
 Specialized version of subtypeInqSubEntry looking for tile/attribute pair..


+\section*{\tt \htmlref{tableRead}{tableRead}}
+
+\begin{verbatim}
+    INTEGER FUNCTION tableRead (CHARACTER*(*) tablefile)
+\end{verbatim}
+
+read table of parameters from file in tabular format.
+
+
+\section*{\tt \htmlref{tableWrite}{tableWrite}}
+
+\begin{verbatim}
+    SUBROUTINE tableWrite (CHARACTER*(*) filename, INTEGER tableID)
+\end{verbatim}
+
+write table of parameters to file in tabular format.
+
+
+\section*{\tt \htmlref{tableWriteC}{tableWriteC}}
+
+\begin{verbatim}
+    SUBROUTINE tableWriteC (CHARACTER*(*) filename, INTEGER tableID)
+\end{verbatim}
+
+write table of parameters to file in C language format.
+
+
 \section*{\tt \htmlref{taxisCreate}{taxisCreate}}

 \begin{verbatim}
@@ -860,7 +887,7 @@ Create a variable list.
 \begin{verbatim}
    INTEGER FUNCTION vlistDefAttFlt (INTEGER vlistID, INTEGER varID,
                                     CHARACTER*(*) name, INTEGER type, INTEGER len,
-                                     DOUBLEPRECISION dp_vec)
+                                     DOUBLEPRECISION dp(*))
 \end{verbatim}

 Define a floating point attribute.
@@ -871,7 +898,7 @@ Define a floating point attribute.
 \begin{verbatim}
    INTEGER FUNCTION vlistDefAttInt (INTEGER vlistID, INTEGER varID,
                                     CHARACTER*(*) name, INTEGER type, INTEGER len,
-                                     INTEGER ip_vec)
+                                     INTEGER ip(*))
 \end{verbatim}

 Define an integer attribute.
@@ -1065,7 +1092,7 @@ Get information about an attribute.
 \begin{verbatim}
    INTEGER FUNCTION vlistInqAttFlt (INTEGER vlistID, INTEGER varID,
                                     CHARACTER*(*) name, INTEGER mlen,
-                                     DOUBLEPRECISION dp_vec)
+                                     DOUBLEPRECISION dp(*))
 \end{verbatim}

 Get the value(s) of a floating point attribute.
@@ -1075,8 +1102,7 @@ Get the value(s) of a floating point attribute.

 \begin{verbatim}
    INTEGER FUNCTION vlistInqAttInt (INTEGER vlistID, INTEGER varID,
-                                     CHARACTER*(*) name, INTEGER mlen,
-                                     INTEGER ip_vec)
+                                     CHARACTER*(*) name, INTEGER mlen, INTEGER ip(*))
 \end{verbatim}

 Get the value(s) of an integer attribute.
@@ -1299,7 +1325,7 @@ Define one level of a Z-axis.
 \section*{\tt \htmlref{zaxisDefLevels}{zaxisDefLevels}}

 \begin{verbatim}
-    SUBROUTINE zaxisDefLevels (INTEGER zaxisID, DOUBLEPRECISION levels_vec)
+    SUBROUTINE zaxisDefLevels (INTEGER zaxisID, DOUBLEPRECISION levels(*))
 \end{verbatim}

 Define the levels of a Z-axis.
@@ -1308,7 +1334,7 @@ Define the levels of a Z-axis.
 \section*{\tt \htmlref{zaxisDefLongname}{zaxisDefLongname}}

 \begin{verbatim}
-    SUBROUTINE zaxisDefLongname (INTEGER zaxisID, CHARACTER*(*) longname)
+    SUBROUTINE zaxisDefLongname (INTEGER zaxisID, CHARACTER*(*) longname_optional)
 \end{verbatim}

 Define the longname of a Z-axis.
@@ -1317,7 +1343,7 @@ Define the longname of a Z-axis.
 \section*{\tt \htmlref{zaxisDefName}{zaxisDefName}}

 \begin{verbatim}
-    SUBROUTINE zaxisDefName (INTEGER zaxisID, CHARACTER*(*) name)
+    SUBROUTINE zaxisDefName (INTEGER zaxisID, CHARACTER*(*) name_optional)