Merge remote branch 'remotes/tags/cdi-1.5.2' into mpiwin

7844b710 · Deike Kleberg · 5b58da77 · 7844b710 · 7844b710 · 7844b710
Commit 7844b710 authored Oct 17, 2011 by Deike Kleberg
--- a/.gitattributes
+++ b/.gitattributes
@@ -123,14 +123,19 @@ interfaces/ruby/testObj.rb -text
 interfaces/testdata/gridTest.nc -text
 interfaces/testdata/mulval.grb -text
 interfaces/testdata/mulval.nc -text
+m4/acx_assert_lang_is_fortran_variant.m4 -text
+m4/acx_lang_other_suffix_conftest.m4 -text
 m4/acx_options.m4 -text
+m4/acx_sl_fc_mod_path_flag.m4 -text
 m4/acx_sl_mod_suffix.m4 -text
+m4/asx_unset.m4 -text
 m4/ax_pthread.m4 -text
 m4/libtool.m4 -text
 m4/ltoptions.m4 -text
 m4/ltsugar.m4 -text
 m4/ltversion.m4 -text
 m4/lt~obsolete.m4 -text
+m4/starlink_fpp.m4 -text
 pioExamples/Makefile.am -text
 pioExamples/Makefile.in -text
 pioExamples/Makefile_blizzard -text
@@ -226,6 +231,7 @@ src/pio_server.c -text
 src/pio_server.h -text
 src/pio_util.c -text
 src/pio_util.h -text
+src/pkgconfig/cdi.pc.in -text
 src/resource_handle.c -text
 src/resource_handle.h -text
 src/service.h -text

--- a/ChangeLog
+++ b/ChangeLog
+2011-08-15  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* streamFilesuffix: added suffix for filetype NC4C (bug fix)
+
+2011-08-06  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* scanVarAttributes: check size of axis attribute (bug fix) [report: David Huard]
+
+2011-07-29  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* Added flexible XYZ dimension ordering for netCDF [request: Andy Aschwanden]
+
+2011-07-28  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* added interface function vlistDefVarXYZ to set the dimension order
+
+2011-07-23  Pier Giuseppe Fogli  <piergiuseppe.fogli@cmcc.it>
+
+	* added interface function zaxisInqVct to read the VCT
+
+2011-07-23  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* netcdf input: correct wrong formatted time units [request: Harald Anlauf]
+
+2011-07-14  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* netcdf: added support for GRID_FOURIER (fourier coefficients)
+
+2011-07-12  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* Version 1.5.1 released
+
+2011-07-07  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* vlistCopy: allocate and copy varsAllocated elements (bug fix) [report: Ralf Mueller]
+
+2011-06-24  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* vtime2timeval: do not round result (bug fix for TUNIT_YEAR) [report: Andy Aschwanden]
+
 2011-06-01  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>

 	* CDI: changed compression type from Ztype to CompType
@@ -7,7 +47,7 @@

 	* gridGenYvals: changed delta eps to 0.002 for gaussian grids [report: John Lillibridge] 
 	* ruby/python interface: changed GRID_CELL to GRID_UNSTRUCTURED [report: Tim Cera]
-	
+
 2011-05-12  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>

 	* grid::compareXYvals: bug fix for generic grids [report: Felicia Brisc]

