Commit 817928af authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Change warning for curvilinear grids.

parent a6a55965
...@@ -1629,11 +1629,9 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI ...@@ -1629,11 +1629,9 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI
if ( gridtype == GRID_GENERIC ) if ( gridtype == GRID_GENERIC )
{ {
int xsize, ysize, gridsize; int gridsize = gridInqSize(gridID);
int xsize = gridInqXsize(gridID);
gridsize = gridInqSize(gridID); int ysize = gridInqYsize(gridID);
xsize = gridInqXsize(gridID);
ysize = gridInqYsize(gridID);
if ( (ysize == 32 || ysize == 48 || ysize == 64 || if ( (ysize == 32 || ysize == 48 || ysize == 64 ||
ysize == 96 || ysize == 160 || ysize == 192 || ysize == 96 || ysize == 160 || ysize == 192 ||
...@@ -1660,7 +1658,7 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI ...@@ -1660,7 +1658,7 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI
if ( lwarning && gridInqSize(gridID) > 1 ) if ( lwarning && gridInqSize(gridID) > 1 )
{ {
lwarning = false; lwarning = false;
Warning("Curvilinear grids are unsupported in GRIB1! Created wrong GDS!"); Warning("Curvilinear grids are unsupported in GRIB1! Created wrong Grid Description Section!");
} }
gridtype = GRID_LONLAT; gridtype = GRID_LONLAT;
lcurvi = true; lcurvi = true;
...@@ -1676,7 +1674,6 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI ...@@ -1676,7 +1674,6 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI
case GRID_GAUSSIAN_REDUCED: case GRID_GAUSSIAN_REDUCED:
case GRID_TRAJECTORY: case GRID_TRAJECTORY:
{ {
int nlon = 0, nlat;
double xfirst = 0, xlast = 0, xinc = 0; double xfirst = 0, xlast = 0, xinc = 0;
double yfirst = 0, ylast = 0, yinc = 0; double yfirst = 0, ylast = 0, yinc = 0;
bool isRotated = gridIsRotated(gridID); bool isRotated = gridIsRotated(gridID);
...@@ -1688,8 +1685,8 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI ...@@ -1688,8 +1685,8 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI
else else
ISEC2_GridType = GRIB1_GTYPE_LATLON; ISEC2_GridType = GRIB1_GTYPE_LATLON;
nlon = gridInqXsize(gridID); int nlon = gridInqXsize(gridID);
nlat = gridInqYsize(gridID); int nlat = gridInqYsize(gridID);
if ( gridtype == GRID_GAUSSIAN_REDUCED ) if ( gridtype == GRID_GAUSSIAN_REDUCED )
{ {
......
...@@ -1908,7 +1908,7 @@ void gribapiDefGrid(int editionNumber, grib_handle *gh, int gridID, int comptype ...@@ -1908,7 +1908,7 @@ void gribapiDefGrid(int editionNumber, grib_handle *gh, int gridID, int comptype
if ( lwarn && gridsize > 1 ) if ( lwarn && gridsize > 1 )
{ {
lwarn = false; lwarn = false;
Warning("Curvilinear grids are unsupported in GRIB format! Created wrong GDS!"); Warning("Curvilinear grids are unsupported in GRIB format! Created wrong Grid Description Section!");
} }
gridtype = GRID_LONLAT; gridtype = GRID_LONLAT;
} }
......
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