Commit 3d0b5ff5 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

No commit message

No commit message
parent 7c2d7758
......@@ -12,7 +12,7 @@
* Timsort: bug fix for time constant fields
* Math: rename log to ln
* Change help info format
* Selbox, Maskbox, Fldrms, Mergegrid, Zonstat, Fldstat, Output: check number of different grids
* Selbox, Maskbox, Fldrms, Mergegrid, Zonstat, Merstat, Output: check number of different grids
* extent macro UNCHANGED_RECORD to cdoDefaultDataType and cdoDefaultByteorder
* remove module docu from source code
* Version 0.9.13 released
......
......@@ -49,7 +49,6 @@ void *Fldstat(void *argument)
int lim;
int needWeights = FALSE;
int nmiss;
int ndiffgrids;
double slon, slat;
double sglval;
FIELD field;
......@@ -91,12 +90,6 @@ void *Fldstat(void *argument)
gridDefYvals(gridID2, &slat);
ngrids = vlistNgrids(vlistID1);
ndiffgrids = 0;
for ( index = 1; index < ngrids; index++ )
if ( vlistGrid(vlistID1, 0) != vlistGrid(vlistID1, index))
ndiffgrids++;
if ( ndiffgrids > 0 ) cdoAbort("Too many different grids!");
for ( index = 0; index < ngrids; index++ )
vlistChangeGridIndex(vlistID2, index, gridID2);
......
......@@ -48,8 +48,9 @@ void *Merstat(void *argument)
int recID, nrecs;
int tsID, varID, levelID;
int lim;
FIELD field1, field2;
int ndiffgrids;
int taxisID1, taxisID2;
FIELD field1, field2;
cdoInitialize(argument);
......@@ -75,6 +76,13 @@ void *Merstat(void *argument)
vlistDefTaxis(vlistID2, taxisID2);
ngrids = vlistNgrids(vlistID1);
ndiffgrids = 0;
for ( index = 1; index < ngrids; index++ )
if ( vlistGrid(vlistID1, 0) != vlistGrid(vlistID1, index))
ndiffgrids++;
if ( ndiffgrids > 0 ) cdoAbort("Too many different grids!");
index = 0;
gridID1 = vlistGrid(vlistID1, index);
if ( gridInqType(gridID1) != 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