Commit 5b2dbdfd authored by Deike Kleberg's avatar Deike Kleberg
Browse files

interim 4

parent 9a2322e8
...@@ -24,10 +24,10 @@ static int nlev[nVars] = {1,1,5,5,2}; ...@@ -24,10 +24,10 @@ static int nlev[nVars] = {1,1,5,5,2};
#define ntsteps 3 #define ntsteps 3
//int IOMode = PIO_NONE; //int IOMode = PIO_NONE;
//int IOMode = PIO_MPI_NONB; int IOMode = PIO_MPI_NONB;
//int IOMode = PIO_POSIX_FPGUARD_SENDRECV; //int IOMode = PIO_POSIX_FPGUARD_SENDRECV;
//int IOMode = PIO_POSIX_ASYNCH; //int IOMode = PIO_POSIX_ASYNCH;
int IOMode = PIO_POSIX_NONB; //int IOMode = PIO_POSIX_NONB;
void modelRun () void modelRun ()
{ {
......
...@@ -5,13 +5,6 @@ ...@@ -5,13 +5,6 @@
#ifdef USE_MPI #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 "pio.h"
#include "cdi.h" #include "cdi.h"
#include "pio_comm.h" #include "pio_comm.h"
...@@ -28,8 +21,6 @@ long initial_buffersize = 16 * 1024 * 1024; ...@@ -28,8 +21,6 @@ long initial_buffersize = 16 * 1024 * 1024;
/* 16 * 1024; */ /* 16 * 1024; */
/* 4 * 1024; */ /* 4 * 1024; */
int maxPtype = 4;
int maxNnodes = 249;
int tagKey = 100; int tagKey = 100;
int maxErrorString = 100; int maxErrorString = 100;
......
...@@ -54,11 +54,10 @@ static aFiledataM *initAFiledataMPINONB ( const char *filename, size_t bs ) ...@@ -54,11 +54,10 @@ static aFiledataM *initAFiledataMPINONB ( const char *filename, size_t bs )
xdebug ( "IOPE%d: filename=%s, buffersize=%zu, in", xdebug ( "IOPE%d: filename=%s, buffersize=%zu, in",
rankNode, filename, bs ); rankNode, filename, bs );
of = ( aFiledataM * ) xmalloc ( sizeof ( aFiledataM )); of = xmalloc ( sizeof ( of[0] ));
memset ( of, 0, sizeof ( aFiledataM ));
len = strlen ( filename ); len = strlen ( filename );
of->name = ( char * ) xmalloc (( len ) * sizeof ( char )); of->name = xmalloc (( len ) * sizeof ( of->name[0] ));
strcpy ( of->name, filename ); strcpy ( of->name, filename );
of->size = bs; of->size = bs;
...@@ -315,8 +314,6 @@ void queueCheck ( queue_t *q, const char *name ) ...@@ -315,8 +314,6 @@ void queueCheck ( queue_t *q, const char *name )
curr = curr->next; curr = curr->next;
} }
return;
} }
// //
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment