Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • b383306/libcdi
  • mpim-sw/libcdi
  • m214007/libcdi
3 results
Show changes
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ 5179c868
......@@ -4,9 +4,17 @@
* using EXSE library version 2.0.0
* Version 2.4.2 released
2024-06-18 Uwe Schulzweida
2024-06-21 Uwe Schulzweida
* gribapiGetEnsembleInfo: don't check perturbationNumber (bug fix)
2024-06-20 Uwe Schulzweida
* NetCDF4: switched off output chunk cache
2024-06-19 Uwe Schulzweida
* NetCDF4: set always the CDI calculate chunk cache size
* NetCDF4: improved calculation of input chunk cache size
2024-06-17 Uwe Schulzweida
......
NEWS
View file @ 5179c868
......@@ -5,7 +5,7 @@ Version 2.4.1 (21 May 2024):
Changes:
* Removed interface function vlistCopy(), use vlistDuplicate()
* calc_chunk_cache_size: improved for 4D chunked data
* calc_chunk_cache_size: improved for 4D chunked data
Fixed bugs:
* gribapi_get_timeunits: check unitsOfTime (bug fix) [report: Chris Barnard]
......
src/cdf_write.c
View file @ 5179c868
......@@ -38,7 +38,8 @@ cdf_def_var_filter(int ncid, int ncvarID, const char *filterSpec)
for (size_t i = 0; i < nfilters; i++)
{
unsigned int filterid = filters[i]->filterid;
// printf("filter %zu id:%d nparams:%zu param1 %d\n", i + 1, filterid, filters[i]->nparams, filters[i]->params[0]);
// printf("filter %zu id:%d nparams:%zu param1 %d %d\n", i + 1, filterid, filters[i]->nparams, filters[i]->params[0],
// filters[i]->params[1]);
status = nc_def_var_filter(ncid, ncvarID, filterid, filters[i]->nparams, filters[i]->params);
if (status != NC_NOERR)
{
......@@ -940,6 +941,20 @@ cdfGenVarname(int fileID, char name[CDI_MAX_NAME], int pnum, int pcat, int *pdis
*pdis = 255;
}
static void
cdfDefVarChunkCache(int fileID, int ncvarID)
{
size_t size = 0;
size_t nelems = 0;
float preemption = 0;
if (CDI_Chunk_Cache > 0 && nc_get_var_chunk_cache(fileID, ncvarID, &size, &nelems, &preemption) == NC_NOERR)
{
size = CDI_Chunk_Cache;
}
nc_set_var_chunk_cache(fileID, ncvarID, size, nelems, preemption);
}
int
cdfDefVar(stream_t *streamptr, int varID)
{
......@@ -1019,6 +1034,8 @@ cdfDefVar(stream_t *streamptr, int varID)
int ncvarID = -1;
cdf_def_var(fileID, name, xtype, ndims, dims, &ncvarID);
cdfDefVarChunkCache(fileID, ncvarID);
#ifdef HAVE_NETCDF4
#ifdef NC_QUANTIZE_BITROUND
if (xtype == NC_FLOAT || xtype == NC_DOUBLE)
......
src/cdi_int.c
View file @ 5179c868
......@@ -47,7 +47,8 @@ int CDI_Reduce_Dim = 0;
int CDI_Shuffle = 0;
int CDI_Test = 0;
size_t CDI_Netcdf_Hdr_Pad = 0UL;
size_t CDI_Chunk_Cache = 0UL;
bool CDI_Chunk_Cache_Info = false;
long CDI_Chunk_Cache = -1L;
size_t CDI_Chunk_Cache_Max = 0UL;
bool CDI_Netcdf_Lazy_Grid_Load = false;
......@@ -367,8 +368,11 @@ cdiInitialize(void)
value = cdi_getenv_int("CDI_NETCDF_HDR_PAD");
if (value >= 0) CDI_Netcdf_Hdr_Pad = (size_t) value;
value = cdi_getenv_int("CDI_CHUNK_CACHE_INFO");
if (value > 0) CDI_Chunk_Cache_Info = true;
value = cdi_getenv_int("CDI_CHUNK_CACHE");
if (value >= 0) CDI_Chunk_Cache = (size_t) value;
if (value >= 0) CDI_Chunk_Cache = value;
value = cdi_getenv_int("CDI_CHUNK_CACHE_MAX");
if (value >= 0) CDI_Chunk_Cache_Max = (size_t) value;
......@@ -470,13 +474,13 @@ cdiInitialize(void)
if (envstr)
{
// clang-format off
if (strncmp(envstr, "standard", 8) == 0) CDI_Default_Calendar = CALENDAR_STANDARD;
else if (strncmp(envstr, "gregorian", 9) == 0) CDI_Default_Calendar = CALENDAR_GREGORIAN;
else if (strncmp(envstr, "proleptic", 9) == 0) CDI_Default_Calendar = CALENDAR_PROLEPTIC;
else if (strncmp(envstr, "360days", 7) == 0) CDI_Default_Calendar = CALENDAR_360DAYS;
else if (strncmp(envstr, "365days", 7) == 0) CDI_Default_Calendar = CALENDAR_365DAYS;
else if (strncmp(envstr, "366days", 7) == 0) CDI_Default_Calendar = CALENDAR_366DAYS;
else if (strncmp(envstr, "none", 4) == 0) CDI_Default_Calendar = CALENDAR_NONE;
if (strncmp(envstr, "standard", 8) == 0) CDI_Default_Calendar = CALENDAR_STANDARD;
else if (strncmp(envstr, "gregorian", 9) == 0) CDI_Default_Calendar = CALENDAR_GREGORIAN;
else if (strncmp(envstr, "proleptic", 9) == 0) CDI_Default_Calendar = CALENDAR_PROLEPTIC;
else if (strncmp(envstr, "360days", 7) == 0) CDI_Default_Calendar = CALENDAR_360DAYS;
else if (strncmp(envstr, "365days", 7) == 0) CDI_Default_Calendar = CALENDAR_365DAYS;
else if (strncmp(envstr, "366days", 7) == 0) CDI_Default_Calendar = CALENDAR_366DAYS;
else if (strncmp(envstr, "none", 4) == 0) CDI_Default_Calendar = CALENDAR_NONE;
// clang-format on
if (CDI_Debug) Message("Default calendar set to %s!", envstr);
}
......
src/cdi_int.h
View file @ 5179c868
......@@ -408,7 +408,8 @@ extern int CDI_CMOR_Mode;
extern int CDI_Reduce_Dim;
extern int CDI_Shuffle;
extern size_t CDI_Netcdf_Hdr_Pad;
extern size_t CDI_Chunk_Cache;
extern bool CDI_Chunk_Cache_Info;
extern long CDI_Chunk_Cache;
extern size_t CDI_Chunk_Cache_Max;
extern bool CDI_Netcdf_Lazy_Grid_Load;
extern int STREAM_Debug;
......
src/stream_cdf_i.c
View file @ 5179c868
......@@ -112,7 +112,6 @@ typedef struct
size_t gridSize;
size_t xSize;
size_t ySize;
size_t numLevels;
int natts;
int *atts;
size_t vctsize;
......@@ -648,7 +647,6 @@ init_ncvars(int nvars, ncvar_t *ncvars, int ncid)
ncvar->gridSize = 0;
ncvar->xSize = 0;
ncvar->ySize = 0;
ncvar->numLevels = 0;
ncvar->natts = 0;
ncvar->atts = NULL;
ncvar->vctsize = 0;
......@@ -3309,7 +3307,6 @@ cdf_define_all_zaxes(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nvar
return CDI_EDIMSIZE;
}
ncvar->numLevels = zsize;
ncvar->zaxisID = varDefZaxis(vlistID, zaxisType, (int) zsize, zvar, (const char **) zcvals, zclength, withBounds, lbounds,
ubounds, (int) vctsize, vct, pname, plongname, punits, zdatatype, 1, 0, -1);
......@@ -3532,20 +3529,23 @@ size_of_dim_chunks(size_t n, size_t c)
static size_t
calc_chunk_cache_size(int timedimid, ncvar_t *ncvar)
{
size_t nx = 0, ny = 0, nz = 0;
size_t nx = 0, ny = 0;
size_t cx = 0, cy = 0, cz = 0;
for (int i = 0; i < ncvar->ndims; i++)
{
int dimtype = ncvar->dimtypes[i];
// clang-format off
if (dimtype == Z_AXIS) { cz = ncvar->chunks[i]; nz = ncvar->numLevels; }
if (dimtype == Z_AXIS) { cz = ncvar->chunks[i]; }
else if (dimtype == Y_AXIS) { cy = ncvar->chunks[i]; ny = ncvar->ySize; }
else if (dimtype == X_AXIS) { cx = ncvar->chunks[i]; nx = ncvar->xSize; }
// clang-format on
}
size_t chunkCacheSize = (ncvar->dimids[0] == timedimid) ? ncvar->chunks[0] : 1;
if (nz > 0 && cz > 0) chunkCacheSize *= (chunkCacheSize == 1) ? cz : size_of_dim_chunks(nz, cz);
if (cz > 0) chunkCacheSize *= cz;
if (chunkCacheSize == 1) return 0; // no chunk cache needed because the full field is read
if (ny > 0 && cy > 0) chunkCacheSize *= size_of_dim_chunks(ny, cy);
if (nx > 0 && cx > 0) chunkCacheSize *= size_of_dim_chunks(nx, cx);
......@@ -3559,7 +3559,7 @@ calc_chunk_cache_size(int timedimid, ncvar_t *ncvar)
static void
cdf_set_var_chunk_cache(ncvar_t *ncvar, int ncvarid, size_t chunkCacheSize)
{
if (CDI_Debug) Message("%s: chunkCacheSize=%zu", ncvar->name, chunkCacheSize);
if (CDI_Debug || CDI_Chunk_Cache_Info) Message("%s: chunkCacheSize=%zu", ncvar->name, chunkCacheSize);
nc_set_var_chunk_cache(ncvar->ncid, ncvarid, chunkCacheSize, ncvar->chunkCacheNelems, ncvar->chunkCachePreemption);
}
......@@ -3597,7 +3597,7 @@ cdf_define_all_vars(stream_t *streamptr, int vlistID, int instID, int modelID, i
if (ncvar->chunkType != CDI_UNDEFID) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKTYPE, ncvar->chunkType);
if (ncvar->chunkSize > 1) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE, ncvar->chunkSize);
size_t cacheSize = (CDI_Chunk_Cache > 0) ? CDI_Chunk_Cache : calc_chunk_cache_size(timedimid, ncvar);
size_t cacheSize = (CDI_Chunk_Cache >= 0) ? (size_t) CDI_Chunk_Cache : calc_chunk_cache_size(timedimid, ncvar);
cdf_set_var_chunk_cache(ncvar, ncvarid, cacheSize);
}
#endif
......
src/stream_gribapi.c
View file @ 5179c868
......@@ -435,7 +435,7 @@ gribapiGetEnsembleInfo(grib_handle *gh, long *numberOfForecastsInEnsemble, long
if (grib_get_long(gh, "numberOfForecastsInEnsemble", numberOfForecastsInEnsemble) == 0)
{
if (*numberOfForecastsInEnsemble > 0) status = 1;
GRIB_CHECK(grib_get_long(gh, "perturbationNumber", perturbationNumber), 0);
grib_get_long(gh, "perturbationNumber", perturbationNumber);
grib_get_long(gh, "typeOfEnsembleForecast", typeOfEnsembleForecast);
}
......

Imprint | Privacy Policy