mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
ec5b3f9a4f
This is a follow-on to pull request ````https://github.com/Unidata/netcdf-c/pull/1959````, which fixed up type scoping. The primary changes are to _nc\_inq\_dimid()_ and to ncdump. The _nc\_inq\_dimid()_ function is supposed to allow the name to be and FQN, but this apparently never got implemented. So if was modified to support FQNs. The ncdump program is supposed to output fully qualified dimension names in its generated CDL file under certain conditions. Suppose ncdump has a netcdf-4 file F with variable V, and V's parent group is G. For each dimension id D referenced by V, ncdump needs to determine whether to print its name as a simple name or as a fully qualified name (FQN). The algorithm is as follows: 1. Search up the tree of ancestor groups. 2. If one of those ancestor groups contains the dimid, then call it dimgrp. 3. If one of those ancestor groups contains a dim with the same name as the dimid, but with a different dimid, then record that as duplicate=true. 4. If dimgrp is defined and duplicate == false, then we do not need an fqn. 5. If dimgrp is defined and duplicate == true, then we do need an fqn to avoid incorrectly using the duplicate. 6. If dimgrp is undefined, then do a preorder breadth-first search of all the groups looking for the dimid. 7. If found, then use the fqn of the first found such dimension location. 8. If not found, then fail. Test case ncdump/test_scope.sh was modified to test the proper operation of ncdump and _nc\_inq\_dimid()_. Misc. Other Changes: * Fix nc_inq_ncid (NC4_inq_ncid actually) to return root group id if the name argument is NULL. * Modify _ncdump/printfqn_ to print out a dimid FQN; this supports verification that the resulting .nc files were properly created.
19 lines
522 B
Plaintext
19 lines
522 B
Plaintext
netcdf scope_preorder {
|
|
|
|
group: preorder {
|
|
types:
|
|
ubyte enum test_enum_type {OPTION1 = 0, OPTION2 = 1, OPTION3 = 2} ;
|
|
dimensions:
|
|
d1 = 1 ;
|
|
d2 = 1 ;
|
|
} // group preorder
|
|
|
|
group: test_group {
|
|
variables:
|
|
/preorder/test_enum_type test_variable(/preorder/d1, /preorder/d2) ;
|
|
/preorder/test_enum_type test_variable:_FillValue = OPTION1 ;
|
|
/preorder/test_enum_type test_variable2(/preorder/d1, /preorder/d2) ;
|
|
/preorder/test_enum_type test_variable2:_FillValue = OPTION1 ;
|
|
} // group test_group
|
|
}
|