Commit 73e0063c authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Cleanup setting of field.size.

parent 75121ba9
Pipeline #5301 passed with stages
in 15 minutes and 21 seconds
......@@ -7,6 +7,7 @@ Version 1.9.10 (29 January 2021):
Fixed bugs:
* timselmean: failed with variables on different grids [Bug #9978]
* Ymonarith: failed with variables on different grids
* Detrend: wrong result with parameter equal=false [Bug #9961]
* Fldstat: optional parameter weights failed
* Wind: check that numLPE is > 0
......
......@@ -396,6 +396,7 @@ etccdi_op(ETCCDI_REQUEST *request)
else
cdoReadRecord(streamID3, field.vec_d.data(), &nmiss);
field.nmiss = nmiss;
field.size = vars2[dayoy][varID][levelID].size;
field.grid = vars2[dayoy][varID][levelID].grid;
field.missval = vars2[dayoy][varID][levelID].missval;
......@@ -792,6 +793,7 @@ etccdi_op(ETCCDI_REQUEST *request)
}
field.resize(gridsizemax);
field.missval = vars1[1][0][0].missval;
field.size = vars1[1][0][0].size;
field.grid = vars1[1][0][0].grid;
calculateOuterPeriod(field, MaxMonths, request->endboot+1, lastYear+1, cei, varsPtemp, frequency, taxisID4, streamID4, &otsID, vlistID1, recinfo, selection, request->func2);
}
......
......@@ -118,6 +118,7 @@ Seascount(void *process)
}
cdoReadRecord(streamID1, field.vec_d.data(), &field.nmiss);
field.size = vars1[varID][levelID].size;
field.grid = vars1[varID][levelID].grid;
field.missval = vars1[varID][levelID].missval;
......
......@@ -127,8 +127,9 @@ Seaspctl(void *process)
int varID, levelID;
cdoInqRecord(streamID3, &varID, &levelID);
cdoReadRecord(streamID3, field.vec_d.data(), &field.nmiss);
field.grid = vars1[varID][levelID].grid;
field.missval = vars1[varID][levelID].missval;
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
hset.defVarLevelBounds(varID, levelID, vars1[varID][levelID], field);
}
......
......@@ -119,6 +119,7 @@ Timcount(void *process)
}
cdoReadRecord(streamID1, field.vec_d.data(), &field.nmiss);
field.size = vars1[varID][levelID].size;
field.grid = vars1[varID][levelID].grid;
field.missval = vars1[varID][levelID].missval;
......
......@@ -130,8 +130,9 @@ timpctl(int operatorID)
int varID, levelID;
cdoInqRecord(streamID3, &varID, &levelID);
cdoReadRecord(streamID3, field.vec_d.data(), &field.nmiss);
field.grid = vars1[varID][levelID].grid;
field.missval = vars1[varID][levelID].missval;
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
hset.defVarLevelBounds(varID, levelID, vars1[varID][levelID], field);
}
......
......@@ -158,8 +158,9 @@ Timselpctl(void *process)
int varID, levelID;
cdoInqRecord(streamID3, &varID, &levelID);
cdoReadRecord(streamID3, field.vec_d.data(), &field.nmiss);
field.grid = vars1[varID][levelID].grid;
field.missval = vars1[varID][levelID].missval;
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
hset.defVarLevelBounds(varID, levelID, vars1[varID][levelID], field);
}
......
......@@ -205,6 +205,7 @@ Varsstat(void *process)
else
{
cdoReadRecord(streamID1, field.vec_d.data(), &field.nmiss);
field.size = vars1[levelID].size;
field.grid = vars1[levelID].grid;
field.missval = vars1[levelID].missval;
......
......@@ -113,6 +113,7 @@ Ydayarith(void *process)
{
cdoInqRecord(streamID1, &varID, &levelID);
cdoReadRecord(streamID1, field.vec_d.data(), &field.nmiss);
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
......
......@@ -127,8 +127,9 @@ Ydaypctl(void *process)
int varID, levelID;
cdoInqRecord(streamID3, &varID, &levelID);
cdoReadRecord(streamID3, field.vec_d.data(), &field.nmiss);
field.grid = vars1[dayoy][varID][levelID].grid;
field.missval = vars1[dayoy][varID][levelID].missval;
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
hsets[dayoy].defVarLevelBounds(varID, levelID, vars1[dayoy][varID][levelID], field);
}
......
......@@ -158,8 +158,9 @@ Ydrunpctl(void *process)
int varID, levelID;
cdoInqRecord(streamID3, &varID, &levelID);
cdoReadRecord(streamID3, field.vec_d.data(), &field.nmiss);
field.grid = vars2[dayoy][varID][levelID].grid;
field.missval = vars2[dayoy][varID][levelID].missval;
field.size = varList2[varID].gridsize;
field.grid = varList2[varID].gridID;
field.missval = varList2[varID].missval;
hsets[dayoy].defVarLevelBounds(varID, levelID, vars2[dayoy][varID][levelID], field);
}
......
......@@ -140,6 +140,7 @@ Yeararith(void *process)
{
cdoInqRecord(streamID1, &varID, &levelID);
cdoReadRecord(streamID1, field.vec_d.data(), &field.nmiss);
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
......
......@@ -122,6 +122,7 @@ Yhourarith(void *process)
{
cdoInqRecord(streamID1, &varID, &levelID);
cdoReadRecord(streamID1, field.vec_d.data(), &field.nmiss);
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
......
......@@ -127,8 +127,9 @@ Ymonpctl(void *process)
int varID, levelID;
cdoInqRecord(streamID3, &varID, &levelID);
cdoReadRecord(streamID3, field.vec_d.data(), &field.nmiss);
field.grid = vars1[month][varID][levelID].grid;
field.missval = vars1[month][varID][levelID].missval;
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
hsets[month].defVarLevelBounds(varID, levelID, vars1[month][varID][levelID], field);
}
......
......@@ -126,8 +126,9 @@ Yseaspctl(void *process)
int varID, levelID;
cdoInqRecord(streamID3, &varID, &levelID);
cdoReadRecord(streamID3, field.vec_d.data(), &field.nmiss);
field.grid = vars1[seas][varID][levelID].grid;
field.missval = vars1[seas][varID][levelID].missval;
field.size = varList1[varID].gridsize;
field.grid = varList1[varID].gridID;
field.missval = varList1[varID].missval;
hsets[seas].defVarLevelBounds(varID, levelID, vars1[seas][varID][levelID], field);
}
......
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