From 72e43de41410981add689109fcbb5b2b9b8ab41c Mon Sep 17 00:00:00 2001 From: Hauke Schulz <43613877+observingClouds@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:00:14 +0100 Subject: [PATCH 1/4] fix crs_wkt --- ch05.adoc | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/ch05.adoc b/ch05.adoc index c8a8497b..9a6a0122 100644 --- a/ch05.adoc +++ b/ch05.adoc @@ -550,42 +550,42 @@ variables: crs:reference_ellipsoid_name = "Airy 1830" ; crs:prime_meridian_name = "Greenwich" ; crs:towgs84 = 375., -111., 431., 0., 0., 0., 0. ; - crs:crs_wkt = "COMPOUNDCRS ["OSGB 1936 / British National Grid + ODN", - PROJCRS ["OSGB 1936 / British National Grid", - GEODCRS ["OSGB 1936", - DATUM ["OSGB 1936", - ELLIPSOID ["Airy 1830", 6377563.396, 299.3249646, - LENGTHUNIT[“metre”,1.0]], - TOWGS84[375, -111, 431, 0, 0, 0, 0] + crs:crs_wkt = "COMPOUNDCRS["OSGB 1936 / British National Grid + ODN", + PROJCRS["OSGB 1936 / British National Grid", + BASEGEODCRS["OSGB 1936", + DATUM["OSGB 1936", + ELLIPSOID["Airy 1830", 6377563.396, 299.3249646, + LENGTHUNIT["metre",1.0]] ], PRIMEM ["Greenwich", 0], UNIT ["degree", 0.0174532925199433] ], CONVERSION["OSGB", - METHOD["Transverse Mercator", - PARAMETER["False easting", 400000, LENGTHUNIT[“metre”,1.0]], - PARAMETER["False northing", -100000, LENGTHUNIT[“metre”,1.0]], + METHOD["Transverse Mercator"], + PARAMETER["False easting", 400000, LENGTHUNIT["metre",1.0]], + PARAMETER["False northing", -100000, LENGTHUNIT["metre",1.0]], PARAMETER["Longitude of natural origin", -2.0, - ANGLEUNIT[“degree”,0.0174532925199433]], + ANGLEUNIT["degree",0.0174532925199433]], PARAMETER["Latitude of natural origin", 49.0, - ANGLEUNIT[“degree”,0.0174532925199433]], + ANGLEUNIT["degree",0.0174532925199433]], PARAMETER["Longitude of false origin", -7.556, - ANGLEUNIT[“degree”,0.0174532925199433]], + ANGLEUNIT["degree",0.0174532925199433]], PARAMETER["Latitude of false origin", 49.766, - ANGLEUNIT[“degree”,0.0174532925199433]], - PARAMETER["Scale factor at natural origin", 0.9996012717, SCALEUNIT[“Unity”,1.0]], - AUTHORITY["EPSG", "27700"]] - CS[Cartesian,2], - AXIS["easting (X)",east], - AXIS["northing (Y)",north], - LENGTHUNIT[“metre”, 1.0], + ANGLEUNIT["degree",0.0174532925199433]], + PARAMETER["Scale factor at natural origin", 0.9996012717, SCALEUNIT["Unity",1.0]] + ], + CS[Cartesian, 2], + AXIS["easting (X)",east], + AXIS["northing (Y)",north], + LENGTHUNIT["metre",1.0], + ID["EPSG",27700] ], - VERTCRS ["Newlyn", - VDATUM ["Ordnance Datum Newlyn", 2005], - AUTHORITY ["EPSG", "5701"] + VERTCRS["Newlyn", + VDATUM["Ordnance Datum Newlyn"], CS[vertical,1], - AXIS["gravity-related height (H)",up], - LENGTHUNIT[“metre”,1.0] + AXIS["gravity-related height (H)",up], + LENGTHUNIT["metre",1.0], + ID["EPSG",5701] ] ]" ; ... From 621e55ece8186ee96088a0d568155bb8794094c8 Mon Sep 17 00:00:00 2001 From: Hauke Schulz <43613877+observingClouds@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:56:15 +0100 Subject: [PATCH 2/4] add author info --- cf-conventions.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cf-conventions.adoc b/cf-conventions.adoc index 01e32322..0eb27311 100644 --- a/cf-conventions.adoc +++ b/cf-conventions.adoc @@ -1,6 +1,6 @@ include::version.adoc[] = NetCDF Climate and Forecast (CF) Metadata Conventions -Brian{nbsp}Eaton; Jonathan{nbsp}Gregory; Bob{nbsp}Drach; Karl{nbsp}Taylor; Steve{nbsp}Hankin; Jon{nbsp}Blower; John{nbsp}Caron; Rich{nbsp}Signell; Phil{nbsp}Bentley; Greg{nbsp}Rappa; Heinke{nbsp}Höck; Alison{nbsp}Pamment; Martin{nbsp}Juckes; Martin{nbsp}Raspaud; Randy{nbsp}Horne; Timothy{nbsp}Whiteaker; David{nbsp}Blodgett; Charlie{nbsp}Zender; Daniel{nbsp}Lee; David{nbsp}Hassell; Alan{nbsp}D.{nbsp}Snow; Tobias{nbsp}Kölling; Dave{nbsp}Allured; Aleksandar{nbsp}Jelenak; Anders{nbsp}Meier{nbsp}Soerensen; Lucile{nbsp}Gaultier; Sylvain{nbsp}Herlédan; Fernando{nbsp}Manzano; Lars{nbsp}Bärring; Christopher{nbsp}Barker; Sadie{nbsp}Bartholomew +Brian{nbsp}Eaton; Jonathan{nbsp}Gregory; Bob{nbsp}Drach; Karl{nbsp}Taylor; Steve{nbsp}Hankin; Jon{nbsp}Blower; John{nbsp}Caron; Rich{nbsp}Signell; Phil{nbsp}Bentley; Greg{nbsp}Rappa; Heinke{nbsp}Höck; Alison{nbsp}Pamment; Martin{nbsp}Juckes; Martin{nbsp}Raspaud; Randy{nbsp}Horne; Timothy{nbsp}Whiteaker; David{nbsp}Blodgett; Charlie{nbsp}Zender; Daniel{nbsp}Lee; David{nbsp}Hassell; Alan{nbsp}D.{nbsp}Snow; Tobias{nbsp}Kölling; Dave{nbsp}Allured; Aleksandar{nbsp}Jelenak; Anders{nbsp}Meier{nbsp}Soerensen; Lucile{nbsp}Gaultier; Sylvain{nbsp}Herlédan; Fernando{nbsp}Manzano; Lars{nbsp}Bärring; Christopher{nbsp}Barker; Sadie{nbsp}Bartholomew; Hauke{nbsp}Schulz; Version{nbsp}{current-version},{nbsp}{nbsp}{docprodtime}: See{nbsp}https://cfconventions.org{nbsp}for{nbsp}further{nbsp}information. :doctype: book :pdf-folio-placement: physical @@ -49,6 +49,7 @@ include::toc-extra.adoc[] * Lars Bärring, SMHI * Christopher Barker, NOAA * Sadie Bartholomew, NCAS and University of Reading +* Hauke Schulz, DMI Many others have contributed to the development of CF through their participation in discussions about proposed changes. From 43db51d7736f1ee50e4c9c531a42d417bd2777ed Mon Sep 17 00:00:00 2001 From: Hauke Schulz <43613877+observingClouds@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:00:42 +0100 Subject: [PATCH 3/4] document changes in history --- history.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/history.adoc b/history.adoc index bfca341c..90ecbbf7 100644 --- a/history.adoc +++ b/history.adoc @@ -7,6 +7,7 @@ === Working version (most recent first) +* {issues}566[Issue #566]: Fix invalid CRS WKT attribute in example 5.12. * {issues}367[Issue #367]: Remove the AMIP and GRIB columns from the standard name table format defined by Appendix B. * {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)". From 5e0bf85b1762fac25dbd68991144ec4514300396 Mon Sep 17 00:00:00 2001 From: Hauke Schulz <43613877+observingClouds@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:02:54 +0100 Subject: [PATCH 4/4] Revert "add author info" This reverts commit 621e55ece8186ee96088a0d568155bb8794094c8. --- cf-conventions.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cf-conventions.adoc b/cf-conventions.adoc index 0eb27311..01e32322 100644 --- a/cf-conventions.adoc +++ b/cf-conventions.adoc @@ -1,6 +1,6 @@ include::version.adoc[] = NetCDF Climate and Forecast (CF) Metadata Conventions -Brian{nbsp}Eaton; Jonathan{nbsp}Gregory; Bob{nbsp}Drach; Karl{nbsp}Taylor; Steve{nbsp}Hankin; Jon{nbsp}Blower; John{nbsp}Caron; Rich{nbsp}Signell; Phil{nbsp}Bentley; Greg{nbsp}Rappa; Heinke{nbsp}Höck; Alison{nbsp}Pamment; Martin{nbsp}Juckes; Martin{nbsp}Raspaud; Randy{nbsp}Horne; Timothy{nbsp}Whiteaker; David{nbsp}Blodgett; Charlie{nbsp}Zender; Daniel{nbsp}Lee; David{nbsp}Hassell; Alan{nbsp}D.{nbsp}Snow; Tobias{nbsp}Kölling; Dave{nbsp}Allured; Aleksandar{nbsp}Jelenak; Anders{nbsp}Meier{nbsp}Soerensen; Lucile{nbsp}Gaultier; Sylvain{nbsp}Herlédan; Fernando{nbsp}Manzano; Lars{nbsp}Bärring; Christopher{nbsp}Barker; Sadie{nbsp}Bartholomew; Hauke{nbsp}Schulz; +Brian{nbsp}Eaton; Jonathan{nbsp}Gregory; Bob{nbsp}Drach; Karl{nbsp}Taylor; Steve{nbsp}Hankin; Jon{nbsp}Blower; John{nbsp}Caron; Rich{nbsp}Signell; Phil{nbsp}Bentley; Greg{nbsp}Rappa; Heinke{nbsp}Höck; Alison{nbsp}Pamment; Martin{nbsp}Juckes; Martin{nbsp}Raspaud; Randy{nbsp}Horne; Timothy{nbsp}Whiteaker; David{nbsp}Blodgett; Charlie{nbsp}Zender; Daniel{nbsp}Lee; David{nbsp}Hassell; Alan{nbsp}D.{nbsp}Snow; Tobias{nbsp}Kölling; Dave{nbsp}Allured; Aleksandar{nbsp}Jelenak; Anders{nbsp}Meier{nbsp}Soerensen; Lucile{nbsp}Gaultier; Sylvain{nbsp}Herlédan; Fernando{nbsp}Manzano; Lars{nbsp}Bärring; Christopher{nbsp}Barker; Sadie{nbsp}Bartholomew Version{nbsp}{current-version},{nbsp}{nbsp}{docprodtime}: See{nbsp}https://cfconventions.org{nbsp}for{nbsp}further{nbsp}information. :doctype: book :pdf-folio-placement: physical @@ -49,7 +49,6 @@ include::toc-extra.adoc[] * Lars Bärring, SMHI * Christopher Barker, NOAA * Sadie Bartholomew, NCAS and University of Reading -* Hauke Schulz, DMI Many others have contributed to the development of CF through their participation in discussions about proposed changes.