mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-11 16:40:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Decided that dap4 <Map>'s that refer to struct

Browse Source 
or seq fields is not a well-defined concept. So
for now, I am disallowing them.  Required
updating a number of test files in
dap4_test. This is tagged by the line
#undef ALLOWFIELDMAPS
in ./libdap4/ncd4types.h.  This should
affect only dap4 and nothing else.
This commit is contained in:
Dennis Heimbigner 2017-05-17 17:53:59 -06:00
parent 132ac21c46
commit 3a74ee9a94
51 changed files with 15 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dap4_test/baseline/test_struct1.nc.d4d
View File

@ -6,7 +6,6 @@ types:
}; // s_t
variables:
s_t s ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baseline/test_struct1.nc.d4m
View File

@ -6,7 +6,6 @@ types:
}; // s_t
variables:
s_t s ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

5
dap4_test/baseline/test_struct1.nc.d4p
View File

@ -11,10 +11,7 @@
</Structure>
</Types>
<Variables>
<Struct name="s" type="/s">
<Map name="/s.x"/>
<Map name="/s.y"/>
</Struct>
<Struct name="s" type="/s"/>
</Variables>
<Attribute name="_DAP4_Little_Endian" type="UInt8">
<Value value="1"/>

1
dap4_test/baseline/test_struct_array.6.nc.d4d
View File

@ -8,7 +8,6 @@ dimensions:
_Anonymous2 = 2 ;
variables:
s_t s(_Anonymous2, _Anonymous2) ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
string :_dap4.ce = "/s[0:2:3][0:1]" ;

1
dap4_test/baseline/test_struct_array.6.nc.d4m
View File

@ -8,7 +8,6 @@ dimensions:
_Anonymous2 = 2 ;
variables:
s_t s(_Anonymous2, _Anonymous2) ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
string :_dap4.ce = "/s[0:2:3][0:1]" ;

2
dap4_test/baseline/test_struct_array.6.nc.d4p
View File

@ -17,8 +17,6 @@
<Struct name="s" type="/s">
<Dim name="/_Anonymous2"/>
<Dim name="/_Anonymous2"/>
<Map name="/s.x"/>
<Map name="/s.y"/>
</Struct>
</Variables>
<Attribute name="_dap4.ce" type="String">

1
dap4_test/baseline/test_struct_array.nc.d4d
View File

@ -9,7 +9,6 @@ dimensions:
dy = 3 ;
variables:
s_t s(dx, dy) ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baseline/test_struct_array.nc.d4m
View File

@ -9,7 +9,6 @@ dimensions:
dy = 3 ;
variables:
s_t s(dx, dy) ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

2
dap4_test/baseline/test_struct_array.nc.d4p
View File

@ -18,8 +18,6 @@
<Struct name="s" type="/s">
<Dim name="/dx"/>
<Dim name="/dy"/>
<Map name="/s.x"/>
<Map name="/s.y"/>
</Struct>
</Variables>
<Attribute name="_DAP4_Little_Endian" type="UInt8">

2
dap4_test/baseline/test_struct_array.syn.d4d
View File

@ -11,7 +11,7 @@ variables:
float z(dx) ;
float t(dy) ;
s_t s(dx, dy) ;
string s:_edu.ucar.maps = "/z", "/t" ;
string s:_edu.ucar.maps = "/z", "/t" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

2
dap4_test/baseline/test_struct_array.syn.d4m
View File

@ -11,7 +11,7 @@ variables:
float z(dx) ;
float t(dy) ;
s_t s(dx, dy) ;
string s:_edu.ucar.maps = "/z", "/t" ;
string s:_edu.ucar.maps = "/z", "/t" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baseline/test_struct_nested.nc.d4d
View File

@ -14,7 +14,6 @@ types:
}; // x_t
variables:
x_t x ;
string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baseline/test_struct_nested.nc.d4m
View File

@ -14,7 +14,6 @@ types:
}; // x_t
variables:
x_t x ;
string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

5
dap4_test/baseline/test_struct_nested.nc.d4p
View File

@ -19,10 +19,7 @@
</Structure>
</Types>
<Variables>
<Struct name="x" type="/x">
<Map name="/x_field1.x"/>
<Map name="/x_field1.y"/>
</Struct>
<Struct name="x" type="/x"/>
</Variables>
<Attribute name="_DAP4_Little_Endian" type="UInt8">
<Value value="1"/>

1
dap4_test/baseline/test_struct_type.nc.d4d
View File

@ -6,7 +6,6 @@ types:
}; // s_t
variables:
s_t s ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baseline/test_struct_type.nc.d4m
View File

@ -6,7 +6,6 @@ types:
}; // s_t
variables:
s_t s ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

5
dap4_test/baseline/test_struct_type.nc.d4p
View File

@ -11,10 +11,7 @@
</Structure>
</Types>
<Variables>
<Struct name="s" type="/s">
<Map name="/s.x"/>
<Map name="/s.y"/>
</Struct>
<Struct name="s" type="/s"/>
</Variables>
<Attribute name="_DAP4_Little_Endian" type="UInt8">
<Value value="1"/>

1
dap4_test/baselineraw/test_struct1.nc.dmp
View File

@ -6,7 +6,6 @@ types:
}; // s_t
variables:
s_t s ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baselineraw/test_struct_array.6.nc.dmp
View File

@ -8,7 +8,6 @@ dimensions:
_Anonymous2 = 2 ;
variables:
s_t s(_Anonymous2, _Anonymous2) ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
string :_dap4.ce = "/s[0:2:3][0:1]" ;

1
dap4_test/baselineraw/test_struct_array.nc.dmp
View File

