Skip to content
Snippets Groups Projects
Commit bf5b9838 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

config/default: change to eccodes-2.32.0 on bailung

parent f0dd2c55
No related branches found
No related tags found
1 merge request!138M214003/develop
......@@ -327,6 +327,25 @@ public:
if (gridID0 != gridID) gridDestroy(gridID);
}
else if (operatorID == MASKCIRCLE)
{
/*
CirclePoint cpoint;
selcircle_get_parameter(cpoint);
if (cpoint.radius < 0.0 || cpoint.radius > 180.0) cdo_abort("radius=%g out of bounds (0-180 deg)!", cpoint.radius);
auto gridsizemax = vlistGridsizeMax(vlistID1);
if (gridsizemax < cpoint.maxpoints) cpoint.maxpoints = gridsizemax;
if (Options::cdoVerbose)
cdo_print("lon = %g, lat = %g, radius = %gdeg(%gkm)", cpoint.lon, cpoint.lat, cpoint.radius,
radiusDegToKm(cpoint.radius));
cpoint.radius *= DEG2RAD;
cpoint.lon *= DEG2RAD;
cpoint.lat *= DEG2RAD;
*/
}
varList_init(varList1, vlistID1);
......
......@@ -281,11 +281,11 @@ public:
else if (operatorID == SELCIRCLE)
{
selcircle_get_parameter(cpoint);
if (cpoint.radius < 0.0 || cpoint.radius > 180.0) cdo_abort("%s=%g out of bounds (0-180 deg)!", "radius", cpoint.radius);
if (cpoint.radius < 0.0 || cpoint.radius > 180.0) cdo_abort("radius=%g out of bounds (0-180 deg)!", cpoint.radius);
auto gridsizemax = vlistGridsizeMax(vlistID1);
if (gridsizemax < cpoint.maxpoints) cpoint.maxpoints = gridsizemax;
if (Options::cdoVerbose && operatorID == SELCIRCLE)
if (Options::cdoVerbose)
cdo_print("lon = %g, lat = %g, radius = %gdeg(%gkm)", cpoint.lon, cpoint.lat, cpoint.radius,
radiusDegToKm(cpoint.radius));
......@@ -326,10 +326,7 @@ public:
if (gridID1 == vlistInqVarGrid(vlistID1, varID)) varIDs[varID] = true;
}
}
else
{
cdo_abort("Unsupported grid type: %s", gridNamePtr(gridtype));
}
else { cdo_abort("Unsupported grid type: %s", gridNamePtr(gridtype)); }
}
varList_init(varList1, vlistID1);
......@@ -376,10 +373,7 @@ public:
cdo_write_record(streamID2, field2);
}
else
{
cdo_write_record(streamID2, field1);
}
else { cdo_write_record(streamID2, field1); }
}
tsID++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment