From a14b14bf0e32be11fa3b835a0df12a557fde891e Mon Sep 17 00:00:00 2001 From: Dave Allured Date: Fri, 10 Nov 2023 15:04:18 -0700 Subject: [PATCH 1/8] Allow period and hyphen in attribute names --- ch02.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/ch02.adoc b/ch02.adoc index b819130c..942f81b9 100644 --- a/ch02.adoc +++ b/ch02.adoc @@ -56,6 +56,7 @@ The examples in this document that use string-valued variables alternate between Variable, dimension, attribute and group names should begin with a letter and be composed of letters, digits, and underscores. Note that this is in conformance with the COARDS conventions, but is more restrictive than the netCDF interface which allows use of the hyphen character. The netCDF interface also allows leading underscores in names, but the NUG states that this is reserved for system use. +ASCII period (.) and ASCII hyphen (-) are also allowed in attribute names only. Case is significant in netCDF names, but it is recommended that names should not be distinguished purely by case, i.e., if case is disregarded, no two names should be the same. It is also recommended that names should be obviously meaningful, if possible, as this renders the file more effectively self-describing. From 5815f0c58c053d6e53f268562cc7eaac16285c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Mon, 8 Jan 2024 23:04:10 +0100 Subject: [PATCH 2/8] modified appb.adoc to include version_number and conventions_string --- appb.adoc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/appb.adoc b/appb.adoc index dd898166..adf134dd 100644 --- a/appb.adoc +++ b/appb.adoc @@ -25,11 +25,16 @@ Next is the **`standard_name_table`** itself, which is bracketed by the tags **` The content (delimited by the `<standard_name_table>` tags) consists of, in order, ---- + Version number here ... + Conventions string here ... + Datetime stamp here ... Name of institution here ... E-mail address of contact person ... ---- -followed by a sequence of **`entry`** elements which may optionally be followed by a sequence of **`alias`** elements. +where the "Conventions string" is composed of the fixed string **`CF-StdNameTable-`** immediately followed by the version number. + +Next follows a sequence of **`entry`** elements which may optionally be followed by a sequence of **`alias`** elements. The **`entry`** and **`alias`** elements take the following forms: ---- @@ -37,8 +42,7 @@ The **`entry`** and **`alias`** elements take the following forms: Define the variable whose standard_name attribute has the value "an_id". - Provide alias for a variable whose standard_name attribute has the - value "another_id". + Provide alias for a variable whose standard_name attribute has the value "another_id". ---- @@ -87,6 +91,8 @@ Each **`alias`** element contains a single element: ---- + 83 + CF-StdNameTable-83 Program for Climate Model Diagnosis and Intercomparison support@pcmdi.llnl.gov From 183e3473dedde833d02135ee0636955881a48210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Mon, 8 Jan 2024 23:12:41 +0100 Subject: [PATCH 3/8] Updated history. --- history.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/history.adoc b/history.adoc index aec8a79e..c3c888b4 100644 --- a/history.adoc +++ b/history.adoc @@ -7,6 +7,8 @@ === Working version (most recent first) +* {issues}500[Issue #500]: Appendix B: Added a **`conventions_string`** to the standard name xml file format definition + === Version 1.11 (05 December 2023) * {issues}481[Issue #481]: Introduce **`units_metadata`** attribute and clarify some other aspects of **`units`** From c7ec095bb30f1deddee3446632da4c7abd49a63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Tue, 9 Jan 2024 17:31:47 +0100 Subject: [PATCH 4/8] Updated the conventions string to begin CF-StandardNameTable- --- appb.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appb.adoc b/appb.adoc index adf134dd..51a09f82 100644 --- a/appb.adoc +++ b/appb.adoc @@ -32,7 +32,7 @@ The content (delimited by the `<standard_name_table>` tags) consists of, i E-mail address of contact person ... ---- -where the "Conventions string" is composed of the fixed string **`CF-StdNameTable-`** immediately followed by the version number. +where the "Conventions string" is composed of the fixed string **`CF-StandardNameTable-`** immediately followed by the version number. Next follows a sequence of **`entry`** elements which may optionally be followed by a sequence of **`alias`** elements. The **`entry`** and **`alias`** elements take the following forms: @@ -92,7 +92,7 @@ Each **`alias`** element contains a single element: 83 - CF-StdNameTable-83 + CF-StandardNameTable-83 Program for Climate Model Diagnosis and Intercomparison support@pcmdi.llnl.gov From e5cea41cffe108925c3771fa646787cf07a88e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Tue, 9 Jan 2024 17:43:23 +0100 Subject: [PATCH 5/8] And shortened the tag to read "conventions" --- appb.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appb.adoc b/appb.adoc index 51a09f82..123f7f40 100644 --- a/appb.adoc +++ b/appb.adoc @@ -26,7 +26,7 @@ The content (delimited by the `<standard_name_table>` tags) consists of, i ---- Version number here ... - Conventions string here ... + Conventions string here ... Datetime stamp here ... Name of institution here ... E-mail address of contact person ... @@ -92,7 +92,7 @@ Each **`alias`** element contains a single element: 83 - CF-StandardNameTable-83 + CF-StandardNameTable-83 Program for Climate Model Diagnosis and Intercomparison support@pcmdi.llnl.gov From e9dac7c2f9fecd28487ee42a56cb4f257c0dc39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20B=C3=A4rring?= Date: Fri, 23 Feb 2024 12:55:20 +0100 Subject: [PATCH 6/8] Minor edit to the history file --- history.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/history.adoc b/history.adoc index c3c888b4..39745b95 100644 --- a/history.adoc +++ b/history.adoc @@ -7,7 +7,7 @@ === Working version (most recent first) -* {issues}500[Issue #500]: Appendix B: Added a **`conventions_string`** to the standard name xml file format definition +* {issues}500[Issue #500]: Appendix B: Added a **`conventions`** string to the standard name xml file format definition === Version 1.11 (05 December 2023) From 6aa824324df54b9fbc5151a35c79739a5057ebc2 Mon Sep 17 00:00:00 2001 From: Dave Allured Date: Thu, 29 Feb 2024 18:56:40 -0700 Subject: [PATCH 7/8] Conformance doc, characters in attrib names --- conformance.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/conformance.adoc b/conformance.adoc index 1cb3d546..99f4435c 100644 --- a/conformance.adoc +++ b/conformance.adoc @@ -37,6 +37,7 @@ See https://github.com/ugrid-conventions/ugrid-conventions for the UGRID conform *Recommendations:* * Variable, dimension and attribute names should begin with a letter and be composed of letters (A-Z, a-z), digits (0-9), and underscores(_). This corresponds to ASCII characters in the decimal ranges (65-90), (97-122), (48-57), and (95). The corresponding Unicode codepoints are (U+0041-U+005A), (U+0061-U+007A), (U+0030-U+0039), and (U+005F). +* ASCII period (.) and ASCII hyphen (-) may also be included in attribute names only. * No two variable names should be identical when case is ignored. [[section-2]] From 4ff7ddbf3681f47bce4b02e8d175dd956e6bc88a Mon Sep 17 00:00:00 2001 From: Dave Allured Date: Thu, 29 Feb 2024 19:00:58 -0700 Subject: [PATCH 8/8] History doc, characters in attrib names --- history.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/history.adoc b/history.adoc index 39745b95..93a99824 100644 --- a/history.adoc +++ b/history.adoc @@ -7,6 +7,7 @@ === Working version (most recent first) +* {issues}477[Issue #477]: Period and hyphen allowed in attribute names * {issues}500[Issue #500]: Appendix B: Added a **`conventions`** string to the standard name xml file format definition === Version 1.11 (05 December 2023)