Commit cebb8a88 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cdfInqContents: print warning if cell_measures is missing

parent a8ff7fe3
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* using EXSE library version 1.0.2 * using EXSE library version 1.0.2
* stream_ieg: bug fix memory leak [report: Philip Lorenz] * stream_ieg: bug fix memory leak [report: Philip Lorenz]
* zaxisDuplicate: bug fix * zaxisDuplicate: bug fix
* cdfInqContents: print warning if cell_measures is missing
* cdfInqContents: check also x/yvarid to compare curvilinear grids * cdfInqContents: check also x/yvarid to compare curvilinear grids
* Version 1.0.7 released * Version 1.0.7 released
......
...@@ -3467,7 +3467,7 @@ int cdfInqContents(int streamID) ...@@ -3467,7 +3467,7 @@ int cdfInqContents(int streamID)
cdfSetVar(ncvars, ncvarid, FALSE); cdfSetVar(ncvars, ncvarid, FALSE);
} }
else else
Warning(func, "%s %s", nc_strerror(status), attstring); Warning(func, "%s - %s", nc_strerror(status), attstring);
} }
else if ( strcmp(attname, "cell_measures") == 0 ) else if ( strcmp(attname, "cell_measures") == 0 )
{ {
...@@ -3490,8 +3490,17 @@ int cdfInqContents(int streamID) ...@@ -3490,8 +3490,17 @@ int cdfInqContents(int streamID)
*/ */
if ( strcmp(cell_measures, "area") == 0 ) if ( strcmp(cell_measures, "area") == 0 )
{ {
cdf_inq_varid(fileID, cell_var, &ncvars[ncvarid].cellarea); int status;
cdfSetVar(ncvars, ncvars[ncvarid].cellarea, FALSE); int nc_cell_id;
status = nc_inq_varid(fileID, cell_var, &nc_cell_id);
if ( status == NC_NOERR )
{
ncvars[ncvarid].cellarea = nc_cell_id;
cdfSetVar(ncvars, ncvars[ncvarid].cellarea, FALSE);
}
else
Warning(func, "%s - %s", nc_strerror(status), cell_var);
} }
else else
{ {
...@@ -3553,7 +3562,7 @@ int cdfInqContents(int streamID) ...@@ -3553,7 +3562,7 @@ int cdfInqContents(int streamID)
ncvars[ncvarid].varids[i] = dimvarid; ncvars[ncvarid].varids[i] = dimvarid;
} }
else else
Warning(func, "%s %s", nc_strerror(status), varname); Warning(func, "%s - %s", nc_strerror(status), varname);
if ( lstop ) break; if ( lstop ) break;
} }
...@@ -3562,14 +3571,18 @@ int cdfInqContents(int streamID) ...@@ -3562,14 +3571,18 @@ int cdfInqContents(int streamID)
else if ( strcmp(attname, "grid_mapping") == 0 ) else if ( strcmp(attname, "grid_mapping") == 0 )
{ {
int status; int status;
int nc_gmap_id;
cdfGetAttText(fileID, ncvarid, attname, attstring, attstringlen); cdfGetAttText(fileID, ncvarid, attname, attstring, attstringlen);
status = nc_inq_varid(fileID, attstring, &ncvars[ncvarid].gmapid); status = nc_inq_varid(fileID, attstring, &nc_gmap_id);
if ( status == NC_NOERR ) if ( status == NC_NOERR )
cdfSetVar(ncvars, ncvars[ncvarid].gmapid, FALSE); {
ncvars[ncvarid].gmapid = nc_gmap_id;
cdfSetVar(ncvars, ncvars[ncvarid].gmapid, FALSE);
}
else else
Warning(func, "%s %s", nc_strerror(status), attstring); Warning(func, "%s - %s", nc_strerror(status), attstring);
cdfSetVar(ncvars, ncvarid, TRUE); cdfSetVar(ncvars, ncvarid, TRUE);
} }
......
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