Commit 120f276b authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

namelist: bug fix for wrong input

parent 06cb926d
......@@ -10,6 +10,7 @@
* cat, copy: compare input files
* ifthen: bug fix for datasets with different missing values [report: Beate Geyer]
* runmean: bug fix for datasets with missing values [report: Carmen Ulmen]
* namelist: bug fix for wrong input
* Version 1.2.1 released
2008-08-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
......
......@@ -235,14 +235,12 @@ int gridDefine(GRID grid)
if ( grid.xbounds )
{
printf("gridDefXbounds\n");
gridDefXbounds(gridID, grid.xbounds);
free(grid.xbounds);
}
if ( grid.ybounds )
{
printf("gridDefYbounds\n");
gridDefYbounds(gridID, grid.ybounds);
free(grid.ybounds);
}
......
......@@ -481,12 +481,11 @@ void namelistRead(FILE *nmlfp, NAMELIST *nml)
if ( nml->line.namitf < nml->line.namitl)
pnamecx = &nml->line.linelc[nml->line.namitf+1];
if ( strncmp(pnamecx, "select", 6) == 0 ||
strncmp(pnamecx, "params", 6) == 0 ||
strncmp(pnamecx, nml->name, strlen(nml->name)) == 0 )
{
if ( pnamecx )
if ( strncmp(pnamecx, "select", 6) == 0 ||
strncmp(pnamecx, "params", 6) == 0 ||
strncmp(pnamecx, nml->name, strlen(nml->name)) == 0 )
goto L2000;
}
goto L3000;
}
......
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