Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revise section 4, include new subsection on leap seconds, define utc and tai calendars and leap_seconds in units_metadata #541

Merged
merged 39 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
898a3bb
clarification of sect 4 and leap seconds
JonathanGregory Sep 14, 2024
18840e7
updates
JonathanGregory Sep 14, 2024
6930278
updates
JonathanGregory Sep 15, 2024
93a46dc
updates
JonathanGregory Sep 15, 2024
f211dac
updates
JonathanGregory Sep 15, 2024
33b97fc
update
JonathanGregory Sep 16, 2024
58ac95a
update
JonathanGregory Sep 16, 2024
b2f70ca
update history
JonathanGregory Sep 16, 2024
e752696
suggestions from Chris Barker
JonathanGregory Sep 17, 2024
89a865b
qualify midnight with 0 degrees_east
JonathanGregory Sep 19, 2024
dac49fa
Merge remote-tracking branch 'upstream/main'
JonathanGregory Oct 21, 2024
4e90ebc
Fallback .nojekyll
cofinoa Oct 22, 2024
5705155
Merge branch 'cf-convention:main' into main
cofinoa Oct 22, 2024
7d50d23
Refactoring pages publishing
cofinoa Oct 23, 2024
de66368
Removing placeholder for templating
cofinoa Oct 23, 2024
7942fe6
Remove permissions
cofinoa Oct 23, 2024
5306a70
Remove environment
cofinoa Oct 23, 2024
9f355b0
Create gh-pages branch if not already exist
cofinoa Oct 23, 2024
0789f16
We need firs to clone repo
cofinoa Oct 23, 2024
4684646
write content permissions to GITHUB_TOKEN
cofinoa Oct 23, 2024
316ea8b
Add sudo to remove old images dir
cofinoa Oct 23, 2024
0f910f1
Add build dir to .gitignore
cofinoa Oct 24, 2024
ee3c1a9
test
JonathanGregory Oct 25, 2024
dc95683
Merge branch 'leap-seconds2' into main
JonathanGregory Oct 25, 2024
0845744
Merge branch 'main' of https://github.com/JonathanGregory/cf-conventi…
JonathanGregory Oct 25, 2024
9c804ea
resolve clash
JonathanGregory Oct 25, 2024
00b1f49
updates following comments
JonathanGregory Oct 26, 2024
6f97592
updates following comments
JonathanGregory Oct 26, 2024
c8049a8
corrections
JonathanGregory Oct 26, 2024
61f2b65
corrections
JonathanGregory Oct 26, 2024
f10153c
updates following comments
JonathanGregory Oct 29, 2024
1d4b5ef
Merge branch 'main' into leap-seconds2
JonathanGregory Oct 29, 2024
dbe8d95
resolve conflict
JonathanGregory Oct 29, 2024
d6c451b
Merge pull request #5 from cofinoa/main
JonathanGregory Oct 29, 2024
efcb615
Merge branch 'main' of https://github.com/JonathanGregory/cf-conventi…
JonathanGregory Oct 29, 2024
8d81918
correct markdown
JonathanGregory Oct 29, 2024
56f95bb
more on time zone
JonathanGregory Nov 5, 2024
ce566e6
remove refs to ISO 8601
JonathanGregory Nov 6, 2024
9afa56a
Merge branch 'main' into leap-seconds2
JonathanGregory Nov 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appa.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,8 @@ In cases where there is a strong constraint on dataset size, it is allowed to pa
| **`units_metadata`**
| S
| C, D, BI
| <<units>>
| Specifies the interpretation (on-scale, difference or unknown) of the unit of temperature appearing in the **`units`** attribute.
| <<units>>, and <<time-coordinate>>
| Specifies the interpretation of a unit of measure appearing in the **`units`** attribute.