@ -9,7 +9,6 @@ dimensions:
dy = 3 ;
variables:
s_t s(dx, dy) ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baselineraw/test_struct_nested.nc.dmp
View File

@ -14,7 +14,6 @@ types:
}; // x_t
variables:
x_t x ;
string x:_edu.ucar.maps = "/x_field1.x", "/x_field1.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

1
dap4_test/baselineraw/test_struct_type.nc.dmp
View File

@ -6,7 +6,6 @@ types:
}; // s_t
variables:
s_t s ;
string s:_edu.ucar.maps = "/s.x", "/s.y" ;
// global attributes:
:_DAP4_Little_Endian = 1UB ;

BIN
dap4_test/daptestfiles/test_atomic_array.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_atomic_array.syn.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_atomic_types.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_atomic_types.syn.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_enum.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_enum_2.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_enum_array.4.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_enum_array.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_struct1.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_struct_array.6.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_struct_array.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_struct_nested.nc.dap
View File

Binary file not shown.

BIN
dap4_test/daptestfiles/test_struct_type.nc.dap
View File

Binary file not shown.

2
dap4_test/dmrtestfiles/test_atomic_array.nc.dmr
View File

@ -51,7 +51,7 @@
</Opaque>
<Enum name="primary_cloud" enum="/cloud_class_t">
<Dim name="/d5"/>
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

2
dap4_test/dmrtestfiles/test_atomic_array.syn.dmr
View File

@ -51,7 +51,7 @@
</Opaque>
<Enum name="primary_cloud" enum="/cloud_class_t">
<Dim name="/d5"/>
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

4
dap4_test/dmrtestfiles/test_atomic_types.nc.dmr
View File

@ -33,12 +33,12 @@
<String name="vs"/>
<Opaque name="vo" _edu.ucar.opaque.size="8"/>
<Enum name="primary_cloud" enum="/cloud_class_t">
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>
<Enum name="secondary_cloud" enum="/cloud_class_t">
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

4
dap4_test/dmrtestfiles/test_atomic_types.syn.dmr
View File

@ -33,12 +33,12 @@
<String name="vs"/>
<Opaque name="vo"/>
<Enum name="primary_cloud" enum="/cloud_class_t">
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>
<Enum name="secondary_cloud" enum="/cloud_class_t">
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

2
dap4_test/dmrtestfiles/test_enum.nc.dmr
View File

@ -20,7 +20,7 @@
<EnumConst name="Missing" value="127"/>
</Enumeration>
<Enum name="primary_cloud" enum="/cloud_class_t">
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

2
dap4_test/dmrtestfiles/test_enum_2.nc.dmr
View File

@ -24,7 +24,7 @@
</Attribute>
<Group name="h">
<Enum name="primary_cloud" enum="/cloud_class_t">
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

2
dap4_test/dmrtestfiles/test_enum_array.4.nc.dmr
View File

@ -21,7 +21,7 @@
</Enumeration>
<Enum name="primary_cloud" enum="/cloud_class_t">
<Dim size="2"/>
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

2
dap4_test/dmrtestfiles/test_enum_array.nc.dmr
View File

@ -22,7 +22,7 @@
</Enumeration>
<Enum name="primary_cloud" enum="/cloud_class_t">
<Dim name="/d5"/>
<Attribute name="_FillValue" type="String">
<Attribute name="_FillValue" type="/cloud_class_t">
<Value value="Missing"/>
</Attribute>
</Enum>

2
dap4_test/dmrtestfiles/test_struct1.nc.dmr
View File

@ -8,8 +8,6 @@
<Structure name="s">
<Int32 name="x"/>
<Int32 name="y"/>
<Map name="/s.x"/>
<Map name="/s.y"/>
</Structure>
<Attribute name="_DAP4_Little_Endian" type="UInt8">
<Value value="1"/>

2
dap4_test/dmrtestfiles/test_struct_array.6.nc.dmr
View File

@ -10,8 +10,6 @@
<Int32 name="y"/>
<Dim size="2"/>
<Dim size="2"/>
<Map name="/s.x"/>
<Map name="/s.y"/>
</Structure>
<Attribute name="_dap4.ce" type="String">
<Value value="/s[0:2:3][0:1]"/>

2
dap4_test/dmrtestfiles/test_struct_array.nc.dmr
View File

@ -12,8 +12,6 @@
<Int32 name="y"/>
<Dim name="/dx"/>
<Dim name="/dy"/>
<Map name="/s.x"/>
<Map name="/s.y"/>
</Structure>
<Attribute name="_DAP4_Little_Endian" type="UInt8">
<Value value="1"/>

2
dap4_test/dmrtestfiles/test_struct_nested.nc.dmr
View File

@ -14,8 +14,6 @@
<Int32 name="x"/>
<Int32 name="y"/>
</Structure>
<Map name="/x.field1.x"/>
<Map name="/x.field1.y"/>
</Structure>
<Attribute name="_DAP4_Little_Endian" type="UInt8">
<Value value="1"/>

2
dap4_test/dmrtestfiles/test_struct_type.nc.dmr
View File

@ -8,8 +8,6 @@
<Structure name="s">
<Int32 name="x"/>
<Int32 name="y"/>
<Map name="/s.x"/>
<Map name="/s.y"/>
</Structure>
<Attribute name="_DAP4_Little_Endian" type="UInt8">
<Value value="1"/>

BIN
dap4_test/nctestfiles/test_atomic_array.nc
View File

Binary file not shown.

BIN
dap4_test/nctestfiles/test_atomic_types.nc
View File

Binary file not shown.

BIN
dap4_test/nctestfiles/test_unlim1.nc
View File

Binary file not shown.