Skip to content

Commit

Permalink
fix rebase conflicts xml,txt files
Browse files Browse the repository at this point in the history
  • Loading branch information
efucile authored and amilan17 committed Jun 26, 2024
1 parent 373a9e1 commit 3cc532f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
3 changes: 2 additions & 1 deletion txt/CodeFlag.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2071,7 +2071,8 @@ Code table 4.9 - Probability type,,6,,Probability of event in above normal categ
Code table 4.9 - Probability type,,7,,Probability of event in near normal category,(see Notes 1 and 2),"7,9",,Operational
Code table 4.9 - Probability type,,8,,Probability of event in below normal category,(see Notes 1 and 2),"7,9",,Operational
Code table 4.9 - Probability type,,9,,Probability based on counts of categorical boolean,(see Note 3),155,,Operational
Code table 4.9 - Probability type,,10-191,,Reserved,,,,Operational
Code table 4.9 - Probability type,,10,,Probability of event within the quantile of the PDF,(see Note 4),247a,,Operational§
Code table 4.9 - Probability type,,11-191,,Reserved,,,,Operational
Code table 4.9 - Probability type,,192-254,,Reserved for local use,,,,Operational
Code table 4.9 - Probability type,,255,,Missing,,,,Operational
Code table 4.10 - Type of statistical processing,,0,,Average,,,,Operational
Expand Down
10 changes: 8 additions & 2 deletions xml/CodeFlag.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-06-24T21:56:48.438854">
<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-06-24T22:05:00.844923">
<GRIB2_CodeFlag_en>
<Title_en>Code table 0.0 - Discipline of processed data in the GRIB message, number of GRIB Master table</Title_en>
<CodeFlag>0</CodeFlag>
Expand Down Expand Up @@ -12434,7 +12434,13 @@
</GRIB2_CodeFlag_en>
<GRIB2_CodeFlag_en>
<Title_en>Code table 4.9 - Probability type</Title_en>
<CodeFlag>10-191</CodeFlag>
<CodeFlag>10</CodeFlag>
<MeaningParameterDescription_en>Probability of event within the quantile of the PDF</MeaningParameterDescription_en>
<Status>Operational§</Status>
</GRIB2_CodeFlag_en>
<GRIB2_CodeFlag_en>
<Title_en>Code table 4.9 - Probability type</Title_en>
<CodeFlag>11-191</CodeFlag>
<MeaningParameterDescription_en>Reserved</MeaningParameterDescription_en>
<Status>Operational</Status>
</GRIB2_CodeFlag_en>
Expand Down
2 changes: 1 addition & 1 deletion xml/Template.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-06-24T21:56:48.438854">
<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-06-24T22:05:00.844923">
<GRIB2_Template_en>
<Title_en>Identification template 1.0 - calendar definition</Title_en>
<OctetNo>24</OctetNo>
Expand Down

0 comments on commit 3cc532f

Please sign in to comment.