Commit 369f3002 authored by Deike Kleberg's avatar Deike Kleberg
Browse files

Rename PIO_WRITER

parent 9651866e
......@@ -108,7 +108,7 @@ int main (int argc, char *argv[])
//IOMode = PIO_MPI,
//IOMode = PIO_FPGUARD,
IOMode = PIO_ASYNCH,
//IOMode = PIO_POSIX,
//IOMode = PIO_WRITER,
nNamespaces = 1 };
static int hasLocalFile[nNamespaces] = { 0 };
......
......@@ -18,7 +18,7 @@ PROGRAM COLLECTDATA2003
PARAMETER ( nProcsIO = 3 )
!PARAMETER ( IOMode = PIO_NONE )
!PARAMETER ( IOMode = PIO_MPI )
!PARAMETER ( IOMode = PIO_POSIX )
!PARAMETER ( IOMode = PIO_WRITER )
!PARAMETER ( IOMode = PIO_ASYNCH )
PARAMETER ( IOMode = PIO_FPGUARD )
PARAMETER ( nNamespaces = 1 )
......
......@@ -166,7 +166,7 @@ PROGRAM CDIWRITE
CHARACTER*(*), PARAMETER :: PTYPENAMES ( 7 ) = (/ &
'PIO_NONE ', &
'PIO_MPI ', &
'PIO_POSIX ', &
'PIO_WRITER ', &
'PIO_ASYNCH ', &
'PIO_FPGUARD ', &
'PIO_POSIX_FPGUARD_THREAD_REFUSE', &
......
......@@ -192,17 +192,17 @@ extern "C" {
#define CALENDAR_366DAYS 4
#define CALENDAR_NONE 5
/* IOMode types */
/* parallel IO IOMode */
#define PIO_NONE 0
#define PIO_MPI 1
#define PIO_POSIX 2
#define PIO_WRITER 2
#define PIO_ASYNCH 3
#define PIO_FPGUARD 4
#define PIO_MINIOMODE PIO_NONE
#define PIO_MAXIOMODE PIO_FPGUARD
#define PIO_MINIOMODEWITHSPECIALPROCS PIO_POSIX
#define PIO_MINIOMODEWITHSPECIALPROCS PIO_WRITER
/* parallel IO routines */
......@@ -215,7 +215,6 @@ int pioInqVarDecoChunk ( int, int );
int pioInqVarDecoOff ( int, int );
void pioNamespaceSetActive ( int );
/* CDI control routines */
char *cdiStringError(int cdiErrno);
......
......@@ -81,7 +81,7 @@ size_t pioFileWrite ( int fileID, int tsID, const void *buffer, size_t len )
case PIO_FPGUARD:
iret = fwPOSIXFPGUARDSENDRECV ( fileID, tsID, buffer, len );
break;
case PIO_POSIX:
case PIO_WRITER:
iret = fwPOSIXNONB ( fileID, tsID, buffer, len );
break;
}
......@@ -107,7 +107,7 @@ int pioFileClose ( int id )
case PIO_FPGUARD:
iret = fcPOSIXFPGUARDSENDRECV ( id );
break;
case PIO_POSIX:
case PIO_WRITER:
iret = fcPOSIXNONB ( id );
break;
}
......@@ -134,7 +134,7 @@ int pioFileOpenW ( const char *filename )
case PIO_FPGUARD:
iret = fowPOSIXFPGUARDSENDRECV ( filename );
break;
case PIO_POSIX:
case PIO_WRITER:
iret = fowPOSIXNONB ( filename );
break;
}
......@@ -171,7 +171,7 @@ void backendInit ( void )
case PIO_FPGUARD:
initPOSIXFPGUARDSENDRECV ();
break;
case PIO_POSIX:
case PIO_WRITER:
initPOSIXNONB ();
break;
}
......@@ -195,7 +195,7 @@ void backendCleanup ( void )
case PIO_FPGUARD:
finalizePOSIXFPGUARDSENDRECV ();
break;
case PIO_POSIX:
case PIO_WRITER:
finalizePOSIXNONB ();
break;
default:
......
......@@ -889,11 +889,11 @@ void pioWriteTimestep ( int tsID, int vdate, int vtime )
int nProcsColl = commInqNProcsColl ();
int nProcsModel = commInqNProcsModel ();
xassert ( tsID >= 0 &&
vdate >= 0 &&
vtime >= 0 &&
winPostSet != NULL &&
win != NULL );
xassert ( tsID >= 0 &&
vdate >= 0 &&
vtime >= 0 &&
winPostSet != NULL &&
win != NULL );
buffer[0] = tsID;
buffer[1] = vdate;
......
Markdown is supported
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