From fa2c92119753571044882db3ca2b8c19a105a908 Mon Sep 17 00:00:00 2001
From: Uwe Schulzweida <uwe.schulzweida@mpimet.mpg.de>
Date: Wed, 5 Feb 2025 14:41:55 +0100
Subject: [PATCH] Removed CDI_KEY_CHUNKS
---
src/cdi.h | 1 -
src/stream_cdf_i.c | 21 ---------------------
2 files changed, 22 deletions(-)
diff --git a/src/cdi.h b/src/cdi.h
index 89fa33561..060f5b2bb 100644
--- a/src/cdi.h
+++ b/src/cdi.h
@@ -837,7 +837,6 @@ SizeType gridInqYCvals(int gridID, char *ycvals[]);
#define CDI_KEY_UNITS 945 // Units of the variable
#define CDI_KEY_DATATYPE 946 // Data type
#define CDI_KEY_REFERENCEURI 947 // Reference URI to grid file
-#define CDI_KEY_CHUNKS 948 // Chunks
// Integer keys
#define CDI_KEY_NUMBEROFGRIDUSED 961 // GRIB2 numberOfGridUsed
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index a8e13fb88..7cbecd140 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -140,7 +140,6 @@ typedef struct
char longname[CDI_MAX_NAME];
char stdname[CDI_MAX_NAME];
char units[CDI_MAX_NAME];
- char extra[CDI_MAX_NAME];
char filterSpec[CDI_MAX_NAME];
} ncvar_t;
@@ -678,7 +677,6 @@ init_ncvars(int nvars, ncvar_t *ncvars, int ncid)
memset(ncvar->longname, 0, CDI_MAX_NAME);
memset(ncvar->stdname, 0, CDI_MAX_NAME);
memset(ncvar->units, 0, CDI_MAX_NAME);
- memset(ncvar->extra, 0, CDI_MAX_NAME);
memset(ncvar->filterSpec, 0, CDI_MAX_NAME);
}
}
@@ -1059,21 +1057,6 @@ cdf_get_cell_varid(char *attstring, int ncid)
return nc_cell_id;
}
-static void
-set_extra_attr(char *buf, int nvdims, const size_t *chunks)
-{
- size_t pos = strlen(buf);
- static const char prefix[] = "chunks=";
- memcpy(buf + pos, prefix, sizeof(prefix));
- pos += sizeof(prefix) - 1;
- for (int i = nvdims - 1; i >= 0; --i)
- {
- pos += (size_t) (snprintf(buf + pos, CDI_MAX_NAME - pos, "%zu%s", chunks[i], i > 0 ? "x" : ""));
- }
- buf[pos] = ' ';
- buf[pos + 1] = 0;
-}
-
static bool
is_valid_coordinate(ncvar_t *ncvar)
{
@@ -1186,8 +1169,6 @@ set_vars_chunks(int ncid, int ncvarid, int nvdims, ncvar_t *ncvar)
for (int i = 0; i < nvdims; ++i) fprintf(stderr, "%zu ", chunks[i]);
fprintf(stderr, "\n");
}
-
- set_extra_attr(ncvar->extra, nvdims, chunks);
}
}
@@ -3724,8 +3705,6 @@ cdf_define_all_vars(stream_t *streamptr, int vlistID, int instID, int modelID, i
if (ncvar->numberOfForecastsInEnsemble != -1)
cdiDefKeyInt(vlistID, varID, CDI_KEY_TYPEOFENSEMBLEFORECAST, ncvar->typeOfEnsembleForecast);
}
-
- if (ncvar->extra[0] != 0) cdiDefKeyString(vlistID, varID, CDI_KEY_CHUNKS, ncvar->extra);
}
for (int varID = 0; varID < nvars; varID++)
--
GitLab