Commit edf860e6 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

removed function cdoStreamName

parent fcb59520
......@@ -165,7 +165,7 @@ Adisit(void *process)
const double pin = (operatorArgc() == 1) ? parameter2double(operatorArgv()[0]) : -1;
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int nvars = vlistNvars(vlistID1);
......@@ -277,7 +277,7 @@ Adisit(void *process)
const int taxisID2 = taxisDuplicate(taxisID1);
vlistDefTaxis(vlistID2, taxisID2);
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
int tsID = 0;
......
......@@ -1773,7 +1773,7 @@ after_processing(struct Control *globs, struct Variable *vars)
int i;
//#if defined(PSTREAM_H)
// globs->istreamID = streamOpenReadLocked(cdoStreamName(0));
// globs->istreamID = streamOpenReadLocked(0);
//#else
globs->istreamID = streamOpenReadLocked(ifile);
//#endif
......@@ -1785,7 +1785,7 @@ after_processing(struct Control *globs, struct Variable *vars)
if (globs->Mean != 2)
{
globs->ostreamID = cdoStreamOpenWrite(cdoStreamName(ofileidx), ofiletype);
globs->ostreamID = cdoStreamOpenWrite((ofileidx), ofiletype);
if (globs->Szip) streamDefCompType(globs->ostreamID, CDI_COMPRESS_SZIP);
......
......@@ -95,7 +95,7 @@ Arithc(void *process)
rconstcplx[1] = 0;
if (operatorArgc() == 2) rconstcplx[1] = parameter2double(operatorArgv()[1]);
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int vlistID2 = vlistDuplicate(vlistID1);
......@@ -107,7 +107,7 @@ Arithc(void *process)
const int taxisID2 = taxisDuplicate(taxisID1);
vlistDefTaxis(vlistID2, taxisID2);
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
const size_t nwpv = (vlistNumber(vlistID1) == CDI_COMP) ? 2 : 1;
......
......@@ -81,7 +81,7 @@ Arithdays(void *process)
const int operfunc = cdoOperatorF1(operatorID);
const int operfunc2 = cdoOperatorF2(operatorID);
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int vlistID2 = vlistDuplicate(vlistID1);
......@@ -92,7 +92,7 @@ Arithdays(void *process)
const int calendar = taxisInqCalendar(taxisID1);
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
const size_t gridsizemax = vlistGridsizeMax(vlistID1);
......
......@@ -47,7 +47,7 @@ Arithlat(void *process)
const int operatorID = cdoOperatorID();
const int operfunc = cdoOperatorF1(operatorID);
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int vlistID2 = vlistDuplicate(vlistID1);
......@@ -56,7 +56,7 @@ Arithlat(void *process)
const int taxisID2 = taxisDuplicate(taxisID1);
vlistDefTaxis(vlistID2, taxisID2);
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
const size_t gridsizemax = vlistGridsizeMax(vlistID1);
......
......@@ -119,7 +119,7 @@ CDIread(void *process)
data_size = 0;
nvalues = 0;
int streamID = cdoStreamOpenRead(cdoStreamName(0));
int streamID = cdoStreamOpenRead(0);
int vlistID = cdoStreamInqVlist(streamID);
filetype = cdoInqFiletype(streamID);
......
......@@ -54,7 +54,7 @@ CDItest(void *process)
int n = 0;
while (true)
{
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int taxisID1 = vlistInqTaxis(vlistID1);
......@@ -63,7 +63,7 @@ CDItest(void *process)
const int taxisID2 = taxisDuplicate(taxisID1);
vlistDefTaxis(vlistID2, taxisID2);
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
const size_t gridsize = vlistGridsizeMax(vlistID1);
......
......@@ -171,7 +171,7 @@ CDIwrite(void *process)
data_size = 0;
nvalues = 0;
int streamID = cdoStreamOpenWrite(cdoStreamName(0));
int streamID = cdoStreamOpenWrite(0);
cdoDefVlist(streamID, vlistID);
......
......@@ -5487,7 +5487,7 @@ write_variables(list_t *kvl, int *streamID, struct mapping vars[], int miptab_fr
vlistInqVarName(vlistID, vars[i].cdi_varID, charname);
cdoStreamClose(*streamID);
*streamID = cdoStreamOpenRead(cdoStreamName(0));
*streamID = cdoStreamOpenRead(0);
vlistID = cdoStreamInqVlist(*streamID);
taxisID = vlistInqTaxis(vlistID);
......@@ -6416,7 +6416,7 @@ CMOR(void *process)
miptab_freqptr);
if (Options::cdoVerbose) cdoPrint("3. Start to open infile '%s'.", cdoGetStreamName(0));
int streamID = cdoStreamOpenRead(cdoStreamName(0));
int streamID = cdoStreamOpenRead(0);
int vlistID = cdoStreamInqVlist(streamID);
if (Options::cdoVerbose) cdoPrint("3. Successfully opened infile '%s'.", cdoGetStreamName(0));
......
......@@ -353,7 +353,7 @@ CMOR_lite(void *process)
if (operatorArgc() > 2) cdoAbort("Too many arguments!");
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
int vlistID2 = vlistDuplicate(vlistID1);
......@@ -426,7 +426,7 @@ CMOR_lite(void *process)
vlistDefTaxis(vlistID2, taxisID2);
/* vlistPrint(vlistID2);*/
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
size_t gridsizemax = vlistGridsizeMax(vlistID1);
......
......@@ -59,7 +59,7 @@ Cat(void *process)
if (Options::cdoVerbose) cdoPrint("Process file: %s", cdoGetStreamName(indf));
if (Options::Timer) tw0 = timer_val(timer_cat);
const int streamID1 = cdoStreamOpenRead(cdoStreamName(indf));
const int streamID1 = cdoStreamOpenRead((indf));
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int taxisID1 = vlistInqTaxis(vlistID1);
......@@ -78,7 +78,7 @@ Cat(void *process)
const bool file_exists = !Options::cdoOverwriteMode ? fileExists(cdoGetStreamName(nfiles)) : false;
if (file_exists)
{
streamID2 = cdoStreamOpenAppend(cdoStreamName(nfiles));
streamID2 = cdoStreamOpenAppend((nfiles));
vlistID2 = cdoStreamInqVlist(streamID2);
taxisID2 = vlistInqTaxis(vlistID2);
......@@ -94,7 +94,7 @@ Cat(void *process)
{
if (Options::cdoVerbose) cdoPrint("Output file doesn't exist, creating: %s", cdoGetStreamName(nfiles));
streamID2 = cdoStreamOpenWrite(cdoStreamName(nfiles));
streamID2 = cdoStreamOpenWrite((nfiles));
vlistID2 = vlistDuplicate(vlistID1);
taxisID2 = taxisDuplicate(taxisID1);
......
......@@ -217,7 +217,7 @@ Change(void *process)
for (i = 0; i < nch; i++) chltypes[i] = parameter2int(operatorArgv()[i]);
}
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int vlistID2 = vlistDuplicate(vlistID1);
......@@ -394,7 +394,7 @@ Change(void *process)
taxisCopyTimestep(taxisID2, taxisID1);
if (streamID2 == CDI_UNDEFID)
{
streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
}
cdoDefTimestep(streamID2, tsID1);
......
......@@ -36,7 +36,7 @@ Change_e5slm(void *process)
cdoInitialize(process);
int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
int streamID1 = cdoStreamOpenRead(0);
int vlistID1 = cdoStreamInqVlist(streamID1);
int taxisID1 = vlistInqTaxis(vlistID1);
......@@ -45,7 +45,7 @@ Change_e5slm(void *process)
int taxisID2 = taxisDuplicate(taxisID1);
vlistDefTaxis(vlistID2, taxisID2);
int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
/* get filename of SLM */
......
......@@ -139,7 +139,7 @@ Cloudlayer(void *process)
nvars2 = NVARS;
}
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
......@@ -288,7 +288,7 @@ Cloudlayer(void *process)
const int taxisID2 = taxisDuplicate(taxisID1);
vlistDefTaxis(vlistID2, taxisID2);
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
int tsID = 0;
......
......@@ -370,7 +370,7 @@ Collgrid(void *process)
for (int fileID = 0; fileID < nfiles; fileID++)
{
ef[fileID].streamID = cdoStreamOpenRead(cdoStreamName(fileID));
ef[fileID].streamID = cdoStreamOpenRead((fileID));
ef[fileID].vlistID = cdoStreamInqVlist(ef[fileID].streamID);
}
......@@ -528,7 +528,7 @@ Collgrid(void *process)
}
}
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(nfiles));
const int streamID2 = cdoStreamOpenWrite((nfiles));
cdoDefVlist(streamID2, vlistID2);
std::vector<double> array2;
......
......@@ -58,8 +58,8 @@ Comp(void *process)
const int operatorID = cdoOperatorID();
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID2 = cdoStreamOpenRead(cdoStreamName(1));
const int streamID1 = cdoStreamOpenRead(0);
const int streamID2 = cdoStreamOpenRead(1);
int streamIDx1 = streamID1;
int streamIDx2 = streamID2;
......@@ -167,7 +167,7 @@ Comp(void *process)
const int taxisID3 = taxisDuplicate(taxisIDx1);
vlistDefTaxis(vlistID3, taxisID3);
const int streamID3 = cdoStreamOpenWrite(cdoStreamName(2));
const int streamID3 = cdoStreamOpenWrite(2);
cdoDefVlist(streamID3, vlistID3);
int tsID = 0;
......
......@@ -52,7 +52,7 @@ Compc(void *process)
operatorInputArg("constant value");
const double rc = parameter2double(operatorArgv()[0]);
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID1 = cdoStreamOpenRead(0);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int vlistID2 = vlistDuplicate(vlistID1);
......@@ -70,7 +70,7 @@ Compc(void *process)
std::vector<double> array1(gridsizemax);
std::vector<double> array2(gridsizemax);
const int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
const int streamID2 = cdoStreamOpenWrite(1);
cdoDefVlist(streamID2, vlistID2);
int tsID = 0;
......
......@@ -33,7 +33,7 @@ Complextorect(void *process)
int operatorID = cdoOperatorID();
int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
int streamID1 = cdoStreamOpenRead(0);
int vlistID1 = cdoStreamInqVlist(streamID1);
int vlistID2 = vlistDuplicate(vlistID1);
......@@ -54,8 +54,8 @@ Complextorect(void *process)
vlistDefTaxis(vlistID2, taxisID2);
vlistDefTaxis(vlistID3, taxisID3);
int streamID2 = cdoStreamOpenWrite(cdoStreamName(1));
int streamID3 = cdoStreamOpenWrite(cdoStreamName(2));
int streamID2 = cdoStreamOpenWrite(1);
int streamID3 = cdoStreamOpenWrite(2);
cdoDefVlist(streamID2, vlistID2);
cdoDefVlist(streamID3, vlistID3);
......
......@@ -52,8 +52,8 @@ Cond(void *process)
const int operatorID = cdoOperatorID();
const int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
const int streamID2 = cdoStreamOpenRead(cdoStreamName(1));
const int streamID1 = cdoStreamOpenRead(0);
const int streamID2 = cdoStreamOpenRead(1);
const int vlistID1 = cdoStreamInqVlist(streamID1);
const int vlistID2 = cdoStreamInqVlist(streamID2);
......@@ -83,7 +83,7 @@ Cond(void *process)
varListInit(varList1, vlistID1);
varListInit(varList2, vlistID2);
const int streamID3 = cdoStreamOpenWrite(cdoStreamName(2));
const int streamID3 = cdoStreamOpenWrite(2);
cdoDefVlist(streamID3, vlistID3);
const size_t gridsizemax = vlistGridsizeMax(vlistID2);
......
......@@ -46,9 +46,9 @@ Cond2(void *process)
cdoOperatorAdd("ifthenelse", 0, 0, nullptr);
int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
int streamID2 = cdoStreamOpenRead(cdoStreamName(1));
int streamID3 = cdoStreamOpenRead(cdoStreamName(2));
int streamID1 = cdoStreamOpenRead(0);
int streamID2 = cdoStreamOpenRead(1);
int streamID3 = cdoStreamOpenRead(2);
int vlistID1 = cdoStreamInqVlist(streamID1);
int vlistID2 = cdoStreamInqVlist(streamID2);
......@@ -78,7 +78,7 @@ Cond2(void *process)
nospec(vlistID2);
nospec(vlistID3);
int streamID4 = cdoStreamOpenWrite(cdoStreamName(3));
int streamID4 = cdoStreamOpenWrite(3);
cdoDefVlist(streamID4, vlistID4);
size_t gridsize = vlistGridsizeMax(vlistID1);
......
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