Commit ba33b197 authored by Uwe Schulzweida's avatar Uwe Schulzweida

eca_gsl: the 2nd input file was not closed [Bug #9033].

parent 3219e1d8
......@@ -3,6 +3,10 @@
* Using CDI library version 1.9.7
* Version 1.9.7 release
2019-05-13 Uwe Schulzweida
* eca_gsl: the 2nd input file was not closed [Bug #9033]
2019-04-30 Uwe Schulzweida
* Info: added footer
......
......@@ -520,7 +520,7 @@ void *EcaGsl(void *process)
char *longname = (char*) Malloc(strlen(GSL_LONGNAME) + 160);
sprintf(longname, GSL_LONGNAME, argN, argT, argN, argT);
request.name = GSL_NAME;
request.longname = longname;
request.units = GSL_UNITS;
......
......@@ -771,7 +771,7 @@ eca4(const ECA_REQUEST_4 *request)
const int zaxisID = vlistInqVarZaxis(ivlistID1, FIRST_VAR_ID);
const double missval = vlistInqVarMissval(ivlistID1, FIRST_VAR_ID);
int ovarID1 = vlistDefVar(ovlistID, gridID, zaxisID, TIME_VARYING);
const int ovarID1 = vlistDefVar(ovlistID, gridID, zaxisID, TIME_VARYING);
vlistDefVarMissval(ovlistID, ovarID1, missval);
......@@ -779,7 +779,7 @@ eca4(const ECA_REQUEST_4 *request)
if (IS_SET(request->longname)) vlistDefVarLongname(ovlistID, ovarID1, request->longname);
if (IS_SET(request->units)) vlistDefVarUnits(ovlistID, ovarID1, request->units);
int ovarID2 = vlistDefVar(ovlistID, gridID, zaxisID, TIME_VARYING);
const int ovarID2 = vlistDefVar(ovlistID, gridID, zaxisID, TIME_VARYING);
vlistDefVarMissval(ovlistID, ovarID2, missval);
......@@ -1185,8 +1185,7 @@ eca4(const ECA_REQUEST_4 *request)
updateHist(endDateWithHist, nlevels, gridsize, yvals, true);
}
}
else /* process the current year, this only happens, if the last timestep
is reached OR if data for only one year is present */
else // process the current year, this only happens, if the last timestep is reached OR if data for only one year is present
{
computeGsl(nlevels, gridsize, yvals, missval, startDateWithHist, endDateWithHist, gslDuration, gslFirstDay, true);
{
......@@ -1201,5 +1200,6 @@ eca4(const ECA_REQUEST_4 *request)
}
cdoStreamClose(ostreamID);
cdoStreamClose(istreamID2);
cdoStreamClose(istreamID1);
}
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