Fixed the usual datatype problems on T3E.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOPanda/trunk@13 38c3d835-c875-442e-b0fe-21c19ce1d001

1 files changed, 4 insertions, 16 deletions

diff --git a/src/Panda/Simple_IO.C b/src/Panda/Simple_IO.C
index 54998eb..b2ffb50 100644
--- a/src/Panda/Simple_IO.C
+++ b/src/Panda/Simple_IO.C
@@ -12,16 +12,6 @@
 extern MPIFS* MPIFS_global_obj;
 extern int SUBCHUNK_SIZE;
 
-extern "C" {
-  int IOreserveChunk(IOFile,int,int,int*);
-  int IOwriteStream(IOFile,void*,int);
-  int IOreadStream(IOFile,void*,int);
-  int IOwriteAttribute(IOFile, char *, int, int, void *);
-  int IOreadInfo(IOFile,int *,int *,int *,int);
-  int IOreadAttributeInfo(IOFile, char *,int *, int *);
-  int IOreadAttribute(IOFile,int,void*);
-}
-
 /* This constructor is needed by the compute node to create a dummy object.
  * The dummy object is needed so that the compute node can execute the 
  * specialized compute node io loop
@@ -231,7 +221,7 @@ void Simple_IO::compute_schemas(Array *array, Chunk *subchunk ,
  * overlap_base, overlap_size, overlap_stride, array_rank_       */
 void Simple_IO::send_schema_message(int index)
 {
-   int *ptr = schema_bufs_[index];
+   int i, *ptr = schema_bufs_[index];
    int schema_size = 5+array_rank_*3;
 
    *ptr++ = overlap_chunk_ids_[index];
@@ -240,7 +230,7 @@ void Simple_IO::send_schema_message(int index)
    *ptr++ = array_rank_;
    *ptr++ = op_type_;
 
-   for(int i=0; i < array_rank_; i++) *ptr++ = overlap_base_[i];
+   for(i=0; i < array_rank_; i++) *ptr++ = overlap_base_[i];
    for(i=0; i < array_rank_; i++) *ptr++ = overlap_size_[i];
    for(i=0; i < array_rank_; i++) *ptr++ = overlap_stride_[i];
 
@@ -486,7 +476,8 @@ void Simple_IO::start_to_finish(Boolean part_time, Array *compute_array)
   compute_node_array_ = compute_array;
 
   if (read_op) {
-    int numbertype, rank, index, datatype, length;
+    int numbertype, rank, index, datatype;
+    Long length;
     int *dims = (int *)malloc(sizeof(int) * 10);
     IOreadInfo(file_ptr_, &numbertype, &rank, dims, 10);
     int *size = (int *)malloc(sizeof(int) * rank);
@@ -498,9 +489,6 @@ void Simple_IO::start_to_finish(Boolean part_time, Array *compute_array)
     } else { printf("Error: no attribute, global_size\n"); exit(0); }
     free(dims);
 
-printf("%d: read rank %d, numbertype %d, size (%d %d %d)\n", world_rank_,
-	rank, numbertype, size[0], size[1], size[2]);
-
     int schema_size = 2 + rank;
     int *schema = (int *)malloc(sizeof(int) * schema_size);
     if (MPIFS_global_obj->am_master_io_node()) {