| **`valid_max`**
| N
Expand Down
2 changes: 2 additions & 0 deletions ch01.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ The coordinate values must be in strict monotonic order (all values are differen
Missing values are not allowed in coordinate variables.
To avoid confusion with coordinate variables, CF does not permit a one-dimensional string-valued variable to have the same name as its dimension.

date/time:: The set of numbers which together identify an instant of time, namely its year, month, day, hour, minute and second, where the second may have a fraction but the others are all integer.
JonathanGregory marked this conversation as resolved.
Show resolved Hide resolved

grid mapping variable:: A variable used as a container for attributes that define a specific grid mapping.
The type of the variable is arbitrary since it contains no data.

Expand Down
2 changes: 1 addition & 1 deletion ch02.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ If it is observational, **`source`** should characterize it (e.g., "**`surface o

**`history`**:: Provides an audit trail for modifications to the original data.
Well-behaved generic netCDF filters will automatically append their name and the parameters with which they were invoked to the global history attribute of an input netCDF file.
We recommend that each line begin with a timestamp indicating the date and time of day that the program was executed.
We recommend that each line begin by indicating the date and time of day that the program was executed.

**`references`**:: Published or web-based references that describe the data or methods used to produce it.

Expand Down
5 changes: 5 additions & 0 deletions ch03.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ A standard name contains no whitespace and is case sensitive.
canonical units:: Representative units of the physical quantity.
Unless it is dimensionless, a variable with a **`standard_name`** attribute must have units which are physically equivalent (not necessarily identical) to the canonical units, possibly modified by an operation specified by the standard name modifier (see below and <<standard-name-modifiers>>) or by the **`cell_methods`** attribute (see <<cell-methods>> and <<appendix-cell-methods>>) or both.

Units of time coordinates (<<time-coordinate>>), whose **`units`** attribute includes the word **`since`**, are _not_ physically equivalent to time units that do not include **`since`** in the **`units`**.
To mark this distinction, the canonical unit given for quantities used for time coordinates is **`s since 1958-1-1`**.
JonathanGregory marked this conversation as resolved.
Show resolved Hide resolved
The choice of reference time and date (midnight on 1st January 1958) is arbitrary and not restrictive; the time coordinate variable's own **`units`** may contain any reference time and date (after **`since`**) that is valid in its calendar.
In both kinds of time **`units`** attribute (with or without **`since`**), any unit for measuring time can be used i.e. any unit which is physically equivalent to the SI base unit of time, namely the second.

description:: The description is meant to clarify the qualifiers of the fundamental quantities such as which surface a quantity is defined on or what the flux sign conventions are.
We don't attempt to provide precise definitions of fundumental physical quantities (e.g., temperature) which may be found in the literature.
The description may define rules on the variable type, attributes and coordinates which must be complied with by any variable carrying that standard name (such as in Example 3.5).
Expand Down
319 changes: 260 additions & 59 deletions ch04.adoc

Large diffs are not rendered by default.

49 changes: 34 additions & 15 deletions conformance.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@ References can be absolute, relative or with no path, in which case, the variabl
* The type of the **`units`** attribute is a string that must be recognizable by the UDUNITS package.
Exceptions are the units **`level`**, **`layer`**, and **`sigma_level`**.
* Dimensionless units for volume fractions defined by UDUNITS (**`ppv`**, **`ppmv`**, **`ppbv`**, **`pptv`**, **`ppqv`**) are not allowed in the **`units`** attribute of any variable which also has a **`standard_name`** attribute.
* If present, the **`units_metadata`** attribute must have one of these values: `temperature: on_scale`, `temperature: difference`, `temperature: unknown`.
* If present, the **`units_metadata`** attribute must have one of these values: `temperature: on_scale`, `temperature: difference`, `temperature: unknown`, `leap_seconds: none`, `leap_seconds: utc`, or `leap_seconds: unknown`.
* The **`units`** of a variable that specifies a **`standard_name`** must be physically equivalent to the canonical units given in the standard name table, as modified by the **`standard_name`** modifier, if there is one, according to Appendix C, and then modified by all the methods listed in order by the **`cell_methods`** attribute, if one is present, according to Appendix E.
* If the **`standard_name`** attribute includes the `standard_error` modifier, the **`units_metadata`** attribute, if present, must have the value `temperature: difference`.
* If the **`cell_methods`** attribute includes any entry with any of the methods `range`, `standard_deviation` or `variance`, the **`units_metadata`** attribute, if present, must have the value `temperature: difference`.
* A variable must not have a **`units_metadata`** attribute if it has no **`units`** attribute or if its **`units`** do not involve a temperature unit.
* If a variable has a **`units`** attribute that involves a temperature unit, and has a **`cell_methods`** attribute includes any entry with any of the methods `range`, `standard_deviation` or `variance`, then the **`units_metadata`** attribute, if present, must have the value `temperature: difference`.
* A variable must not have a **`units_metadata`** attribute if it has no **`units`** attribute, or if its **`units`** do not involve a temperature unit or a reference time unit.

*Recommendations:*

Expand Down Expand Up @@ -237,40 +237,59 @@ The values of **`var`** must be variables that exist in the file.

[[section-13]]
[[time-coordinate]]
=== 4.4 Time Coordinate
=== 4.4.1 Time Coordinate Units

*Requirements:*

* The time **`units`** of a time coordinate variable must contain a reference date/time.
* The reference date/time of a time coordinate variable must be a legal date/time in the specified calendar.
* The reference date/time in time **`units`** is not allowed to contain seconds equal to or greater than 60.

*Recommendations:*

* The use of time coordinates in year 0 and reference date/times in year 0 to indicate climatological time is deprecated.
* Units of **`year`** and **`month`** and any equivalent units should be used with caution.
* UDUNITS permits a number of alternatives to the word **`since`** in the units of time coordinates. All the alternatives have exactly the same meaning in UDUNITS. For compatibility with other software, CF strongly recommends that **`since`** should be used.

[[section-14]]
[[calendar]]
=== 4.4.1 Calendar
=== 4.4.2 Calendar

*Requirements:*

* The attributes **`calendar`**, **`month_lengths`**, **`leap_year`**, and **`leap_month`** may only be attached to time coordinate variables.
* The standardized values (case insensitive) of the **`calendar`** attribute are **`standard`**, **`gregorian`** (deprecated), **`proleptic_gregorian`**, **`noleap`**, **`365_day`**, **`all_leap`**, **`366_day`**, **`360_day`**, **`julian`**, and **`none`**.
If the **`calendar`** attribute is given a non-standard value, then the attribute **`month_lengths`** is required, along with **`leap_year`** and **`leap_month`** as appropriate.
* The type of the **`month_lengths`** attribute must be an integer array of size 12.
* The values of the **`leap_month`** attribute must be in the range 1-12.
* The values of the **`leap_year`** and **`leap_month`** attributes are integer scalars.
* The **`calendar`** attribute may only be attached to time coordinate variables.
* If present, the value of the **`calendar`** attribute must be one of the standardized values (case insensitive) detailed in this section, unless the **`month_length`** attribute is present, in which case the **`calendar`** attribute must _not_ take one of the standardized values.
* The reference date/time of a time coordinate variable must be a legal date/time in the specified calendar.

*Recommendations:*

* A time coordinate variable should have a **`calendar`** attribute.
* If the **`calendar`** attribute is **`standard`**, **`gregorian**` (deprecated) or **`julian`** or absent, the use of time coordinates in year 0 and reference date/times in year 0 is deprecated.
* The value **`standard`** should be used instead of **`gregorian`** in the **`calendar`** attribute.
* The attribute **`leap_month`** should not appear unless the attribute **`leap_year`** is present.
* The time coordinate should not cross the date 1582-10-15 when the default mixed Gregorian/Julian calendar is in use.

[[leap-seconds]]
=== 4.4.3 Leap Seconds

*Requirements:*

* The reference date/time in time **`units`** is not allowed to contain seconds equal to or greater than 60, except for valid leap seconds if the **`calendar`** is **`utc`**.
* A time coordinate variable must not have a **`units_metadata`** attribute if it has a **`calendar`** attribute with a value _other than_ one of the following values: `standard`, `gregorian` (deprecated), `proleptic_gregorian`, `julian`.
* If a time coordinate variable has a **`units_metadata`** attribute then it must have one of these values: `leap_seconds: none`, `leap_seconds: utc`, or `leap_seconds: unknown`.

*Recommendations:*

* A time coordinate variable should have a **`units_metadata`** attribute if it has no **`calendar`** attribute, or if it has a **`calendar`** attribute with one of the following values: `standard`, `gregorian` (deprecated), `proleptic_gregorian`, `julian`.

[[explicitly-defined-calendar]]
=== 4.4.5 Explicitly Defined Calendar

* The **`month_lengths`**, **`leap_year`**, and **`leap_month`** attributes may only be attached to time coordinate variables.
* If the **`calendar`** attribute of a time coordinate variable is given a non-standard value, then the attribute **`month_lengths`** is required, along with **`leap_year`** and **`leap_month`** as appropriate.
* The type of the **`month_lengths`** attribute must be an integer array of size 12.
* The values of the **`leap_month`** attribute must be in the range 1-12.
* The values of the **`leap_year`** and **`leap_month`** attributes are integer scalars.

*Recommendations:*
* The attribute **`leap_month`** should not appear unless the attribute **`leap_year`** is present.

[[section-15]]
[[coordinate-systems]]
=== 5 Coordinate Systems and Domain
Expand Down
2 changes: 2 additions & 0 deletions history.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

=== Working version (most recent first)

* {issues}542{Issue #542}: Clarify and rearrange text of section 4.4 about time coordinate units and calendars; introduce new text and a diagram explaining leap-seconds in existing calendars; define leap_second keyword of units_metadata attribute; define utc and tai calendars; define "date/time" in section 1.3.
* {issues}166{Issue #166}: Clarify that time coordinate variables must have **`units`** containing **`since`** and a reference time; distinguish between canonical units of time with and without **`since`**.
* {issues}403[Issue #403]: Metadata to encode quantization properties
* {issues}530{Issue #530]: Define "the most rapidly varying dimension", and use this phrase consistently with the clarification "(the last dimension in CDL order)".
* {issues}163[Issue #163]: Provide a convention for boundary variables for grids whose cells do not all have the same number of sides.
Expand Down
Binary file added images/leap-second-timelines.odg
Binary file not shown.
Binary file added images/leap-second-timelines.pdf
Binary file not shown.
Loading
Loading