Skip to content

Commit 1368c79

Browse files
mo-marqhmo-marqh
authored
Merge pull request #93 from marqh/broadcast
Broadcast - Identity - adopt OGC NA
2 parents 5fc06ef + 5ac9531 commit 1368c79

29 files changed

+864
-709
lines changed

‎lib/bald/__init__.py

Lines changed: 165 additions & 94 deletions
Large diffs are not rendered by default.

‎lib/bald/tests/integration/CDL/GEMS_CO2_Apr2006.cdl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ variables:
2525
co2:long_name = "Carbon Dioxide" ;
2626
co2:standard_name = "mass_fraction_of_carbon_dioxide_in_air" ;
2727
short lnsp(time, levelist, latitude, longitude) ;
28-
lnsp:scale_factor = 1.03952457840347e-05 ;
2928
lnsp:add_offset = 11.2087164280841 ;
3029
lnsp:_FillValue = -32767s ;
3130
lnsp:missing_value = -32767s ;

‎lib/bald/tests/integration/CDL/ProcessChain0300.cdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ group: prefix_list {
2121
:DA__ = "https://codes.nws.noaa.gov/DataAssimilation" ;
2222
:NWP__ = "https://codes.nws.noaa.gov/NumericalWeatherPrediction" ;
2323
:StatPP__ = "https://codes.nws.noaa.gov/StatisticalPostProcessing" ;
24-
:bald__ = "http://binary-array-ld.net/latest/" ;
24+
:bald__ = "https://www.opengis.net/def/binary-array-ld/" ;
2525

2626
} // group bald__prefix_list
2727
}

‎lib/bald/tests/integration/CDL/array_geo.cdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dimensions:
44
pdim1 = 17 ;
55
variables:
66
int prefix_list ;
7-
prefix_list:bald__ = "http://binary-array-ld.net/latest/" ;
7+
prefix_list:bald__ = "https://www.opengis.net/def/binary-array-ld/" ;
88
prefix_list:rdf__ = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" ;
99
prefix_list:rdfs__ = "http://www.w3.org/2000/01/rdf-schema#" ;
1010
prefix_list:cf__ = "http://def.scitools.org.uk/CFTerms/" ;

‎lib/bald/tests/integration/CDL/array_multitypes.cdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dimensions:
44
pdim1 = 17 ;
55
variables:
66
int prefix_list ;
7-
prefix_list:bald__ = "http://binary-array-ld.net/latest/" ;
7+
prefix_list:bald__ = "https://www.opengis.net/def/binary-array-ld/" ;
88
prefix_list:rdf__ = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" ;
99
prefix_list:rdfs__ = "http://www.w3.org/2000/01/rdf-schema#" ;
1010
prefix_list:cf__ = "http://def.scitools.org.uk/CFTerms/" ;

‎lib/bald/tests/integration/CDL/array_reference.cdl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ variables:
88
parent_variable:bald__references = "child_variable" ;
99
int child_variable(pdim0, pdim1) ;
1010
child_variable:rdf__type = "bald__Reference" ;
11-
child_variable:bald__array = "child_variable" ;
12-
int prefix_list ;
13-
prefix_list:bald__ = "http://binary-array-ld.net/latest/" ;
11+
int prefix_list ;
12+
prefix_list:bald__ = "https://www.opengis.net/def/binary-array-ld/" ;
1413
prefix_list:rdf__ = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" ;
1514

1615
// global attributes:

‎lib/bald/tests/integration/CDL/ereefs_gbr4_ncld.cdl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ variables:
8282
salt:coordinates = "time zc latitude longitude" ;
8383
salt:units = "PSU" ;
8484
salt:long_name = "Salinity" ;
85-
salt:valid_range = 0.f, 40.f ;
8685
salt:missing_value = 1.e+35f ;
8786
salt:medium_id = "http://environment.data.gov.au/def/feature/ocean" ;
8887
salt:scaledQuantityKind_id = "http://environment.data.gov.au/def/property/practical_salinity" ;
@@ -93,7 +92,7 @@ variables:
9392
temp:coordinates = "time zc latitude longitude" ;
9493
temp:units = "degrees C" ;
9594
temp:long_name = "Temperature" ;
96-
temp:valid_range = 0.f, 40.f ;
95+
temp:valid_range = -3.f, 40.f ;
9796
temp:missing_value = 1.e+35f ;
9897
temp:medium_id = "http://environment.data.gov.au/def/feature/ocean" ;
9998
temp:scaledQuantityKind_id = "http://environment.data.gov.au/def/property/sea_water_temperature" ;
@@ -129,7 +128,7 @@ variables:
129128

130129
group: prefix_list {
131130
// group attributes:
132-
:bald__ = "http://binary-array-ld.net/latest/" ;
131+
:bald__ = "https://www.opengis.net/def/binary-array-ld/" ;
133132
:rdf__ = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" ;
134133
} // group bald__prefix_list
135134

‎lib/bald/tests/integration/CDL/multi_array_reference.cdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dimensions:
44
pdim1 = 17 ;
55
variables:
66
int prefix_list ;
7-
prefix_list:bald__ = "http://binary-array-ld.net/latest/" ;
7+
prefix_list:bald__ = "https://www.opengis.net/def/binary-array-ld/" ;
88
prefix_list:metce__ = "http://codes.wmo.int/common/observation-type/METCE/2013/" ;
99
prefix_list:rdf__ = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" ;
1010

