interim 4

pioExamples/collectData.c

@@ -24,10 +24,10 @@ static int nlev[nVars] = {1,1,5,5,2};
 #define ntsteps  3 
 
 //int IOMode = PIO_NONE;
-//int IOMode = PIO_MPI_NONB;
+int IOMode = PIO_MPI_NONB;
 //int IOMode = PIO_POSIX_FPGUARD_SENDRECV;
 //int IOMode = PIO_POSIX_ASYNCH;
-int IOMode = PIO_POSIX_NONB;
+//int IOMode = PIO_POSIX_NONB;
 
 void modelRun ()
 {

src/pio.c

@@ -5,13 +5,6 @@
 
 #ifdef USE_MPI
 
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
 #include "pio.h"
 #include "cdi.h"
 #include "pio_comm.h"
@@ -28,8 +21,6 @@ long initial_buffersize = 16 * 1024 * 1024;
 /* 16 * 1024; */
 /* 4 * 1024; */
 
-int maxPtype = 4;
-int maxNnodes  = 249;
 int tagKey = 100;
 int maxErrorString = 100;
 

src/pio_mpinonb.c

@@ -54,11 +54,10 @@ static aFiledataM *initAFiledataMPINONB ( const char *filename, size_t bs )
   xdebug ( "IOPE%d: filename=%s, buffersize=%zu, in",
            rankNode, filename, bs );
 
-  of = ( aFiledataM * ) xmalloc ( sizeof ( aFiledataM ));
-  memset ( of, 0, sizeof ( aFiledataM ));
+  of = xmalloc ( sizeof ( of[0] ));
 
   len = strlen ( filename );
-  of->name = ( char * ) xmalloc (( len ) * sizeof ( char ));
+  of->name = xmalloc (( len ) * sizeof ( of->name[0] ));
   strcpy ( of->name, filename );
   of->size = bs;
 
@@ -315,8 +314,6 @@ void queueCheck ( queue_t *q, const char *name )
       
       curr = curr->next;
     }  
-
-  return;
 }
 //