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

Correct figures & add static assets to HTML check build #296

Merged
merged 4 commits into from
Sep 29, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/check_adoc_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Build cf-conventions.html
uses: Analog-inc/asciidoctor-action@v1.2
with:
shellcommand: 'asciidoctor --verbose cf-conventions.adoc -D conventions_build'
shellcommand: 'asciidoctor --verbose cf-conventions.adoc -D conventions_build; cp -r images conventions_build'
# Build cf-conventions.pdf using the Analog-inc asciidoctor-action
- name: Build cf-conventions.pdf
uses: Analog-inc/asciidoctor-action@v1.2
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ script:
after_success:
# Always update the "gh-pages" branch, but tag build goes into
# tag directory and normal build goes into the root directory.
- mv images/ images~
- git fetch origin gh-pages:gh-pages
- git checkout gh-pages
- if [[ $TRAVIS_TAG ]]; then
Expand All @@ -32,10 +33,12 @@ after_success:
TARGET_DIR='.';
fi
- mkdir -p $TARGET_DIR
- mv images~ $TARGET_DIR/images
- cp build/cf-conventions.html $TARGET_DIR/
- cp build/cf-conventions.pdf $TARGET_DIR/
- cp build/conformance.html $TARGET_DIR/
- cp build/conformance.pdf $TARGET_DIR/
- git add $TARGET_DIR/images
- git add $TARGET_DIR/cf-conventions.html
- git add $TARGET_DIR/cf-conventions.pdf
- git add $TARGET_DIR/conformance.html
Expand Down
2 changes: 1 addition & 1 deletion appi.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ information about the dataset as a whole. NetCDF library software has
functions to define dimensions, variables and attributes, and write
and read data.

[[img-netCDF, figure 1]]
[[img-netCDF, figure 3]]
[.text-center]
.Key components of the netCDF classic data model. Files consist of global attributes, dimensions and variables. Variables contain attributes and data, and attributes also contain data. Variables, attributes and dimensions all contain properties, such as a "name" which identifies them in the file. A data array has a data type for all of its elements (e.g. "double" for 64-bit floating point numbers).
image::images/cfdm_netcdf_classic_data_model.png[,50%,pdfwidth=50vw,align="center"]
Expand Down
2 changes: 1 addition & 1 deletion ch07.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Bounds for 2-D coordinate variables with 4-sided cells:: In the case where the h
+
[[img-bnd_2d_coords, figure 2]]
[.text-center]
.Order of **`lonbnd(i,j,0)`** to **`lonbnd(i,j,3)`** and of **`latbnd(i,j,0)`** and **`latbnd(i,j,3)`** in the case of two-dimensional horizontal coordinate axes. Tuples **`(lon(i,j),lat(i,j))`** represent grid cell centers and tuples **`(lonbnd(i,j,n),latbnd(i,j,n))`** represent the grid cell vertices.
.Order of **`lonbnd(j,i,0)`** to **`lonbnd(j,i,3)`** and of **`latbnd(j,i,0)`** and **`latbnd(j,i,3)`** in the case of two-dimensional horizontal coordinate axes. Tuples **`(lon(j,i),lat(j,i))`** represent grid cell centers and tuples **`(lonbnd(j,i,n),latbnd(j,i,n))`** represent the grid cell vertices.
image::images/order_horizontal_bounds__2D_coord_variables.png[,50%,pdfwidth=50vw,align="center"]
+
If i-j-upward is a right-handed coordinate system (like lon-lat-upward), this ordering means the vertices will be traversed anticlockwise on the lon-lat surface seen from above (<<img-bnd_2d_coords>>). If i-j-upward is left-handed, they will be traversed clockwise on the lon-lat surface.
Expand Down
3 changes: 3 additions & 0 deletions history.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,8 @@ node coordinate variables to be one of the dimensions of the data variable.
.2 June 2020
. link:$$https://github.com/cf-convention/cf-conventions/issues/259$$[Issue #259]: Clarify geostationary projection items

.11 June 2020
. link:$$https://github.com/cf-convention/cf-conventions/pull/193$$[Issue #193]: Added two figures to clarify order of vertex coordinates in lon/lat bnds variables

.6 July 2020
. link:$$https://github.com/cf-convention/cf-conventions/issues/222$$[Issue #222]: Allow CRS WKT to represent the CRS without requiring reader to compare with grid mapping parameters.
Binary file modified images/order_horizontal_bounds__2D_coord_variables.pdf
Binary file not shown.
Binary file modified images/order_horizontal_bounds__2D_coord_variables.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.