--- a/Makefile.in
+++ b/Makefile.in
@@ -36,24 +36,31 @@ host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/cdi.settings.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config/compile config/config.guess config/config.sub \
-	config/depcomp config/install-sh config/ltmain.sh \
-	config/missing config/mkinstalldirs
+	$(top_srcdir)/configure $(top_srcdir)/src/pkgconfig/cdi.pc.in \
+	AUTHORS COPYING ChangeLog INSTALL NEWS config/compile \
+	config/config.guess config/config.sub config/depcomp \
+	config/install-sh config/ltmain.sh config/missing \
+	config/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/m4/acx_assert_lang_is_fortran_variant.m4 \
+	$(top_srcdir)/m4/acx_lang_other_suffix_conftest.m4 \
+	$(top_srcdir)/m4/acx_options.m4 \
+	$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
 	$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/asx_unset.m4 $(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/starlink_fpp.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = cdi.settings
+CONFIG_CLEAN_FILES = cdi.settings src/pkgconfig/cdi.pc
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -118,6 +125,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CDI_F90_INTERFACE_FCFLAGS = @CDI_F90_INTERFACE_FCFLAGS@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -147,22 +155,29 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCMODCASE = @FCMODCASE@
 FCMODEXT = @FCMODEXT@
+FC_MOD_FLAG = @FC_MOD_FLAG@
 FFLAGS = @FFLAGS@
 FGREP = @FGREP@
+FPP = @FPP@
+FPPFLAGS = @FPPFLAGS@
+FPP_DEFOPT = @FPP_DEFOPT@
+FPP_INCOPT = @FPP_INCOPT@
 GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
-GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
+GRIB_API_LIBS = @GRIB_API_LIBS@
 HDF5_INCLUDE = @HDF5_INCLUDE@
-HDF5_LDFLAGS = @HDF5_LDFLAGS@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_ROOT = @HDF5_ROOT@
 HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -177,7 +192,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
-NETCDF_LDFLAGS = @NETCDF_LDFLAGS@
+NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -205,13 +221,14 @@ STRIP = @STRIP@
 SWIG = @SWIG@
 SYSTEM_TYPE = @SYSTEM_TYPE@
 SZLIB_INCLUDE = @SZLIB_INCLUDE@
-SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
+SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LDFLAGS = @THREADS_LDFLAGS@
+THREADS_LIBS = @THREADS_LIBS@
 USER_NAME = @USER_NAME@
 VERSION = @VERSION@
 ZLIB_INCLUDE = @ZLIB_INCLUDE@
-ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -316,6 +333,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 cdi.settings: $(top_builddir)/config.status $(srcdir)/cdi.settings.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+src/pkgconfig/cdi.pc: $(top_builddir)/config.status $(top_srcdir)/src/pkgconfig/cdi.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@

 mostlyclean-libtool:
 	-rm -f *.lo

--- a/NEWS
+++ b/NEWS
 CDI NEWS
 --------

-Version 1.5.1 (?? ??? 2011):
+Version 1.5.2 (22 August 2011):
+
+   New features:
+     * Added flexible XYZ dimension ordering for netCDF
+     * Added support for grid type GRID_FOURIER (fourier coefficients)
+     * Added interface function zaxisInqVct to read the VCT
+
+Version 1.5.1 (12 July 2011):

   New features:
     * Added support for FILETYPE_NC4C (netcdf4 classic)
-   Fixed bugs:
-     * ruby/python interface: changed GRID_CELL to GRID_UNSTRUCTURED

 Version 1.5.0 (15 March 2011):


--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1001,12 +1001,17 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR

+m4_include([m4/acx_assert_lang_is_fortran_variant.m4])
+m4_include([m4/acx_lang_other_suffix_conftest.m4])
 m4_include([m4/acx_options.m4])
+m4_include([m4/acx_sl_fc_mod_path_flag.m4])
 m4_include([m4/acx_sl_mod_suffix.m4])
+m4_include([m4/asx_unset.m4])
 m4_include([m4/ax_pthread.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
+m4_include([m4/starlink_fpp.m4])
 m4_include([acinclude.m4])
--- a/app/Makefile.in
+++ b/app/Makefile.in
@@ -41,12 +41,18 @@ noinst_PROGRAMS = $(am__EXEEXT_2) createtable$(EXEEXT)
 subdir = app
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/m4/acx_assert_lang_is_fortran_variant.m4 \
+	$(top_srcdir)/m4/acx_lang_other_suffix_conftest.m4 \
+	$(top_srcdir)/m4/acx_options.m4 \
+	$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
 	$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/asx_unset.m4 $(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/starlink_fpp.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -97,6 +103,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CDI_F90_INTERFACE_FCFLAGS = @CDI_F90_INTERFACE_FCFLAGS@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -126,22 +133,29 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCMODCASE = @FCMODCASE@
 FCMODEXT = @FCMODEXT@
+FC_MOD_FLAG = @FC_MOD_FLAG@
 FFLAGS = @FFLAGS@
 FGREP = @FGREP@
+FPP = @FPP@
+FPPFLAGS = @FPPFLAGS@
+FPP_DEFOPT = @FPP_DEFOPT@
+FPP_INCOPT = @FPP_INCOPT@
 GREP = @GREP@
 GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
-GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
+GRIB_API_LIBS = @GRIB_API_LIBS@
 HDF5_INCLUDE = @HDF5_INCLUDE@
-HDF5_LDFLAGS = @HDF5_LDFLAGS@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_ROOT = @HDF5_ROOT@
 HOST_NAME = @HOST_NAME@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -156,7 +170,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
-NETCDF_LDFLAGS = @NETCDF_LDFLAGS@
+NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -184,13 +199,14 @@ STRIP = @STRIP@
 SWIG = @SWIG@
 SYSTEM_TYPE = @SYSTEM_TYPE@
 SZLIB_INCLUDE = @SZLIB_INCLUDE@
-SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
+SZLIB_LIBS = @SZLIB_LIBS@
 THREADS_INCLUDE = @THREADS_INCLUDE@
 THREADS_LDFLAGS = @THREADS_LDFLAGS@
+THREADS_LIBS = @THREADS_LIBS@
 USER_NAME = @USER_NAME@
 VERSION = @VERSION@
 ZLIB_INCLUDE = @ZLIB_INCLUDE@
-ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

--- a/app/printinfo.h
+++ b/app/printinfo.h
@@ -160,7 +160,7 @@ void printGridInfo(int vlistID)
 	  double xfirst = 0.0, xlast = 0.0;
 	  double yfirst = 0.0, ylast = 0.0;
 	  double xinc = 0.0, yinc = 0.0;
-	  
+
 	  yfirst = gridInqYval(gridID, 0);
 	  ylast  = gridInqYval(gridID, ysize-1);
 	  yinc   = gridInqYinc(gridID);
@@ -207,7 +207,7 @@ void printGridInfo(int vlistID)
 	      fprintf(stdout, "  %s", yunits);
 	      fprintf(stdout, "\n");
 	    }
-	  
+
 	  if ( gridIsRotated(gridID) )
 	    {
 	      double lonpole, latpole, angle;
@@ -219,7 +219,7 @@ void printGridInfo(int vlistID)
 	      if ( angle > 0 ) fprintf(stdout, "  angle = %.9g", angle);
 	      fprintf(stdout, "\n");
 	    }
-		
+
 	  if ( gridInqXbounds(gridID, NULL) || gridInqYbounds(gridID, NULL) )
 	    {
 	      fprintf(stdout, "%*s", nbyte0, "");
@@ -229,7 +229,7 @@ void printGridInfo(int vlistID)
 	      if ( gridInqMask(gridID, NULL) )    fprintf(stdout, " mask");
 	      fprintf(stdout, "\n");
 	    }
-	  
+
 	  if ( gridtype == GRID_LAEA )
 	    {
 	      double a, lon_0, lat_0;
@@ -237,7 +237,7 @@ void printGridInfo(int vlistID)
 	      fprintf(stdout, "%*s", nbyte0, "");
 	      fprintf(stdout, "projpar   : a = %g  lon_0 = %g  lat_0 = %g\n", a, lon_0, lat_0);
 	    }
-	  
+
 	  if ( gridtype == GRID_LCC2 )
 	    {
 	      double a, lon_0, lat_0, lat_1, lat_2;
@@ -249,11 +249,14 @@ void printGridInfo(int vlistID)
 	}
      else if ( gridtype == GRID_SPECTRAL )
 	{
-	  fprintf(stdout, "size      : dim = %d  truncation = %d  spc = %d\n",
-		  gridsize, trunc, gridsize/2);
+	  fprintf(stdout, "size      : dim = %d  nsp = %d  truncation = %d\n", gridsize, gridsize/2, trunc);
 	  fprintf(stdout, "%*s", nbyte0, "");
 	  fprintf(stdout, "            complexPacking = %d\n", gridInqComplexPacking(gridID));
 	}
+      else if ( gridtype == GRID_FOURIER )
+	{
+	  fprintf(stdout, "size      : dim = %d  nfc = %d  truncation = %d\n", gridsize, gridsize/2, trunc);
+	}
      else if ( gridtype == GRID_GME )
 	{
 	  int ni, nd;
@@ -314,7 +317,7 @@ void printGridInfo(int vlistID)
 	      fprintf(stdout, "\n");
 	      fprintf(stdout, "%*s", nbyte0, "");
 	      fprintf(stdout, "%-9s : min = %.9g  max = %.9g  %s\n", yname, yfirst, ylast, yunits);
-	      
+ 
 	      free(xvals);
 	      free(yvals);
 	    }
@@ -332,11 +335,11 @@ void printGridInfo(int vlistID)
 	    fprintf(stdout, "North Pole\n");
 	  else
 	    fprintf(stdout, "South Pole\n");
-	  fprintf(stdout, "%*s", nbyte0, "");	  
+	  fprintf(stdout, "%*s", nbyte0, "");
 	  fprintf(stdout, "            originLon = %g  originLat = %g  lonParY = %g\n",
 		  originLon, originLat, lonParY);
-	  fprintf(stdout, "%*s", nbyte0, "");	  
-	  fprintf(stdout, "            lat1 = %g  lat2 = %g  xinc = %g m  yinc = %g m\n", 
+	  fprintf(stdout, "%*s", nbyte0, "");
+	  fprintf(stdout, "            lat1 = %g  lat2 = %g  xinc = %g m  yinc = %g m\n",
 		  lat1, lat2, xincm, yincm);
 	}
      else /* if ( gridtype == GRID_GENERIC ) */
@@ -348,7 +351,7 @@ void printGridInfo(int vlistID)
 	      fprintf(stdout, "size      : dim = %d  nx = %d  ny = %d\n", gridsize, xsize, ysize);
 	      if ( gridIsCircular(gridID) )
 		{
-		  fprintf(stdout, "%*s", nbyte0, "");	  
+		  fprintf(stdout, "%*s", nbyte0, "");
 		  fprintf(stdout, "longitude :  circular\n");
 		}
 	    }

--- a/cdi.settings.in
+++ b/cdi.settings.in
@@ -25,30 +25,31 @@
  "extra"          : "@ENABLE_EXTRA@",
  "ieg"            : "@ENABLE_IEG@",
  "threads"    : {
-    "lib"      : "@THREADS_LDFLAGS@",
+    "lib"      : "@THREADS_LIBS@",
    "include"  : "@THREADS_INCLUDE@"
  },
  "zlib"     : {
-    "lib"      : "@ZLIB_LDFLAGS@",
+    "lib"      : "@ZLIB_LIBS@",
+    "include"  : "@ZLIB_INCLUDE@",
  },
  "szlib"    : {
-    "lib"      : "@SZLIB_LDFLAGS@",
+    "lib"      : "@SZLIB_LIBS@",
    "include"  : "@SZLIB_INCLUDE@"
  },
  "hdf5"     : {
-    "lib"      : "@HDF5_LDFLAGS@",
+    "lib"      : "@HDF5_LIBS@",
    "include"  : "@HDF5_INCLUDE@"
  },
  "netcdf"   : {
-    "lib"      : "@NETCDF_LDFLAGS@",
+    "lib"      : "@NETCDF_LIBS@",
    "include"  : "@NETCDF_INCLUDE@"
  },
  "grip_api" : {
-    "lib"      : "@GRIB_API_LDFLAGS@",
+    "lib"      : "@GRIB_API_LIBS@",
    "include"  : "@GRIB_API_INCLUDE@"
  },
  "jasper" : {
-    "lib"      : "@JASPER_LDFLAGS@"
+    "lib"      : "@JASPER_LIBS@"
  },
  "enable_python" : @ENABLE_PYTHON@,
  "enable_ruby"   : @ENABLE_RUBY@,

--- a/config/default
+++ b/config/default
@@ -12,6 +12,17 @@ set -x
 #
 case "${HOSTNAME}" in
 # i386-apple-darwin10
+    bailung*)
+	./configure --prefix=$HOME/local \
+                    --enable-maintainer-mode \
+                    --enable-swig \
+                    --enable-python \
+                    --with-jasper=$HOME/local \
+                    --with-grib_api=$HOME/local \
+                    --with-netcdf=$HOME/local \
+                    --with-szlib=$HOME/local \
+	            CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -Df2cFortran"
+	;;
    hama*)
 	./configure --prefix=$HOME/local \
                    --enable-maintainer-mode \
