Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,11 @@ authors:
- affiliation: NCAS and STFC
family-names: Massey
given-names: Neil
- affiliation: University of Cantabria
orcid: 0000-0003-1211-1341
- affiliation: Instituto de Fisica de Cantabria, CSIC-UC
family-names: "Cofi\xF1o"
given-names: Antonio
given-names: Antonio S.
orcid: 0000-0001-7719-979X
- affiliation: NCAR
family-names: McGinnis
given-names: Seth
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ REMOTE_URL=`git config remote.$TRACKING_REMOTE.url`
FINAL_TAG ?= -a draft -a revnumber=v1.12.0-rc7-24-gb724218 -a revremark=${LOCAL_BRANCH}
endif

ifdef CF_FINAL_DATE
DATE_DOCPROD != LC_ALL=C date -u -d "$(CF_FINAL_DATE)" "$(DATE_FORMAT)"
else
DATE_DOCPROD != LC_ALL=C date -u "$(DATE_FORMAT)"
endif

.PHONY: all clean images authors html pdf conventions-html conventions-pdf conventions conformance-html conformance-pdf conformance
all: authors images html pdf
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ The following steps outline how to build the CF Conventions documentation into H
`make conformance`
- Remove built documents and clean build directories:
`make clean`
- Build with the FINAL tag and a date stamp. Ensure you have manually updated the version in the `version.adoc` file before running this command:
`make CF_FINAL=True`
- Build with the FINAL tag and a date stamp. Ensure you have manually updated the version in the `version.adoc` file before running this command. For FINAL builds, the release date must be provided explicitly:
`make CF_FINAL=True CF_FINAL_DATE=YYYY-MM-DD`

Both HTML documents will have images embedded within `.html` file.

Expand Down
2 changes: 1 addition & 1 deletion about-authors.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
* Thomas Lavergne, MET Norway
* Bryan Lawrence, NCAS and University of Reading
* Neil Massey, NCAS and STFC
* Antonio Cofiño, University of Cantabria
* Antonio S. Cofiño, Instituto de Fisica de Cantabria, CSIC-UC
* Seth McGinnis, NCAR
* Patrick Van Laake, Independent consultant
8 changes: 4 additions & 4 deletions authors.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@

:author_34: Neil{nbsp}Massey
:author_34_affiliation: NCAS and STFC
:author_33_orcid: 0000-0003-1211-1341
:author_34_orcid: 0000-0003-1211-1341

:author_35: Antonio{nbsp}Cofiño
:author_35_affiliation: University of Cantabria
:author_33_orcid: 0000-0001-7719-979X
:author_35: Antonio{nbsp}S.{nbsp}Cofiño
:author_35_affiliation: Instituto de Fisica de Cantabria, CSIC-UC
:author_35_orcid: 0000-0001-7719-979X

:author_36: Seth{nbsp}McGinnis
:author_36_affiliation: NCAR
Expand Down
2 changes: 1 addition & 1 deletion history.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
* {issues}186[Issue #186]: Minor corrections to Example 5.10, Section 9.5 & Appendix F
* {issues}136[Issue #136]: Missing trajectory dimension in H.22
* {issues}144[Issue #144]: Add <<groups, support for using groups>>.
* {issues}128[Issue #128]: Add definition of 'name_strlen' dimension where missing in Appendix H CDL examples.
* {pull-requests}128[Pull request #128]: Add definition of 'name_strlen' dimension where missing in Appendix H CDL examples.
* {pull-requests}142[Pull request #142]: Fix bad reference to an example in section 6.1 "Labels".
* {issues}155[Issue #155], {issues}156[Issue #156]: Allow alternate grid mappings for geometry containers. When node_count attribute is missing, require the dimension of the node coordinate variables to be one of the dimensions of the data variable.
* {pull-requests}146[Pull request #146]: Typos (plural dimensions) in section H
Expand Down
5 changes: 3 additions & 2 deletions zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,9 @@
"affiliation": "NCAS and STFC"
},
{
"name": "Cofi\u00f1o, Antonio",
"affiliation": "University of Cantabria"
"name": "Cofi\u00f1o, Antonio S.",
"affiliation": "Instituto de Fisica de Cantabria, CSIC-UC",
"orcid": "0000-0001-7719-979X"
},
{
"name": "McGinnis, Seth",
Expand Down
Loading