From 3e5fe7543777363b08d5df08a80e6cdc1c802672 Mon Sep 17 00:00:00 2001
From: Uwe Schulzweida <uwe.schulzweida@mpimet.mpg.de>
Date: Tue, 18 Jun 2024 19:12:05 +0200
Subject: [PATCH] NetCDF4: set always the CDI calculate chunk cache size
---
ChangeLog | 6 +++++-
src/stream_cdf_i.c | 7 ++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7d44838ba..39a577e77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
-2024-10-21 Uwe Schulzweida
+2024-06-21 Uwe Schulzweida
* using CGRIBEX library version 2.3.0
* using EXSE library version 2.0.0
* Version 2.4.2 released
+2024-06-18 Uwe Schulzweida
+
+ * NetCDF4: set always the CDI calculate chunk cache size
+
2024-06-17 Uwe Schulzweida
* streamDefFilter(): changed interface
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index b6ea1cfef..89dd81a5d 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -3597,11 +3597,8 @@ 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 varChunkCacheSize = calc_chunk_cache_size(timedimid, ncvar);
- if (CDI_Chunk_Cache > 0)
- cdf_set_var_chunk_cache(ncvar, ncvarid, CDI_Chunk_Cache);
- else if (varChunkCacheSize > ncvar->chunkCacheSize)
- cdf_set_var_chunk_cache(ncvar, ncvarid, varChunkCacheSize);
+ size_t cacheSize = (CDI_Chunk_Cache > 0) ? CDI_Chunk_Cache : calc_chunk_cache_size(timedimid, ncvar);
+ cdf_set_var_chunk_cache(ncvar, ncvarid, cacheSize);
}
#endif
--
GitLab