@@ -46,10 +57,15 @@ case "${HOSTNAME}" in
 	            CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic"
 	;;
    thingol)
-	./configure --prefix=$HOME/local/ \
-	            --with-netcdf=$HOME/src/cdo/branches/libs4cdo/build-split/netcdf-4.1.1 \
-	              --with-hdf5=$HOME/src/cdo/branches/libs4cdo/build-split/hdf5-1.8.4 \
-	            CC=gcc CFLAGS="-g -O2 -Wall"
+      ./configure --prefix=`pwd`/build \
+	            --with-netcdf=$HOME/local/libs4cdo-0.0.8 \
+	              --with-hdf5=$HOME/local/libs4cdo-0.0.8 \
+                     --with-szlib=$HOME/local/libs4cdo-0.0.8 \
+                      --with-proj=$HOME/local/libs4cdo-0.0.8 \
+                  --with-grib_api=$HOME/local/libs4cdo-0.0.8 \
+                    --with-jasper=$HOME/local/libs4cdo-0.0.8 \
+                      --with-pic \
+                      CC=gcc CFLAGS="-g -O2 -Wall" LIBS=-lopenjpeg
 	;;
 # sparc-sun-solaris2.9
    executor | yang | yin)
@@ -84,12 +100,15 @@ case "${HOSTNAME}" in
 	;;
 # powerpc-ibm-aix6.1.0.0
    blizzard*)