‎lib/bald/tests/integration/CDL/votemper.cdl

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
netcdf orca2_votemper {
2+
dimensions:
3+
dim0 = 148 ;
4+
dim1 = 180 ;
5+
bnds = 2 ;
6+
bnds_4 = 4 ;
7+
time = 4 ;
8+
deptht = 4 ;
9+
percentiles = 19 ;
10+
variables:
11+
float votemper(time, deptht, dim0, dim1) ;
12+
votemper:_FillValue = 9.96921e+36f ;
13+
votemper:standard_name = "sea_water_potential_temperature" ;
14+
votemper:long_name = "Temperature" ;
15+
votemper:units = "degC" ;
16+
votemper:cell_methods = "time: mean" ;
17+
votemper:coordinates = "deptht nav_lat nav_lon time" ;
18+
votemper:ancillary_variables = "votemper_pdf" ;
19+
float votemper_pdf(percentiles, time, deptht, dim0, dim1) ;
20+
votemper_pdf:_FillValue = 9.96921e+36f ;
21+
votemper_pdf:standard_name = "sea_water_potential_temperature" ;
22+
votemper_pdf:long_name = "Temperature" ;
23+
votemper_pdf:units = "degC" ;
24+
votemper_pdf:coordinates = "deptht nav_lat nav_lon time" ;
25+
float percentiles(percentiles) ;
26+
percentiles:units = "1" ;
27+
percentiles:long_name = "percentile" ;
28+
float deptht(deptht) ;
29+
deptht:bounds = "deptht_bnds" ;
30+
deptht:units = "m" ;
31+
deptht:standard_name = "depth" ;
32+
deptht:long_name = "Vertical T levels" ;
33+
deptht:positive = "down" ;
34+
deptht:title = "deptht" ;
35+
double deptht_bnds(deptht, bnds) ;
36+
float nav_lat(dim0, dim1) ;
37+
nav_lat:bounds = "nav_lat_bnds" ;
38+
nav_lat:units = "degrees" ;
39+
nav_lat:standard_name = "latitude" ;
40+
nav_lat:long_name = "Latitude" ;
41+
nav_lat:nav_model = "Default grid" ;
42+
double nav_lat_bnds(dim0, dim1, bnds_4) ;
43+
float nav_lon(dim0, dim1) ;
44+
nav_lon:bounds = "nav_lon_bnds" ;
45+
nav_lon:units = "degrees" ;
46+
nav_lon:standard_name = "longitude" ;
47+
nav_lon:long_name = "Longitude" ;
48+
nav_lon:nav_model = "Default grid" ;
49+
double nav_lon_bnds(dim0, dim1, bnds_4) ;
50+
int time(time) ;
51+
time:units = "hours since 2001-01-01 00:00:00" ;
52+
time:standard_name = "time" ;
53+
time:long_name = "Time axis" ;
54+
time:calendar = "360_day" ;
55+
time:time_origin = "2001-JAN-01 00:00:00" ;
56+
time:title = "Time" ;
57+
58+
// global attributes:
59+
:Conventions = "CF-1.5" ;
60+
61+
data:
62+
time = 0, 24, 48, 72 ;
63+
deptht = 0., 10., 100., 1000. ;
64+
percentiles = 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95 ;
65+
66+
}

‎lib/bald/tests/integration/HTML/array_reference.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,11 @@
174174
return cell;
175175
};
176176

177-
var file://CDL/array_reference.cdl = instance('file://CDL/array_reference.cdl:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
178-
var file://CDL/array_reference.cdl/child_variable = instance('file://CDL/array_reference.cdl/child_variable:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
179-
var file://CDL/array_reference.cdl/parent_variable = instance('file://CDL/array_reference.cdl/parent_variable:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
180-
link(file://CDL/array_reference.cdl, file://CDL/array_reference.cdl/child_variable, 'bald__contains', 'top', true);
181-
link(file://CDL/array_reference.cdl, file://CDL/array_reference.cdl/parent_variable, 'bald__contains', 'top', true);
182-
link(file://CDL/array_reference.cdl/child_variable, file://CDL/array_reference.cdl/child_variable, 'bald__array', 'bottom');
177+
var file://CDL/array_reference.cdl/ = instance('file://CDL/array_reference.cdl/:<a xlink:href="https://www.opengis.net/def/binary-array-ld/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="https://www.opengis.net/def/binary-array-ld/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
178+
var file://CDL/array_reference.cdl/child_variable = instance('file://CDL/array_reference.cdl/child_variable:<a xlink:href="https://www.opengis.net/def/binary-array-ld/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="https://www.opengis.net/def/binary-array-ld/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="https://www.opengis.net/def/binary-array-ld/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
179+
var file://CDL/array_reference.cdl/parent_variable = instance('file://CDL/array_reference.cdl/parent_variable:<a xlink:href="https://www.opengis.net/def/binary-array-ld/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="https://www.opengis.net/def/binary-array-ld/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="https://www.opengis.net/def/binary-array-ld/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
180+
link(file://CDL/array_reference.cdl/, file://CDL/array_reference.cdl/child_variable, 'bald__contains', 'top', true);
181+
link(file://CDL/array_reference.cdl/, file://CDL/array_reference.cdl/parent_variable, 'bald__contains', 'top', true);
183182
link(file://CDL/array_reference.cdl/parent_variable, file://CDL/array_reference.cdl/child_variable, 'bald__references');
184183
joint.layout.DirectedGraph.layout(graph, { setLinkVertices: false,
185184
nodeSep: 150, rankSep: 100,

0 commit comments

Comments
 (0)