Skip to content

Commit

Permalink
219 new (#307)
Browse files Browse the repository at this point in the history
* Update create_master_lists.py

as requested in :

- #219

>In GRIB2 Template definition files the octet number (from - to) for each entry in the GRIB section is given.
Most of the GRIB processing software packages need the length or number of octets for each entry, which has to be calculated from the specification of "OctetNo".
But with variables and repitition within some templates an automated calculation is sometimes not easy. (e.g. 37 + (ND-1)*4 + (NF-1)*4 -40 +(ND-1)*4 + (NF-1)*4)
Therefore, this is a proposal to add a column with the length of each entry in the GRIB2_Template files.

* Update create_master_lists.py

remove any keys not in 'fieldnames' to avoid ValueError

* xml,txt files

* Update create_master_lists.py

make the count to be computed when the limit is not fixed but variable

* xml,txt files

* run the script update_octetcount.py to update the OctetCount number for all templates. the script will be added in the issue #219

* Replace Length per octetCount and remove it from the xml

* xml,txt files

* remove the octetCount in the txt and from the CI/CD

* update the create_master to avoid any issue while populating fields in the xml and txt

* update the create_master to avoid any issue while populating fields in the xml and txt

* Apply suggestions from code review

* xml,txt files

---------

Co-authored-by: antoineMerleEUM <[email protected]>
Co-authored-by: Enrico Fucile <[email protected]>
Co-authored-by: antoinemerle <[email protected]>
  • Loading branch information
4 people authored Jan 31, 2025
1 parent 1a8b014 commit ea4c75a
Show file tree
Hide file tree
Showing 182 changed files with 4,460 additions and 4,456 deletions.
4 changes: 2 additions & 2 deletions GRIB2_Template_1_0_IdentificationTemplate_en.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
calendar definition,24,,Type of calendar,(see Code table 1.6),,1.6,,Operational
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
calendar definition,24,1,Type of calendar,(see Code table 1.6),,1.6,,Operational
4 changes: 2 additions & 2 deletions GRIB2_Template_1_1_IdentificationTemplate_en.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
paleontological offset,24-25,,Number of tens of thousands of years of offset,,,,,Operational
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
paleontological offset,24-25,2,Number of tens of thousands of years of offset,,,,,Operational
6 changes: 3 additions & 3 deletions GRIB2_Template_1_2_IdentificationTemplate_en.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
calendar definition and paleontological offset,24,,Type of calendar,(see Code table 1.6),,1.6,,Operational
calendar definition and paleontological offset,25-26,,Number of tens of thousands of years of offset,,,,,Operational
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
calendar definition and paleontological offset,24,1,Type of calendar,(see Code table 1.6),,1.6,,Operational
calendar definition and paleontological offset,25-26,2,Number of tens of thousands of years of offset,,,,,Operational
42 changes: 21 additions & 21 deletions GRIB2_Template_3_0_GridDefinitionTemplate_en.csv
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
Title_en,OctetNo,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",15,Shape of the Earth,(see Code table 3.2),,3.2,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",16,Scale factor of radius of spherical Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",17-20,Scaled value of radius of spherical Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",21,Scale factor of major axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",22-25,Scaled value of major axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",26,Scale factor of minor axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",27-30,Scaled value of minor axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",31-34,Ni - number of points along a parallel,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",35-38,Nj - number of points along a meridian,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",39-42,Basic angle of the initial production domain,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",43-46,"Subdivisions of basic angle used to define extreme longitudes and latitudes, and direction increments",(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",47-50,La1 - latitude of first grid point,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",51-54,Lo1 - longitude of first grid point,(see Note 1),,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",55,Resolution and component flags,(see Flag table 3.3),,,3.3,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",56-59,La2 - latitude of last grid point,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",60-63,Lo2 - longitude of last grid point,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",64-67,Di - i direction increment,(see Notes 1 and 5),"9,45",,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",68-71,Dj - j direction increment,(see Notes 1 and 5),"9,45",,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",72,Scanning mode,(see Flag table 3.4),,,3.4,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",73-nn,List of number of points along each meridian or parallel,"(see Notes 2, 3 and 7)","4,15,124",,,Operational
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",15,1,Shape of the Earth,(see Code table 3.2),,3.2,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",16,1,Scale factor of radius of spherical Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",17-20,4,Scaled value of radius of spherical Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",21,1,Scale factor of major axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",22-25,4,Scaled value of major axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",26,1,Scale factor of minor axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",27-30,4,Scaled value of minor axis of oblate spheroid Earth,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",31-34,4,Ni - number of points along a parallel,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",35-38,4,Nj - number of points along a meridian,,,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",39-42,4,Basic angle of the initial production domain,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",43-46,4,"Subdivisions of basic angle used to define extreme longitudes and latitudes, and direction increments",(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",47-50,4,La1 - latitude of first grid point,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",51-54,4,Lo1 - longitude of first grid point,(see Note 1),,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",55,1,Resolution and component flags,(see Flag table 3.3),,,3.3,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",56-59,4,La2 - latitude of last grid point,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",60-63,4,Lo2 - longitude of last grid point,(see Note 1),9,,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",64-67,4,Di - i direction increment,(see Notes 1 and 5),"9,45",,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",68-71,4,Dj - j direction increment,(see Notes 1 and 5),"9,45",,,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",72,1,Scanning mode,(see Flag table 3.4),,,3.4,Operational
"latitude/longitude (or equidistant cylindrical, or Plate Carrée)",73-nn,,List of number of points along each meridian or parallel,"(see Notes 2, 3 and 7)","4,15,124",,,Operational
45 changes: 23 additions & 22 deletions GRIB2_Template_3_1000_GridDefinitionTemplate_en.csv
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
cross-section grid with points equally spaced on the horizontal,15,,Shape of the Earth,(see Code table 3.2),,3.2,,Experimental
cross-section grid with points equally spaced on the horizontal,16,,Scale factor of radius of spherical Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,17-20,,Scaled value of radius of spherical Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,21,,Scale factor of major axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,22-25,,Scaled value of major axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,26,,Scale factor of minor axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,27-30,,Scaled value of minor axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,31-34,,Number of horizontal points,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,35-38,,Basic angle of the initial production domain,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,39-42,,Subdivisions of basic angle used to define extreme longitudes and latitudes,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,43-46,,La1 - latitude of first grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,47-50,,Lo1 - longitude of first grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,51,,Scanning mode,(flags - see Flag table 3.4),,,3.4,Experimental
cross-section grid with points equally spaced on the horizontal,52-55,,La2 - latitude of last grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,56-59,,Lo2 - longitude of last grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,60,,Type of horizontal line,(see Code table 3.20),,3.2,,Experimental
cross-section grid with points equally spaced on the horizontal,61-62,,Number of vertical points,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,63,,Physical meaning of vertical coordinate,(see Code table 3.15),,,,Experimental
cross-section grid with points equally spaced on the horizontal,64,,Vertical dimension coordinate values definition,(see Code table 3.21),,,,Experimental
cross-section grid with points equally spaced on the horizontal,65-66,,NC - number of coefficients or values used to specify vertical coordinates,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,67-(66+NCx4),,"Coefficients to define vertical dimension coordinate values in functional form, or the explicit coordinate values (IEEE 32-bit floating-point values)",,,,,Experimental
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
cross-section grid with points equally spaced on the horizontal,15,1,Shape of the Earth,(see Code table 3.2),,3.2,,Experimental
cross-section grid with points equally spaced on the horizontal,16,1,Scale factor of radius of spherical Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,17-20,4,Scaled value of radius of spherical Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,21,1,Scale factor of major axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,22-25,4,Scaled value of major axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,26,1,Scale factor of minor axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,27-30,4,Scaled value of minor axis of oblate spheroid Earth,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,31-34,4,Number of horizontal points,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,35-38,4,Basic angle of the initial production domain,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,39-42,4,Subdivisions of basic angle used to define extreme longitudes and latitudes,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,43-46,4,La1 - latitude of first grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,47-50,4,Lo1 - longitude of first grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,51,1,Scanning mode,(flags - see Flag table 3.4),,,3.4,Experimental
cross-section grid with points equally spaced on the horizontal,52-55,4,La2 - latitude of last grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,56-59,4,Lo2 - longitude of last grid point,(see Note 1),9,,,Experimental
cross-section grid with points equally spaced on the horizontal,60,1,Type of horizontal line,(see Code table 3.20),,3.20,,Experimental

cross-section grid with points equally spaced on the horizontal,61-62,2,Number of vertical points,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,63,1,Physical meaning of vertical coordinate,(see Code table 3.15),,,,Experimental
cross-section grid with points equally spaced on the horizontal,64,1,Vertical dimension coordinate values definition,(see Code table 3.21),,,,Experimental
cross-section grid with points equally spaced on the horizontal,65-66,2,NC - number of coefficients or values used to specify vertical coordinates,,,,,Experimental
cross-section grid with points equally spaced on the horizontal,67-(66+NCx4),,"Coefficients to define vertical dimension coordinate values in functional form, or the explicit coordinate values (IEEE 32-bit floating-point values)",,,,,Experimental
24 changes: 12 additions & 12 deletions GRIB2_Template_3_100_GridDefinitionTemplate_en.csv
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",15,,n2 - exponent of 2 for the number of intervals on main triangle sides,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",16,,n3 - exponent of 3 for the number of intervals on main triangle sides,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",17-18,,ni - number of intervals on main triangle sides of the icosahedron,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",19,,nd - number of diamonds,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",20-23,,Latitude of the pole point of the icosahedron on the sphere,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",24-27,,Longitude of the pole point of the icosahedron on the sphere,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",28-31,,Longitude of the centre line of the first diamond of the icosahedron on the sphere,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",32,,Grid point position,(see Code table 3.8),,3.8,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",33,,Numbering order of diamonds,(see Flag table 3.9),,,3.9,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",34,,Scanning mode for one diamond,(see Flag table 3.10),,,3.10,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",35-38,,nt - total number of grid points,,,,,Operational
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",15,1,n2 - exponent of 2 for the number of intervals on main triangle sides,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",16,1,n3 - exponent of 3 for the number of intervals on main triangle sides,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",17-18,2,ni - number of intervals on main triangle sides of the icosahedron,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",19,1,nd - number of diamonds,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",20-23,4,Latitude of the pole point of the icosahedron on the sphere,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",24-27,4,Longitude of the pole point of the icosahedron on the sphere,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",28-31,4,Longitude of the centre line of the first diamond of the icosahedron on the sphere,,,,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",32,1,Grid point position,(see Code table 3.8),,3.8,,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",33,1,Numbering order of diamonds,(see Flag table 3.9),,,3.9,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",34,1,Scanning mode for one diamond,(see Flag table 3.10),,,3.10,Operational
"triangular grid based on an icosahedron (see Part B, GRIB Attachment I)",35-38,4,nt - total number of grid points,,,,,Operational
10 changes: 5 additions & 5 deletions GRIB2_Template_3_101_GridDefinitionTemplate_en.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
general unstructured grid,15,,Shape of the Earth,(see Code table 3.2),,3.2,,Operational
general unstructured grid,16-18,,Number of grid used (defined by originating centre),,,,,Operational
general unstructured grid,19,,Number of grid in reference (to allow annotating for Arakawa C-grid on arbitrary grid),(see Note),86,,,Operational
general unstructured grid,20-35,,Universally Unique Identifier of horizontal grid,,,,,Operational
Title_en,OctetNo,OctetCount,Contents_en,Note_en,noteIDs,codeTable,flagTable,Status
general unstructured grid,15,1,Shape of the Earth,(see Code table 3.2),,3.2,,Operational
general unstructured grid,16-18,3,Number of grid used (defined by originating centre),,,,,Operational
general unstructured grid,19,1,Number of grid in reference (to allow annotating for Arakawa C-grid on arbitrary grid),(see Note),86,,,Operational
general unstructured grid,20-35,16,Universally Unique Identifier of horizontal grid,,,,,Operational
Loading

0 comments on commit ea4c75a

Please sign in to comment.