Commit 03a395ea authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed streamXXX() to pstreamXXX().

parent 2861ddb5
......@@ -20,6 +20,9 @@
#include "cdo.h"
#include "cdo_int.h"
#include "pstream_write.h"
#define streamOpenWrite pstreamOpenWrite
#define streamDefVlist pstreamDefVlist
#define streamDefTimestep pstreamDefTimestep
#endif
#if defined(AFTERBURNER)
......@@ -2075,7 +2078,7 @@ void after_processing(struct Control *globs, struct Variable *vars)
{
int i;
//#if defined(_PSTREAM_H)
//#if defined(PSTREAM_H)
// globs->istreamID = streamOpenRead(cdoStreamName(0));
//#else
globs->istreamID = streamOpenRead(ifile);
......@@ -2089,7 +2092,7 @@ void after_processing(struct Control *globs, struct Variable *vars)
if ( globs->Mean != 2 )
{
#if defined(_PSTREAM_WRITE_H)
#if defined(PSTREAM_WRITE_H)
globs->ostreamID = streamOpenWrite(cdoStreamName(ofileidx), ofiletype);
#else
globs->ostreamID = streamOpenWrite(ofile, ofiletype);
......@@ -2229,7 +2232,7 @@ void after_processing(struct Control *globs, struct Variable *vars)
after_control(globs, vars);
#if defined(_PSTREAM_WRITE_H)
#if defined(PSTREAM_WRITE_H)
if ( globs->ostreamID != CDI_UNDEFID ) pstreamClose(globs->ostreamID);
#else
if ( globs->ostreamID2 != CDI_UNDEFID ) streamClose(globs->ostreamID2);
......
......@@ -644,7 +644,7 @@ struct mapping
static struct mapping *construct_var_mapping(int streamID)
{
int nvars_max = vlistNvars(streamInqVlist(streamID));
int nvars_max = vlistNvars(pstreamInqVlist(streamID));
struct mapping *vars =
(struct mapping *) Malloc((nvars_max + 1) * sizeof(struct mapping));
vars[0].cdi_varID = CDI_UNDEFID;
......
......@@ -442,7 +442,7 @@ void *CMOR_lite(void *argument)
}
int vlistIDx = vlistCreate();
vlistCopyFlag(vlistIDx, vlistID2);
cdoVlistCopyFlag(vlistIDx, vlistID2);
vlistDestroy(vlistID2);
......
......@@ -410,7 +410,7 @@ void *Collgrid(void *argument)
}
int vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
/*
if ( cdoVerbose )
{
......
......@@ -161,7 +161,7 @@ void *Comp(void *argument)
vlistDefTaxis(vlistID3, taxisID3);
int streamID3 = pstreamOpenWrite(cdoStreamName(2), cdoFiletype());
streamDefVlist(streamID3, vlistID3);
pstreamDefVlist(streamID3, vlistID3);
int tsID = 0;
while ( (nrecs = pstreamInqTimestep(streamIDx1, tsID)) )
......
......@@ -246,7 +246,7 @@ void *Ensval(void *argument)
{
for ( fileID = 0; fileID < nfiles; fileID++ )
{
streamInqRecord(fileID, &varID, &levelID);
pstreamInqRecord(fileID, &varID, &levelID);
if ( fileID == 0 )
{
......
......@@ -341,7 +341,7 @@ void *Expr(void *argument)
vlistDefFlag(vlistID1, varID, levID, TRUE);
}
}
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
}
for ( int pidx = 0; pidx < parse_arg.nparams; pidx++ )
......
......@@ -146,7 +146,7 @@ void *MapReduce(void *argument)
}
}
int vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
/* }}} */
int taxisID1 = vlistInqTaxis(vlistID1);
......
......@@ -290,13 +290,13 @@ void *Mrotuv(void *argument)
vlistClearFlag(vlistID1);
for ( int lid = 0; lid < nlevs; lid++ ) vlistDefFlag(vlistID1, uid, lid, TRUE);
int vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistChangeVarGrid(vlistID2, 0, gridIDu);
vlistClearFlag(vlistID1);
for ( int lid = 0; lid < nlevs; lid++ ) vlistDefFlag(vlistID1, vid, lid, TRUE);
int vlistID3 = vlistCreate();
vlistCopyFlag(vlistID3, vlistID1);
cdoVlistCopyFlag(vlistID3, vlistID1);
vlistChangeVarGrid(vlistID3, 0, gridIDv);
int taxisID1 = vlistInqTaxis(vlistID1);
......
......@@ -428,7 +428,7 @@ void *Select(void *argument)
//if ( cdoVerbose ) vlistPrint(vlistID0);
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID0);
cdoVlistCopyFlag(vlistID2, vlistID0);
//if ( cdoVerbose ) vlistPrint(vlistID2);
......
......@@ -326,7 +326,7 @@ void *Selmulti(void *argument)
if ( cdoDebugExt ) cdoPrint(" Writing the selected fields ...");
int vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
nvars = vlistNvars(vlistID2);
for ( varID = 0; varID < nvars; ++varID )
......
......@@ -89,7 +89,7 @@ void *Seloperator(void *argument)
cdoWarning("Code %d, ltype %d, level %g not found!", scode, sltype, slevel);
int vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
int taxisID1 = vlistInqTaxis(vlistID1);
int taxisID2 = taxisDuplicate(taxisID1);
......
......@@ -285,7 +285,7 @@ void *Selvar(void *argument)
if ( npar == 0 ) cdoAbort("No variables selected!");
int vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
nvars = vlistNvars(vlistID2);
for ( varID = 0; varID < nvars; ++varID )
......
......@@ -437,7 +437,7 @@ void *Setpartab(void *argument)
}
int vlistIDx = vlistCreate();
vlistCopyFlag(vlistIDx, vlistID2);
cdoVlistCopyFlag(vlistIDx, vlistID2);
vlistDestroy(vlistID2);
......
......@@ -141,7 +141,7 @@ void *Split(void *argument)
}
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistIDs[index] = vlistID2;
if ( codes[index] > 9999 )
......@@ -206,7 +206,7 @@ void *Split(void *argument)
}
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistIDs[index] = vlistID2;
cdiParamToString(params[index], paramstr, sizeof(paramstr));
......@@ -259,7 +259,7 @@ void *Split(void *argument)
}
}
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistIDs[index] = vlistID2;
sprintf(filename+nchars, "%03d", tabnums[index]);
......@@ -290,7 +290,7 @@ void *Split(void *argument)
}
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistIDs[index] = vlistID2;
filename[nchars] = '\0';
......@@ -346,7 +346,7 @@ void *Split(void *argument)
}
}
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistIDs[index] = vlistID2;
sprintf(filename+nchars, "%06g", levels[index]);
......@@ -386,7 +386,7 @@ void *Split(void *argument)
}
}
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistIDs[index] = vlistID2;
sprintf(filename+nchars, "%02d", vlistGridIndex(vlistID1, gridIDs[index])+1);
......@@ -424,7 +424,7 @@ void *Split(void *argument)
}
}
vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
vlistIDs[index] = vlistID2;
sprintf(filename+nchars, "%02d", vlistZaxisIndex(vlistID1, zaxisIDs[index])+1);
......
......@@ -76,7 +76,7 @@ void *Splitrec(void *argument)
vlistDefFlag(vlistID1, varID, levelID, TRUE);
int vlistID2 = vlistCreate();
vlistCopyFlag(vlistID2, vlistID1);
cdoVlistCopyFlag(vlistID2, vlistID1);
index++;
sprintf(filename+nchars, "%06d", index);
......
......@@ -76,7 +76,7 @@ void *Subtrend(void *argument)
}
tsID = 0;
nrecs = streamInqTimestep(streamID3, tsID);
nrecs = pstreamInqTimestep(streamID3, tsID);
for ( int recID = 0; recID < nrecs; recID++ )
{
......
......@@ -245,7 +245,7 @@ void *Timstat2(void *argument)
tsID = 0;
taxisDefVdate(taxisID3, vdate);
taxisDefVtime(taxisID3, vtime);
streamDefTimestep(streamID3, tsID);
pstreamDefTimestep(streamID3, tsID);
for ( int recID = 0; recID < nrecs3; recID++ )
{
......
......@@ -109,7 +109,7 @@ void *Trms(void *argument)
if ( pvarID == -1 ) cdoAbort("pressure variable missing!");
int vlistID3 = vlistCreate();
vlistCopyFlag(vlistID3, vlistID1);
cdoVlistCopyFlag(vlistID3, vlistID1);
int taxisID1 = vlistInqTaxis(vlistID1);
int taxisID3 = taxisDuplicate(taxisID1);
......
......@@ -65,7 +65,7 @@ void *Varrms(void *argument)
vlistDefFlag(vlistID1, varID, 0, TRUE);
int vlistID3 = vlistCreate();
vlistCopyFlag(vlistID3, vlistID1);
cdoVlistCopyFlag(vlistID3, vlistID1);
int taxisID1 = vlistInqTaxis(vlistID1);
int taxisID3 = taxisDuplicate(taxisID1);
......
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