From 66449ee44dc2f36b725bab3b5a0887b16c648c35 Mon Sep 17 00:00:00 2001
From: Marc Howison <mhowison@lbl.gov>
Date: Tue, 1 Feb 2011 16:36:00 +0000
Subject: [PATCH] fixed mismatched function names and uncorrected indices in
 Fortran API; incorporated bug report for Fortran test

---
 configure-crayxt | 12 +++++++-----
 src/H5BlockF.c   |  8 ++++----
 src/H5PartF.c    |  2 +-
 test/testf.F90   | 10 +++++-----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/configure-crayxt b/configure-crayxt
index ebf9f46..16a4930 100755
--- a/configure-crayxt
+++ b/configure-crayxt
@@ -1,18 +1,20 @@
 #!/bin/sh
 
+F90=gfortran
+
  ./configure \
         $@ \
         --enable-parallel \
         --enable-fortran \
         --enable-tools \
-        CC=cc CXX=CC FC=pgf90 \
+        CC=cc CXX=CC FC=$F90 \
         MPICC=cc MPICXX=CC MPIFC=ftn
-sed -e 's/pgf90/ftn/g' <Makefile > newMakefile
+sed -e 's/$F90/ftn/g' <Makefile > newMakefile
 mv newMakefile Makefile
-sed -e 's/pgf90/ftn/g' <src/Makefile > newMakefile
+sed -e 's/$F90/ftn/g' <src/Makefile > newMakefile
 mv newMakefile src/Makefile
-sed -e 's/pgf90/ftn/g' <test/Makefile > newMakefile
+sed -e 's/$F90/ftn/g' <test/Makefile > newMakefile
 mv newMakefile test/Makefile
-sed -e 's/pgf90/ftn/g' <tools/Makefile > newMakefile
+sed -e 's/$F90/ftn/g' <tools/Makefile > newMakefile
 mv newMakefile tools/Makefile
 
diff --git a/src/H5BlockF.c b/src/H5BlockF.c
index f583252..33ee255 100755
--- a/src/H5BlockF.c
+++ b/src/H5BlockF.c
@@ -365,7 +365,7 @@ h5bl_has_fielddata (
 }
 
 h5part_int64_t
-h5b_3d_get_field_spacing (
+h5bl_3d_get_field_spacing (
 	h5part_int64_t *f,
 	const char *field_name,
 	h5part_float64_t *x,
@@ -386,7 +386,7 @@ h5b_3d_get_field_spacing (
 }
 
 h5part_int64_t
-h5b_3d_set_field_spacing (
+h5bl_3d_set_field_spacing (
 	h5part_int64_t *f,
 	const char *field_name,
 	const h5part_float64_t *x,
@@ -407,7 +407,7 @@ h5b_3d_set_field_spacing (
 }
 
 h5part_int64_t
-h5b_3d_get_field_origin (
+h5bl_3d_get_field_origin (
 	h5part_int64_t *f,
 	const char *field_name,
 	h5part_float64_t *x,
@@ -428,7 +428,7 @@ h5b_3d_get_field_origin (
 }
 
 h5part_int64_t
-h5b_3d_set_field_origin (
+h5bl_3d_set_field_origin (
 	h5part_int64_t *f,
 	const char *field_name,
 	const h5part_float64_t *x,
diff --git a/src/H5PartF.c b/src/H5PartF.c
index 2e7a32e..dca2d84 100755
--- a/src/H5PartF.c
+++ b/src/H5PartF.c
@@ -623,7 +623,7 @@ h5pt_setview (
 
 	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
 
-	return H5PartSetView ( filehandle, *start, *end );
+	return H5PartSetView ( filehandle, (*start)-1, (*end)-1 );
 }
 
 h5part_int64_t
diff --git a/test/testf.F90 b/test/testf.F90
index ee0c4ab..3169963 100644
--- a/test/testf.F90
+++ b/test/testf.F90
@@ -7,9 +7,9 @@ program H5PartTest
   include 'H5PartF.h'
 
 #ifdef PARALLEL_IO
-  integer :: comm, ierr, i
-  integer*8 :: file_id, status, npoints
+  integer :: comm, ierr
 #endif
+  integer*8 :: file_id, status, npoints, i
   real*8, allocatable :: x(:),y(:),z(:),px(:),py(:),pz(:)
   integer*8, allocatable :: id(:)
 
@@ -18,10 +18,10 @@ program H5PartTest
   comm = MPI_COMM_WORLD
 #endif
 
-  ! this enables level 3 ("info") messages to be
+  ! this enables level 4 ("debug") messages to be
   ! printed by the H5Part library
-  ! (3_8 is the literal for an integer*8 with value 3)
-  status = h5pt_set_verbosity_level (3_8)
+  ! (4_8 is the literal for an integer*8 with value 4)
+  status = h5pt_set_verbosity_level (4_8)
 
   ! open the a file called 'test.h5' in parallel for writing
 #ifdef PARALLEL_IO