mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-21 08:39:46 +08:00
231ae96c4b
* re: https://github.com/Unidata/netcdf-c/pull/2278 * re: https://github.com/Unidata/netcdf-c/issues/2485 * re: https://github.com/Unidata/netcdf-c/issues/2474 This PR subsumes PR https://github.com/Unidata/netcdf-c/pull/2278. Actually is a bit an omnibus covering several issues. ## PR https://github.com/Unidata/netcdf-c/pull/2278 Add support for the Zarr string type. Zarr strings are restricted currently to be of fixed size. The primary issue to be addressed is to provide a way for user to specify the size of the fixed length strings. This is handled by providing the following new attributes special: 1. **_nczarr_default_maxstrlen** — This is an attribute of the root group. It specifies the default maximum string length for string types. If not specified, then it has the value of 64 characters. 2. **_nczarr_maxstrlen** — This is a per-variable attribute. It specifies the maximum string length for the string type associated with the variable. If not specified, then it is assigned the value of **_nczarr_default_maxstrlen**. This PR also requires some hacking to handle the existing netcdf-c NC_CHAR type, which does not exist in zarr. The goal was to choose numpy types for both the netcdf-c NC_STRING type and the netcdf-c NC_CHAR type such that if a pure zarr implementation read them, it would still work and an NC_CHAR type would be handled by zarr as a string of length 1. For writing variables and NCZarr attributes, the type mapping is as follows: * "|S1" for NC_CHAR. * ">S1" for NC_STRING && MAXSTRLEN==1 * ">Sn" for NC_STRING && MAXSTRLEN==n Note that it is a bit of a hack to use endianness, but it should be ok since for string/char, the endianness has no meaning. For reading attributes with pure zarr (i.e. with no nczarr atribute types defined), they will always be interpreted as of type NC_CHAR. ## Issue: https://github.com/Unidata/netcdf-c/issues/2474 This PR partly fixes this issue because it provided more comprehensive support for Zarr attributes that are JSON valued expressions. This PR still does not address the problem in that issue where the _ARRAY_DIMENSION attribute is incorrectly set. Than can only be fixed by the creator of the datasets. ## Issue: https://github.com/Unidata/netcdf-c/issues/2485 This PR also fixes the scalar failure shown in this issue. It generally cleans up scalar handling. It also adds a note to the documentation describing that NCZarr supports scalars while Zarr does not and also how scalar interoperability is achieved. ## Misc. Other Changes 1. Convert the nczarr special attributes and keys to be all lower case. So "_NCZARR_ATTR" now used "_nczarr_attr. Support back compatibility for the upper case names. 2. Cleanup my too-clever-by-half handling of scalars in libnczarr. |
||
|---|---|---|
| .. | ||
| bindata.c | ||
| bytebuffer.c | ||
| bytebuffer.h | ||
| c0_4.cdl | ||
| c0.cdl | ||
| c5.cdl | ||
| cdata.c | ||
| cdfdata.c | ||
| CMakeLists.txt | ||
| cmldata.c | ||
| compound_datasize_test2.cdl | ||
| compound_datasize_test.cdl | ||
| ctests.sh | ||
| cvt.c | ||
| data.c | ||
| data.h | ||
| debug.c | ||
| debug.h | ||
| depend | ||
| dump.c | ||
| dump.h | ||
| env | ||
| escapes.c | ||
| f77data.c | ||
| foo.cdl | ||
| ftests.sh | ||
| genbin.c | ||
| genc.c | ||
| genchar.c | ||
| gencml.c | ||
| generate.c | ||
| generate.h | ||
| generr.c | ||
| generr.h | ||
| genf77.c | ||
| genj.c | ||
| genjjni.c | ||
| genjstd.c | ||
| genlib.c | ||
| genlib.h | ||
| getfill.c | ||
| includes.h | ||
| internals.html | ||
| jdata.c | ||
| jdatajni.c | ||
| jdatastd.c | ||
| jtests.sh | ||
| lfs-tests | ||
| list.c | ||
| list.h | ||
| main_cpp.cpp | ||
| main.c | ||
| Makefile.am | ||
| makeparser.sh | ||
| ncf199.cdl | ||
| ncf345.cdl | ||
| ncgen.1 | ||
| ncgen.h | ||
| ncgen.l | ||
| ncgen.y | ||
| ncgenl.c | ||
| ncgeny.c | ||
| ncgeny.h | ||
| odom.c | ||
| odom.h | ||
| ref_camrun.cdl | ||
| run_tests2.sh | ||
| semantics.c | ||
| tst_gattenum.cdl | ||
| tst_usuffix.cdl | ||
| util.c | ||
| util.h | ||