From 7ce55c4f56fb1de58d404d359c553ecfe553438e Mon Sep 17 00:00:00 2001
From: Uwe Schulzweida <uwe.schulzweida@mpimet.mpg.de>
Date: Tue, 16 Apr 2019 13:50:52 +0200
Subject: [PATCH] Deactivate gridXXXCvals() for parallel IO.
---
src/grid.c | 57 ++++++++++++++++++++++++++++++++++++----------
src/grid.h | 16 ++++++++-----
src/stream_cdf_i.c | 10 ++++++++
3 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/src/grid.c b/src/grid.c
index a823f3f62..a98c720d8 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -122,17 +122,18 @@ void grid_init(grid_t *gridptr)
gridptr->mask = NULL;
gridptr->mask_gme = NULL;
gridptr->x.vals = NULL;
- gridptr->x.cvals = NULL;
- gridptr->x.clength = 0;
gridptr->y.vals = NULL;
- gridptr->y.cvals = NULL;
- gridptr->y.clength = 0;
gridptr->x.bounds = NULL;
gridptr->y.bounds = NULL;
gridptr->area = NULL;
gridptr->rowlon = NULL;
gridptr->nrowlon = 0;
-
+#ifndef USE_MPI
+ gridptr->x.clength = 0;
+ gridptr->y.clength = 0;
+ gridptr->x.cvals = NULL;
+ gridptr->y.cvals = NULL;
+#endif
gridptr->x.first = 0.0;
gridptr->x.last = 0.0;
gridptr->x.inc = 0.0;
@@ -197,7 +198,9 @@ void grid_free_components(grid_t *gridptr)
{
void *p2free[] = { gridptr->mask, gridptr->mask_gme,
gridptr->x.vals, gridptr->y.vals,
+#ifndef USE_MPI
gridptr->x.cvals, gridptr->y.cvals,
+#endif
gridptr->x.bounds, gridptr->y.bounds,
gridptr->rowlon, gridptr->area,
gridptr->reference, gridptr->name};
@@ -329,13 +332,15 @@ void cdiGridTypeInit(grid_t *gridptr, int gridtype, size_t size)
break;
}
+#ifndef USE_MPI
case GRID_CHARXY:
{
if ( gridptr->x.cvals ) gridptr->x.stdname = xystdname_tab[grid_xystdname_char][0];
if ( gridptr->y.cvals ) gridptr->y.stdname = xystdname_tab[grid_xystdname_char][0];
break;
- }
+ }
+#endif
case GRID_GENERIC:
case GRID_PROJECTION:
{
@@ -1564,6 +1569,7 @@ size_t gridInqXValsPartSerial(grid_t *gridptr, int start, size_t length, double
return size;
}
+#ifndef USE_MPI
static
size_t gridInqXCvalsSerial(grid_t *gridptr, char **xcvals)
{
@@ -1594,6 +1600,7 @@ int gridInqXIscSerial(grid_t *gridptr)
*/
return clen;
}
+#endif
/*
@Function gridInqXvals
@@ -1632,14 +1639,22 @@ size_t gridInqXvalsPart(int gridID, int start, size_t length, double *xvals)
size_t gridInqXCvals(int gridID, char **xcvals)
{
grid_t *gridptr = grid_to_pointer(gridID);
+#ifndef USE_MPI
return gridptr->vtable->inqXCvals(gridptr, xcvals);
+#else
+ return 0;
+#endif
}
int gridInqXIsc(int gridID)
{
grid_t *gridptr = grid_to_pointer(gridID);
+#ifndef USE_MPI
return gridptr->vtable->inqXIsc(gridptr);
+#else
+ return 0;
+#endif
}
static
@@ -1663,6 +1678,7 @@ void gridDefXValsSerial(grid_t *gridptr, const double *xvals)
memcpy(gridptr->x.vals, xvals, size * sizeof (double));
}
+#ifndef USE_MPI
static
size_t gridInqYCvalsSerial(grid_t *gridptr, char **ycvals)
{
@@ -1693,6 +1709,7 @@ int gridInqYIscSerial(grid_t *gridptr)
*/
return clen;
}
+#endif
/*
@Function gridDefXvals
@@ -1800,14 +1817,22 @@ size_t gridInqYvalsPart(int gridID, int start, size_t size, double *yvals)
size_t gridInqYCvals(int gridID, char **ycvals)
{
grid_t *gridptr = grid_to_pointer(gridID);
+#ifndef USE_MPI
return gridptr->vtable->inqYCvals(gridptr, ycvals);
+#else
+ return 0;
+#endif
}
int gridInqYIsc(int gridID)
{
grid_t *gridptr = grid_to_pointer(gridID);
+#ifndef USE_MPI
return gridptr->vtable->inqYIsc(gridptr);
+#else
+ return 0;
+#endif
}
static
@@ -3604,11 +3629,12 @@ static const double *gridInqXValsPtrSerial(grid_t *gridptr)
return gridptr->x.vals;
}
+#ifndef USE_MPI
static const char **gridInqXCvalsPtrSerial(grid_t *gridptr)
{
return (const char **) gridptr->x.cvals;
}
-
+#endif
const double *gridInqXvalsPtr(int gridID)
{
@@ -3616,22 +3642,25 @@ const double *gridInqXvalsPtr(int gridID)
return gridptr->vtable->inqXValsPtr(gridptr);
}
-
+#ifndef USE_MPI
const char **gridInqXCvalsPtr(int gridID)
{
grid_t *gridptr = grid_to_pointer(gridID);
return gridptr->vtable->inqXCvalsPtr(gridptr);
}
+#endif
static const double *gridInqYValsPtrSerial(grid_t *gridptr)
{
return gridptr->y.vals;
}
+#ifndef USE_MPI
static const char **gridInqYCvalsPtrSerial(grid_t *gridptr)
{
return (const char **) gridptr->y.cvals;
}
+#endif
const double *gridInqYvalsPtr(int gridID)
{
@@ -3639,11 +3668,13 @@ const double *gridInqYvalsPtr(int gridID)
return gridptr->vtable->inqYValsPtr(gridptr);
}
+#ifndef USE_MPI
const char **gridInqYCvalsPtr(int gridID)
{
grid_t *gridptr = grid_to_pointer(gridID);
return gridptr->vtable->inqYCvalsPtr(gridptr);
}
+#endif
/*
@Function gridDefParamLCC
@@ -4910,16 +4941,18 @@ const struct gridVirtTable cdiGridVtable
.inqYVal = gridInqYValSerial,
.inqXVals = gridInqXValsSerial,
.inqXValsPart = gridInqXValsPartSerial,
- .inqXCvals = gridInqXCvalsSerial,
- .inqXIsc = gridInqXIscSerial,
.inqYVals = gridInqYValsSerial,
.inqYValsPart = gridInqYValsPartSerial,
- .inqYCvals = gridInqYCvalsSerial,
- .inqYIsc = gridInqYIscSerial,
.inqXValsPtr = gridInqXValsPtrSerial,
.inqYValsPtr = gridInqYValsPtrSerial,
+#ifndef USE_MPI
+ .inqXIsc = gridInqXIscSerial,
+ .inqYIsc = gridInqYIscSerial,
+ .inqXCvals = gridInqXCvalsSerial,
+ .inqYCvals = gridInqYCvalsSerial,
.inqXCvalsPtr = gridInqXCvalsPtrSerial,
.inqYCvalsPtr = gridInqYCvalsPtrSerial,
+#endif
.compareXYFull = compareXYvals,
.compareXYAO = compareXYvals2,
.inqArea = gridInqAreaSerial,
diff --git a/src/grid.h b/src/grid.h
index e5e0bfd3d..d2f2ab252 100644
--- a/src/grid.h
+++ b/src/grid.h
@@ -32,16 +32,18 @@ struct gridVirtTable
double (*inqYVal)(grid_t *gridptr, size_t index);
size_t (*inqXVals)(grid_t *gridptr, double *xvals);
size_t (*inqXValsPart)(grid_t *gridptr, int start, size_t length, double *xvals);
- size_t (*inqXCvals)(grid_t *gridptr, char **xcvals);
- int (*inqXIsc)(grid_t *gridptr);
size_t (*inqYVals)(grid_t *gridptr, double *yvals);
size_t (*inqYValsPart)(grid_t *gridptr, int start, size_t length, double *yvals);
- size_t (*inqYCvals)(grid_t *gridptr, char **ycvals);
- int (*inqYIsc)(grid_t *gridptr);
const double *(*inqXValsPtr)(grid_t *gridptr);
- const char **(*inqXCvalsPtr)(grid_t *gridptr);
const double *(*inqYValsPtr)(grid_t *gridptr);
+#ifndef USE_MPI
+ int (*inqXIsc)(grid_t *gridptr);
+ int (*inqYIsc)(grid_t *gridptr);
+ size_t (*inqXCvals)(grid_t *gridptr, char **xcvals);
+ size_t (*inqYCvals)(grid_t *gridptr, char **ycvals);
+ const char **(*inqXCvalsPtr)(grid_t *gridptr);
const char **(*inqYCvalsPtr)(grid_t *gridptr);
+#endif
/* return if for both grids, all xval and all yval are equal */
bool (*compareXYFull)(grid_t *gridRef, grid_t *gridTest);
/* return if for both grids, x[0], y[0], x[size-1] and y[size-1] are
@@ -68,9 +70,11 @@ struct gridaxis_t {
short flag; // 0: undefined 1:vals 2:first+inc
double first, last, inc;
double *vals;
+ double *bounds;
+#ifndef USE_MPI
int clength;
char **cvals;
- double *bounds;
+#endif
};
// GME Grid
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index 3a3945db4..896a18d83 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -1988,6 +1988,7 @@ void cdf_load_vals(size_t size, int ndims, int varid, ncvar_t *ncvar, double **g
}
}
+#ifndef USE_MPI
static
void cdf_load_cvals(size_t size, int varid, ncvar_t *ncvar, char ***gridvals, size_t dimlength)
{
@@ -2001,6 +2002,7 @@ void cdf_load_cvals(size_t size, int varid, ncvar_t *ncvar, char ***gridvals, si
startc[0] = i+1;
}
}
+#endif
static
void cdf_load_bounds(size_t size, ncvar_t *ncvar, double **gridbounds, struct cdfLazyGridIds *cellBoundsGet)
@@ -2040,8 +2042,10 @@ void cdf_copy_axis_attr(ncvar_t *ncvar, struct gridaxis_t *gridaxis)
strcpy(gridaxis->name, ncvar->name);
strcpy(gridaxis->longname, ncvar->longname);
strcpy(gridaxis->units, ncvar->units);
+#ifndef USE_MPI
if ( gridaxis->cvals )
gridaxis->stdname = ncvar->stdname;
+#endif
}
static
@@ -2172,8 +2176,10 @@ bool cdf_read_xcoord(struct cdfLazyGrid *restrict lazyGrid, ncdim_t *ncdims, ncv
if ( datatype == CDI_DATATYPE_UINT8 && !CDI_netcdf_lazy_grid_load )
{
+#ifndef USE_MPI
cdf_load_cvals(size, xvarid, axisvar, &grid->x.cvals, *xsize);
grid->x.clength = size / (*xsize) ;
+#endif
}
else
cdf_load_vals(size, ndims, xvarid, axisvar, &grid->x.vals, &lazyGrid->xValsGet, ntdims, start, count);
@@ -2241,8 +2247,10 @@ bool cdf_read_ycoord(struct cdfLazyGrid *restrict lazyGrid, ncdim_t *ncdims, ncv
if ( datatype == CDI_DATATYPE_UINT8 && !CDI_netcdf_lazy_grid_load )
{
+#ifndef USE_MPI
cdf_load_cvals(size, yvarid, axisvar, &grid->y.cvals, *ysize);
grid->y.clength = size / (*ysize) ;
+#endif
}
else
cdf_load_vals(size, ndims, yvarid, axisvar, &grid->y.vals, &lazyGrid->yValsGet, ntdims, start, count);
@@ -2838,6 +2846,7 @@ int cdf_define_all_zaxes(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int
if ( pname[len-2] == '_' && isdigit((int) pname[len-1]) )
pname[len-2] = 0;
*/
+#ifndef USE_MPI
if ( zaxisType == ZAXIS_CHAR )
{
if ( ncvars[zvarid].ndims == 2 )
@@ -2847,6 +2856,7 @@ int cdf_define_all_zaxes(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int
cdf_load_cvals(zsize*zclength, zvarid, ncvar, &zcvals, zsize);
}
}
+#endif
if ( zaxisType == ZAXIS_HYBRID && ncvars[zvarid].vct )
{
--
GitLab