Commit 9e1dd26f authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed nrowlon to reducedPointsSize.

parent e5e3da2d
...@@ -338,15 +338,15 @@ cdfLazyGridCopyScalarFields(grid_t *gridptrOrig, grid_t *gridptrDup) ...@@ -338,15 +338,15 @@ cdfLazyGridCopyScalarFields(grid_t *gridptrOrig, grid_t *gridptrDup)
static void static void
cdfLazyGridCopyArrayFields(grid_t *gridptrOrig, grid_t *gridptrDup) cdfLazyGridCopyArrayFields(grid_t *gridptrOrig, grid_t *gridptrDup)
{ {
size_t nrowlon = (size_t)gridptrOrig->nrowlon; size_t reducedPointsSize = (size_t)gridptrOrig->reducedPointsSize;
size_t gridsize = gridptrOrig->size; size_t gridsize = gridptrOrig->size;
int gridtype = gridptrOrig->type; int gridtype = gridptrOrig->type;
int irregular = gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED; int irregular = gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED;
if ( nrowlon ) if ( reducedPointsSize )
{ {
gridptrDup->rowlon = (int *)Malloc(nrowlon * sizeof (int)); gridptrDup->rowlon = (int *)Malloc(reducedPointsSize * sizeof (int));
memcpy(gridptrDup->rowlon, gridptrOrig->rowlon, nrowlon * sizeof(int)); memcpy(gridptrDup->rowlon, gridptrOrig->rowlon, reducedPointsSize * sizeof(int));
} }
if ( gridptrOrig->x.vals != NULL && gridptrOrig->x.vals != cdfPendingLoad ) if ( gridptrOrig->x.vals != NULL && gridptrOrig->x.vals != cdfPendingLoad )
......
...@@ -996,7 +996,7 @@ void gridDefYbounds(int gridID, const double ybounds[]); ...@@ -996,7 +996,7 @@ void gridDefYbounds(int gridID, const double ybounds[]);
size_t gridInqYbounds(int gridID, double ybounds[]); size_t gridInqYbounds(int gridID, double ybounds[]);
size_t gridInqYboundsPart(int gridID, int start, size_t size, double ybounds[]); size_t gridInqYboundsPart(int gridID, int start, size_t size, double ybounds[]);
void gridDefReducedPoints(int gridID, int nrowlon, const int rowlon[]); void gridDefReducedPoints(int gridID, int reducedPointsSize, const int rowlon[]);
void gridInqReducedPoints(int gridID, int rowlon[]); void gridInqReducedPoints(int gridID, int rowlon[]);
void gridChangeType(int gridID, int gridtype); void gridChangeType(int gridID, int gridtype);
......
...@@ -532,7 +532,7 @@ void gribapiGetGridGaussianReduced(grib_handle *gh, grid_t *grid, int editionNum ...@@ -532,7 +532,7 @@ void gribapiGetGridGaussianReduced(grib_handle *gh, grid_t *grid, int editionNum
grid->size = numberOfPoints; grid->size = numberOfPoints;
grid->nrowlon = (int)nlat; grid->reducedPointsSize = (int)nlat;
grid->rowlon = (int *) Malloc(nlat * sizeof(int)); grid->rowlon = (int *) Malloc(nlat * sizeof(int));
long *pl = (long *) Malloc(nlat * sizeof(long)); long *pl = (long *) Malloc(nlat * sizeof(long));
size_t dummy = nlat; size_t dummy = nlat;
......
...@@ -148,7 +148,7 @@ void grid_init(grid_t *gridptr) ...@@ -148,7 +148,7 @@ void grid_init(grid_t *gridptr)
gridptr->area = NULL; gridptr->area = NULL;
gridptr->rowlon = NULL; gridptr->rowlon = NULL;
gridptr->nrowlon = 0; gridptr->reducedPointsSize = 0;
gridptr->gme.nd = 0; gridptr->gme.nd = 0;
gridptr->gme.ni = 0; gridptr->gme.ni = 0;
...@@ -1388,13 +1388,13 @@ int gridInqNP(int gridID) ...@@ -1388,13 +1388,13 @@ int gridInqNP(int gridID)
@EndFunction @EndFunction
*/ */
void gridDefReducedPoints(int gridID, int nrowlon, const int rowlon[]) void gridDefReducedPoints(int gridID, int reducedPointsSize, const int rowlon[])
{ {
grid_t *gridptr = grid_to_pointer(gridID); grid_t *gridptr = grid_to_pointer(gridID);
gridptr->rowlon = (int *) Malloc((size_t)nrowlon * sizeof(int)); gridptr->rowlon = (int *) Malloc((size_t)reducedPointsSize * sizeof(int));
gridptr->nrowlon = nrowlon; gridptr->reducedPointsSize = reducedPointsSize;
memcpy(gridptr->rowlon, rowlon, (size_t)nrowlon * sizeof(int)); memcpy(gridptr->rowlon, rowlon, (size_t)reducedPointsSize * sizeof(int));
gridMark4Update(gridID); gridMark4Update(gridID);
} }
...@@ -1414,7 +1414,7 @@ void gridInqReducedPoints(int gridID, int *rowlon) ...@@ -1414,7 +1414,7 @@ void gridInqReducedPoints(int gridID, int *rowlon)
if ( gridptr->rowlon == 0 ) Error("undefined pointer!"); if ( gridptr->rowlon == 0 ) Error("undefined pointer!");
memcpy(rowlon, gridptr->rowlon, (size_t)gridptr->nrowlon * sizeof(int)); memcpy(rowlon, gridptr->rowlon, (size_t)gridptr->reducedPointsSize * sizeof(int));
} }
static size_t static size_t
...@@ -2493,7 +2493,7 @@ int gridCompareP(void *gridptr1, void *gridptr2) ...@@ -2493,7 +2493,7 @@ int gridCompareP(void *gridptr1, void *gridptr2)
if ( g1->position != g2->position ) return differ; if ( g1->position != g2->position ) return differ;
if ( g1->trunc != g2->trunc ) return differ; if ( g1->trunc != g2->trunc ) return differ;
if ( g1->nvertex != g2->nvertex ) return differ; if ( g1->nvertex != g2->nvertex ) return differ;
if ( g1->nrowlon != g2->nrowlon ) return differ; if ( g1->reducedPointsSize != g2->reducedPointsSize ) return differ;
if ( g1->size != g2->size ) return differ; if ( g1->size != g2->size ) return differ;
if ( g1->x.size != g2->x.size ) return differ; if ( g1->x.size != g2->x.size ) return differ;
if ( g1->y.size != g2->y.size ) return differ; if ( g1->y.size != g2->y.size ) return differ;
...@@ -2853,14 +2853,14 @@ int gridGenerate(const grid_t *grid) ...@@ -2853,14 +2853,14 @@ int gridGenerate(const grid_t *grid)
static void static void
grid_copy_base_array_fields(grid_t *gridptrOrig, grid_t *gridptrDup) grid_copy_base_array_fields(grid_t *gridptrOrig, grid_t *gridptrDup)
{ {
size_t nrowlon = (size_t)gridptrOrig->nrowlon; size_t reducedPointsSize = (size_t)gridptrOrig->reducedPointsSize;
size_t gridsize = gridptrOrig->size; size_t gridsize = gridptrOrig->size;
int gridtype = gridptrOrig->type; int gridtype = gridptrOrig->type;
int irregular = gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED; int irregular = gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED;
if ( nrowlon ) if ( reducedPointsSize )
{ {
gridptrDup->rowlon = (int*) Malloc(nrowlon * sizeof(int)); gridptrDup->rowlon = (int*) Malloc(reducedPointsSize * sizeof(int));
memcpy(gridptrDup->rowlon, gridptrOrig->rowlon, nrowlon * sizeof(int)); memcpy(gridptrDup->rowlon, gridptrOrig->rowlon, reducedPointsSize * sizeof(int));
} }
if ( gridptrOrig->x.vals != NULL ) if ( gridptrOrig->x.vals != NULL )
...@@ -3617,10 +3617,10 @@ void gridPrintP(void *voidptr, FILE *fp) ...@@ -3617,10 +3617,10 @@ void gridPrintP(void *voidptr, FILE *fp)
"position = %d\n" "position = %d\n"
"trunc = %d\n" "trunc = %d\n"
"lcomplex = %d\n" "lcomplex = %d\n"
"nrowlon = %d\n", "reducedPointsSize = %d\n",
gridptr->datatype, gridptr->gme.nd, gridptr->gme.ni, gridptr->gme.ni2, gridptr->datatype, gridptr->gme.nd, gridptr->gme.ni, gridptr->gme.ni2,
gridptr->gme.ni3, gridptr->number, gridptr->position, gridptr->trunc, gridptr->gme.ni3, gridptr->number, gridptr->position, gridptr->trunc,
gridptr->lcomplex, gridptr->nrowlon ); gridptr->lcomplex, gridptr->reducedPointsSize );
} }
static const double *gridInqXValsPtrSerial(grid_t *gridptr) static const double *gridInqXValsPtrSerial(grid_t *gridptr)
...@@ -4341,8 +4341,8 @@ gridGetPackSize(void * voidP, void *context) ...@@ -4341,8 +4341,8 @@ gridGetPackSize(void * voidP, void *context)
if (gridP->rowlon) if (gridP->rowlon)
{ {
xassert(gridP->nrowlon); xassert(gridP->reducedPointsSize);
packBuffSize += serializeGetSize(gridP->nrowlon, CDI_DATATYPE_INT, context) packBuffSize += serializeGetSize(gridP->reducedPointsSize, CDI_DATATYPE_INT, context)
+ serializeGetSize( 1, CDI_DATATYPE_UINT32, context); + serializeGetSize( 1, CDI_DATATYPE_UINT32, context);
} }
...@@ -4477,7 +4477,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize, ...@@ -4477,7 +4477,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
gridP->position = intBuffer[GRID_PACK_INT_IDX_POSITION]; gridP->position = intBuffer[GRID_PACK_INT_IDX_POSITION];
gridP->trunc = intBuffer[GRID_PACK_INT_IDX_TRUNC]; gridP->trunc = intBuffer[GRID_PACK_INT_IDX_TRUNC];
gridP->nvertex = intBuffer[GRID_PACK_INT_IDX_NVERTEX]; gridP->nvertex = intBuffer[GRID_PACK_INT_IDX_NVERTEX];
gridP->nrowlon = intBuffer[GRID_PACK_INT_IDX_NROWLON]; gridP->reducedPointsSize = intBuffer[GRID_PACK_INT_IDX_NROWLON];
gridP->size = intBuffer[GRID_PACK_INT_IDX_SIZE]; gridP->size = intBuffer[GRID_PACK_INT_IDX_SIZE];
gridP->x.size = intBuffer[GRID_PACK_INT_IDX_X_SIZE]; gridP->x.size = intBuffer[GRID_PACK_INT_IDX_X_SIZE];
gridP->y.size = intBuffer[GRID_PACK_INT_IDX_Y_SIZE]; gridP->y.size = intBuffer[GRID_PACK_INT_IDX_Y_SIZE];
...@@ -4495,13 +4495,13 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize, ...@@ -4495,13 +4495,13 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
if (memberMask & gridHasRowLonFlag) if (memberMask & gridHasRowLonFlag)
{ {
xassert(gridP->nrowlon); xassert(gridP->reducedPointsSize);
gridP->rowlon = (int *) Malloc((size_t)gridP->nrowlon * sizeof (int)); gridP->rowlon = (int *) Malloc((size_t)gridP->reducedPointsSize * sizeof (int));
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos, serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
gridP->rowlon, gridP->nrowlon , CDI_DATATYPE_INT, context); gridP->rowlon, gridP->reducedPointsSize , CDI_DATATYPE_INT, context);
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos, serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
&d, 1, CDI_DATATYPE_UINT32, context); &d, 1, CDI_DATATYPE_UINT32, context);
xassert(cdiCheckSum(CDI_DATATYPE_INT, gridP->nrowlon, gridP->rowlon) == d); xassert(cdiCheckSum(CDI_DATATYPE_INT, gridP->reducedPointsSize, gridP->rowlon) == d);
} }
{ {
...@@ -4662,7 +4662,7 @@ gridPack(void * voidP, void * packBuffer, int packBufferSize, ...@@ -4662,7 +4662,7 @@ gridPack(void * voidP, void * packBuffer, int packBufferSize,
intBuffer[GRID_PACK_INT_IDX_POSITION] = gridP->position; intBuffer[GRID_PACK_INT_IDX_POSITION] = gridP->position;
intBuffer[GRID_PACK_INT_IDX_TRUNC] = gridP->trunc; intBuffer[GRID_PACK_INT_IDX_TRUNC] = gridP->trunc;
intBuffer[GRID_PACK_INT_IDX_NVERTEX] = gridP->nvertex; intBuffer[GRID_PACK_INT_IDX_NVERTEX] = gridP->nvertex;
intBuffer[GRID_PACK_INT_IDX_NROWLON] = gridP->nrowlon; intBuffer[GRID_PACK_INT_IDX_NROWLON] = gridP->reducedPointsSize;
intBuffer[GRID_PACK_INT_IDX_SIZE] = gridP->size; intBuffer[GRID_PACK_INT_IDX_SIZE] = gridP->size;
intBuffer[GRID_PACK_INT_IDX_X_SIZE] = gridP->x.size; intBuffer[GRID_PACK_INT_IDX_X_SIZE] = gridP->x.size;
intBuffer[GRID_PACK_INT_IDX_Y_SIZE] = gridP->y.size; intBuffer[GRID_PACK_INT_IDX_Y_SIZE] = gridP->y.size;
...@@ -4689,7 +4689,7 @@ gridPack(void * voidP, void * packBuffer, int packBufferSize, ...@@ -4689,7 +4689,7 @@ gridPack(void * voidP, void * packBuffer, int packBufferSize,
if (memberMask & gridHasRowLonFlag) if (memberMask & gridHasRowLonFlag)
{ {
size = gridP->nrowlon; size = gridP->reducedPointsSize;
xassert(size > 0); xassert(size > 0);
serializePack(gridP->rowlon, size, CDI_DATATYPE_INT, serializePack(gridP->rowlon, size, CDI_DATATYPE_INT,
packBuffer, packBufferSize, packBufferPos, context); packBuffer, packBufferSize, packBufferPos, context);
......
...@@ -103,7 +103,7 @@ struct grid_t { ...@@ -103,7 +103,7 @@ struct grid_t {
char *reference; char *reference;
unsigned char uuid[CDI_UUID_SIZE]; /* uuid for grid reference */ unsigned char uuid[CDI_UUID_SIZE]; /* uuid for grid reference */
int *rowlon; int *rowlon;
int nrowlon; int reducedPointsSize;
int np; /* number of parallels between a pole and the equator */ int np; /* number of parallels between a pole and the equator */
signed char isCyclic; /* three possible states: signed char isCyclic; /* three possible states:
* -1 if unknown, * -1 if unknown,
......
...@@ -2325,11 +2325,11 @@ module mo_cdi ...@@ -2325,11 +2325,11 @@ module mo_cdi
integer(c_size_t) :: f_result integer(c_size_t) :: f_result
end function gridInqYboundsPart end function gridInqYboundsPart
subroutine gridDefReducedPoints(gridID_dummy, nrowlon_dummy, rowlon_dummy) bind(c,& subroutine gridDefReducedPoints(gridID_dummy, reducedPointsSize_dummy, rowlon_dummy) bind(c,&
& name = 'gridDefReducedPoints') & name = 'gridDefReducedPoints')
import c_int import c_int
integer(c_int), value :: gridID_dummy integer(c_int), value :: gridID_dummy
integer(c_int), value :: nrowlon_dummy integer(c_int), value :: reducedPointsSize_dummy
integer(c_int), intent(in) :: rowlon_dummy(*) integer(c_int), intent(in) :: rowlon_dummy(*)
end subroutine gridDefReducedPoints end subroutine gridDefReducedPoints
......
...@@ -356,7 +356,7 @@ bool cgribexGetGrid(stream_t *streamptr, int *isec2, int *isec4, grid_t *grid, i ...@@ -356,7 +356,7 @@ bool cgribexGetGrid(stream_t *streamptr, int *isec2, int *isec4, grid_t *grid, i
grid->np = ISEC2_NumPar; grid->np = ISEC2_NumPar;
grid->size = (size_t)ISEC4_NumValues; grid->size = (size_t)ISEC4_NumValues;
grid->rowlon = ISEC2_RowLonPtr; grid->rowlon = ISEC2_RowLonPtr;
grid->nrowlon = (size_t)ISEC2_NumLat; grid->reducedPointsSize = (size_t)ISEC2_NumLat;
grid->y.size = (size_t)ISEC2_NumLat; grid->y.size = (size_t)ISEC2_NumLat;
grid->x.inc = 0; grid->x.inc = 0;
grid->y.inc = 0; grid->y.inc = 0;
...@@ -497,12 +497,12 @@ void cgribexAddRecord(stream_t *streamptr, cgribexrec_t *cgribexp, int param, si ...@@ -497,12 +497,12 @@ void cgribexAddRecord(stream_t *streamptr, cgribexrec_t *cgribexp, int param, si
int gridID = gridAdded.Id; int gridID = gridAdded.Id;
if ( gridAdded.isNew ) if ( gridAdded.isNew )
{ {
if ( gridptr->nrowlon ) if ( gridptr->reducedPointsSize )
{ {
const size_t nrowlon = (size_t) gridptr->nrowlon; const size_t reducedPointsSize = (size_t) gridptr->reducedPointsSize;
int *rowlon = gridptr->rowlon; int *rowlon = gridptr->rowlon;
gridptr->rowlon = (int*) Malloc(nrowlon * sizeof(int)); gridptr->rowlon = (int*) Malloc(reducedPointsSize * sizeof(int));
memcpy(gridptr->rowlon, rowlon, nrowlon * sizeof(int)); memcpy(gridptr->rowlon, rowlon, reducedPointsSize * sizeof(int));
} }
else if ( gridptr->projtype == CDI_PROJ_RLL ) else if ( gridptr->projtype == CDI_PROJ_RLL )
{ {
......
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