From 957d53fd841e4b67d24aa91bffbaefbfb1faadc4 Mon Sep 17 00:00:00 2001 From: David Hassell Date: Tue, 30 Jul 2024 15:30:26 +0100 Subject: [PATCH] dev --- appl.adoc | 8 ++++---- ch02.adoc | 6 +++--- toc-extra.adoc | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/appl.adoc b/appl.adoc index b4f98e0c..8628f7ae 100644 --- a/appl.adoc +++ b/appl.adoc @@ -492,7 +492,7 @@ variables: uid:long_name = "Fragment dataset unique identifiers" ; uid:missing_value = "N/A" ; uid:aggregated_dimensions = "time" ; - uid:aggregated_data = "value: fragment_value + uid:aggregated_data = "value: fragment_value_uid shape: fragment_shape_uid"; // Coordinate variables double time(time) ; @@ -511,7 +511,7 @@ variables: string fragment_location(f_time, f_level, f_latitude, f_longitude) ; string fragment_address ; int fragment_shape(j, i) ; - string fragment_value(f_time) ; + string fragment_value_uid(f_time) ; int fragment_shape_uid(j_uid, i) ; data: @@ -526,10 +526,10 @@ data: 1, _, 73, _, 144, _ ; - fragment_value = "04821b9-7eb5-4046-937b-0bf0588", "056d1ee0-a183-43b3-ae67-1ec632a" ; + fragment_value_uid = "04b9-7eb5-4046-97b-0bf8", "05ee0-a183-43b3-a67-1eca" ; fragment_shape_uid = 3, 9 ; ---- -This example is similar to <>, but now there is the aggregation ancillary variable `uid` which defines its fragments as constant values stored int he `fragment_value` variable,that are intended to be broadcast across its aggregated data. +This example is similar to <>, but now there is the aggregation ancillary variable `uid` which defines its fragments from the constant values stored in the `fragment_value_uid` variable, that are intended to be broadcast across the `time` aggregated dimension. The data for the `level`, `latitude` and `longitude` variables are omitted for clarity. ==== diff --git a/ch02.adoc b/ch02.adoc index c4d44367..89eaa1e2 100644 --- a/ch02.adoc +++ b/ch02.adoc @@ -309,13 +309,13 @@ The aggregated dimensions must exist as dimensions in the aggregation file. The fragments which provide the aggregated data are conceptually organised into a __fragment array__ that has the same number of dimensions as the aggregated data. Each dimension of the fragment array is called a __fragment array dimension__, and corresponds to the aggregated dimension with the same position in the aggregated data. The size of a fragment array dimension is equal to the number of fragments that are needed to span its corresponding aggregated dimension. -See <>. +See the <>. The aggregated data are created by concatenating the canonical forms of the fragments' data (see <>) along each fragment array dimension, and in the order in which they appear in the fragment array. [[example-fragment-array]] [caption="Example 2.2. "] -.A schematic representation of a fragment array for aggregated data +.Schematic representation of a fragment array for aggregated data ==== [cols="a,a"] |=============== @@ -384,7 +384,7 @@ The integer-valued `shape` fragment array variable defines the shape of each fra In general, the `shape` fragment array variable is two-dimensional, with the size of the slower-varying dimension (i.e. the first dimension in CDL order, representing rows) being the number of fragment array dimensions, and the size of the more rapidly-varying dimension (i.e. the second dimension in CDL order, representing columns) being the size of the largest fragment array dimension. The rows correspond to the fragment array dimensions in the same order, and each row provides the sizes of the fragments along its corresponding dimension of the fragment array, padded with missing values if there are fewer fragments than the number of columns. The sum of non-missing values in a row must therefore equal the size of the corresponding aggregated dimension. -See <>, which shows the `shape` fragment array variable for the fragment array described by <>. +See <>, which shows the `shape` fragment array variable for the fragment array described by the <>. If the aggregated data is scalar then the `shape` fragment array variable must be a scalar and contain the value `1`. See <>. diff --git a/toc-extra.adoc b/toc-extra.adoc index 90f62195..981aa3e5 100644 --- a/toc-extra.adoc +++ b/toc-extra.adoc @@ -37,7 +37,7 @@ J.5. <> [%hardbreaks] 2.1. <> -2.2 <> +2.2. <> 3.1. <> 3.2. <> 3.3. <> @@ -121,11 +121,11 @@ H.20. <> H.21. <> H.22. <> I.1. <> -L.1 <> -L.2 <> -L.3 <> -L.4 <> -L.5 <> -L.6 <> -L.7 <> -L.8 <> +L.1. <> +L.2. <> +L.3. <> +L.4. <> +L.5. <> +L.6. <> +L.7. <> +L.8. <>