Commit d7d025e0 authored by Uwe Schulzweida's avatar Uwe Schulzweida

Selbox: angle of rotated grid missing (bug fix)

parent 008ddb71
2014-06-26 Uwe Schulzweida
2014-06-30 Uwe Schulzweida
* using CDI library version 1.6.4
* Version 1.6.4 released
2014-06-30 Uwe Schulzweida
* Selbox: angle of rotated grid missing (bug fix)
2014-06-19 Uwe Schulzweida
* Filter: disable zero-padding
......
......@@ -108,6 +108,7 @@ int gengrid(int gridID1, int lat1, int lat2, int lon11, int lon12, int lon21, in
{
gridDefXpole(gridID2, gridInqXpole(gridID1));
gridDefYpole(gridID2, gridInqYpole(gridID1));
gridDefAngle(gridID2, gridInqAngle(gridID1));
}
lxvals = gridInqXvals(gridID1, NULL);
......
......@@ -281,6 +281,7 @@ int gridDefine(griddes_t grid)
{
gridDefXpole(gridID, grid.xpole);
gridDefYpole(gridID, grid.ypole);
gridDefAngle(gridID, grid.angle);
}
if ( grid.mask )
......@@ -930,10 +931,6 @@ int gridFromFile(FILE *gfp, const char *dname)
else
cdoAbort("Invalid projection : %s (grid description file: %s)", pline, dname);
}
else if ( cmpstr(pline, "a", len) == 0 )
{
grid.a = readflt(dname, "a", skipSeparator(pline + len));
}
else if ( cmpstr(pline, "lon_0", len) == 0 )
{
grid.lon_0 = readflt(dname, "lon_0", skipSeparator(pline + len));
......@@ -974,6 +971,15 @@ int gridFromFile(FILE *gfp, const char *dname)
grid.ypole = readflt(dname, "latpole", skipSeparator(pline + len));
grid.isRotated = TRUE;
}
else if ( cmpstr(pline, "angle", len) == 0 )
{
grid.angle = readflt(dname, "angle", skipSeparator(pline + len));
grid.isRotated = TRUE;
}
else if ( cmpstr(pline, "a", len) == 0 )
{
grid.a = readflt(dname, "a", skipSeparator(pline + len));
}
else if ( cmpstr(pline, "gridlatlon", len) == 0 )
{
int i;
......
......@@ -491,6 +491,7 @@ int expand_lonlat_grid(int gridID)
{
gridDefXpole(gridIDnew, gridInqXpole(gridID));
gridDefYpole(gridIDnew, gridInqYpole(gridID));
gridDefAngle(gridIDnew, gridInqAngle(gridID));
}
return(gridIDnew);
......
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