-        ./configure --prefix=$HOME/local \
+        CONFIG_SHELL=/bin/bash /bin/bash \
+                    ./configure --prefix=$HOME/local \
                    --with-netcdf=/sw/aix61/netcdf-4.1.1-rc2 \
                    --with-hdf5=/sw/aix61/hdf5-1.8.4-patch1-threadsafe \
-                    --with-zlib=/sw/aix53/zlib-1.2.3 --with-szlib=/sw/aix53/szip-2.1 \
-                    AR="ar -X 64" LDFLAGS="-brtl" FC=xlf_r\
-                    CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qarch=auto -qtune=auto -DHAVE_MMAP -Dextname"
+                    --with-zlib=/sw/aix53/zlib-1.2.3 \
+                    --with-szlib=/sw/aix53/szip-2.1 \
+                    AR="ar -X 64" LDFLAGS="-brtl" FC=xlf_r CC=xlc_r \
+                    CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -DHAVE_MMAP -Dextname" \
+                    SHELL=/bin/bash
        ;;
    *)
 	echo "configuration for hostname $HOSTNAME not found!"

--- a/configure
+++ b/configure
--- a/configure.ac
+++ b/configure.ac
 #  Process this file with autoconf to produce a configure script.

-AC_INIT([cdi], [1.5.1], [http://code.zmaw.de/projects/cdi])
+AC_INIT([cdi], [1.5.2], [http://code.zmaw.de/projects/cdi])

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

@@ -38,6 +38,11 @@ LT_INIT([pic-only])
 AC_CHECK_TOOL([CC],[gcc],[:])
 AC_PROG_CC_C99
 AC_PROG_FC
+AS_IF([test -n "$FC" && test "X$FC" != "Xno"],
+  [AC_FC_SRCEXT([f90])
+   AC_LANG_PUSH([Fortran])
+   AC_PROG_FPP
+   AC_LANG_POP([Fortran])])
 AC_PROG_F77
 AC_PROG_RANLIB
 AC_PROG_CXX
@@ -119,7 +124,16 @@ AC_ARG_ENABLE(iso-c-interface,
                             [Create Fortran Interface via iso_c_bindings facility of F2003 [default=no]]).
              ,enable_isoc=${enableval},enable_isoc=no)
 AM_CONDITIONAL([CREATE_ISOC],[test $enable_isoc = 'yes'])
-AS_IF([test "x${enable_isoc}" != "xyes"],[AC_SUBST([FC],$F77)])
+# in case the Fortran interface uses the more modern F90-style interface,
+# the FCFLAGS for users of the library have to include a switch to use the
+# .mod file
+CDI_F90_INTERFACE_FCFLAGS=''
+AS_IF([test "x${enable_isoc}" = "xyes"],
+  [AC_LANG_PUSH([Fortran])
+   ACX_SL_FC_CHECK_MOD_PATH_FLAG
+   AC_LANG_POP([Fortran])
+   CDI_F90_INTERFACE_FCFLAGS="${FC_MOD_FLAG}${includedir}"])
+AC_SUBST([CDI_F90_INTERFACE_FCFLAGS])
 #  Check the module extension of the fortran compiler
 ACX_SL_FC_MOD_SUFFIX(,[FCMODEXT=mod])
 # -----------------------------------------------------------------------
@@ -152,7 +166,7 @@ AC_ARG_ENABLE(ruby,
 AM_CONDITIONAL(ENABLE_RUBY,[test "x$enable_ruby" != "xno"])
 AS_IF([test "x$enable_ruby" != "xno"],[AC_SUBST([ENABLE_RUBY],[true])],[AC_SUBST([ENABLE_RUBY],[false])])
 #  ----------------------------------------------------------------------
-#  Create the Ruby Interface via swig
+#  Create the Python Interface via swig
 AC_ARG_ENABLE(python,
  [AS_HELP_STRING([--enable-python],[python language bindings [default=no] (EXPERIMENTAL)])],
  [AC_CHECK_PROG(PYTHON,python,python)
@@ -183,7 +197,7 @@ AC_SUBST([CPPFLAGS])

 AC_OUTPUT([Makefile src/Makefile interfaces/Makefile app/Makefile \
 	tests/Makefile examples/Makefile cdi.settings \
-	pioExamples/Makefile])
+	pioExamples/Makefile src/pkgconfig/cdi.pc])

 #  ----------------------------------------------------------------------
 #  Show configuration

--- a/doc/tex/cdi_cman.tex
+++ b/doc/tex/cdi_cman.tex
@@ -135,7 +135,7 @@
 \end{picture}

 \begin{flushright}
-\large\bf{Climate Data Interface \\ Version 1.5.1 \\ June 2011}
+\large\bf{Climate Data Interface \\ Version 1.5.2 \\ August 2011}
 \end{flushright}

 \vfill

--- a/doc/tex/cdi_fman.tex
+++ b/doc/tex/cdi_fman.tex
@@ -132,7 +132,7 @@
 \end{picture}

 \begin{flushright}
-\large\bf{Climate Data Interface \\ Version 1.5.1 \\ June 2011}
+\large\bf{Climate Data Interface \\ Version 1.5.2 \\ August 2011}
 \end{flushright}

 \vfill

--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,7 +8,7 @@ if CREATE_ISOC
 endif
 #
 AM_CPPFLAGS             = -I$(top_srcdir)/src
-AM_FCFLAGS              = $(AM_CPPFLAGS)
+AM_FCFLAGS              = $(FPP_INCOPT)$(top_srcdir)/src $(FC_MOD_FLAG)../src
 #
 cdi_write_SOURCES       = cdi_write.c
 cdi_write_LDADD         = $(top_builddir)/src/libcdi.la

--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -40,12 +40,18 @@ noinst_PROGRAMS = cdi_write$(EXEEXT) cdi_read$(EXEEXT) \
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/m4/acx_assert_lang_is_fortran_variant.m4 \
+	$(top_srcdir)/m4/acx_lang_other_suffix_conftest.m4 \
+	$(top_srcdir)/m4/acx_options.m4 \
+	$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
 	$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/asx_unset.m4 $(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/starlink_fpp.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -126,6 +132,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CDI_F90_INTERFACE_FCFLAGS = @CDI_F90_INTERFACE_FCFLAGS@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -155,22 +162,29 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
+FCFLAGS_f90 = @FCFLAGS_f90@
 FCMODCASE = @FCMODCASE@
 FCMODEXT = @FCMODEXT@
+FC_MOD_FLAG = @FC_MOD_FLAG@
 FFLAGS = @FFLAGS@
 FGREP = @FGREP@
+FPP = @FPP@
+FPPFLAGS = @FPPFLAGS@