No commit message

No commit message

configure

@@ -1349,6 +1349,7 @@ Optional Features:
   --enable-python         python language bindings [default=no]
   --enable-dap            Build OPeNDAP/DODS-enabled clients if possible
                           [default=no]
+  --enable-mpi            Compile with MPI compiler [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -7867,6 +7868,26 @@ echo "$as_me: error: couldn't find ncdap-config" >&2;}
    fi
 fi
 
+#  ----------------------------------------------------------------------
+# Compile with MPI support
+# Check whether --enable-mpi was given.
+if test "${enable_mpi+set}" = set; then
+  enableval=$enable_mpi; enable_mpi=${enableval}
+else
+  enable_mpi=no
+fi
+
+
+if test "${enable_mpi}" = "yes"; then
+   if test "${host_os:0:3}" = "aix"; then
+      replace_cc="mpcc_r"
+   else
+      replace_cc="mpicc"
+   fi
+else
+      replace_cc=$CC
+fi
+
 #  ----------------------------------------------------------------------
 #  Is the netcdf present? It has a header file `netcdf.h' and a library
 #  `-lnetcdf' and their locations might be specified with the `--with-netcdf'
@@ -8552,6 +8573,10 @@ fi
 
 
 
+if test "${replace_cc}" != ""; then
+    CC=$replace_cc
+fi
+
 ac_config_files="$ac_config_files Makefile src/Makefile interfaces/Makefile app/Makefile tests/Makefile examples/Makefile"
 
 cat >confcache <<\_ACEOF

src/cgribexlib.c

 
-/* Automatically generated by m214003 at 2009-11-25, do not edit */
+/* Automatically generated by m214003 at 2009-12-07, do not edit */
 
 /* CGRIBEXLIB_VERSION="1.4.1" */
 
@@ -103,6 +103,22 @@
 
 double intpow2(int x);
 
+/* CDI converter routines */
+
+/* param format:  DDDCCCNNN */
+
+void    cdiDecodeParam(int param, int *dis, int *cat, int *num);
+int     cdiEncodeParam(int dis, int cat, int num);
+
+/* date format:  YYYYMMDD */
+/* time format:  hhmmss   */
+
+void    cdiDecodeDate(int date, int *year, int *month, int *day);
+int     cdiEncodeDate(int year, int month, int day);
+
+void    cdiDecodeTime(int time, int *hour, int *minute, int *second);
+int     cdiEncodeTime(int hour, int minute, int second);
+
 
 extern FILE *grprsm;
 
@@ -8889,7 +8905,7 @@ int  gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
 
   return (gribLen);
 }
-static const char grb_libvers[] = "1.4.1" " of ""Nov 25 2009"" ""14:45:48";
+static const char grb_libvers[] = "1.4.1" " of ""Dec  7 2009"" ""11:57:30";
 const char *
 cgribexLibraryVersion(void)
 {

src/make_cdilib

@@ -146,17 +146,17 @@ fi
 
 echo "#if defined (HAVE_CF_INTERFACE)" >>  ${PROG}
 echo "#undef realloc" >>  ${PROG}
-echo "#undef malloc" >>  ${PROG}
-echo "#undef calloc" >>  ${PROG}
-echo "#undef free" >>  ${PROG}
+echo "#undef malloc"  >>  ${PROG}
+echo "#undef calloc"  >>  ${PROG}
+echo "#undef free"    >>  ${PROG}
 echo "#undef DOUBLE_PRECISION" >>  ${PROG}
-cat $srcdir/cfortran.h  >>  ${PROG}
+cat $srcdir/cfortran.h   >>  ${PROG}
 echo "#endif" >>  ${PROG}
 cat $srcdir/cdiFortran.c >>  ${PROG}
 
 echo "#undef realloc" >>  ${PROG}
-echo "#undef malloc" >>  ${PROG}
-echo "#undef calloc" >>  ${PROG}
-echo "#undef free" >>  ${PROG}
+echo "#undef malloc"  >>  ${PROG}
+echo "#undef calloc"  >>  ${PROG}
+echo "#undef free"    >>  ${PROG}
 
 exit

src/stream_gribapi.c

@@ -2035,8 +2035,10 @@ void *gribHandleNew()
   static char func[] = "gribHandleNew";
   void *gh = NULL;
 
+#if  defined  (HAVE_LIBGRIB_API)
   gh = (void *) grib_handle_new_from_template(NULL, "GRIB2");
   if ( gh == NULL ) Error(func, "grib_handle_new_from_template failed!");
+#endif
 
   return (gh);
 }
@@ -2044,7 +2046,9 @@ void *gribHandleNew()
 
 void gribHandleDelete(void *gh)
 {
+#if  defined  (HAVE_LIBGRIB_API)
   grib_handle_delete(gh);
+#endif
 }
 
 #define GRIBAPIENCODETEST 1

tests/test_grib.c

 #include <stdio.h>
+#include <stdlib.h>
+
 
 #include "cdi.h"