From 2ad80bd535b627276b931221bad9d59f81fae45c Mon Sep 17 00:00:00 2001 From: Enrico Fucile Date: Mon, 8 Jul 2024 12:03:54 +0000 Subject: [PATCH 1/3] xml,txt files --- xml/CodeFlag.xml | 2 +- xml/Template.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/CodeFlag.xml b/xml/CodeFlag.xml index 5f339e4..b6b684d 100644 --- a/xml/CodeFlag.xml +++ b/xml/CodeFlag.xml @@ -1,5 +1,5 @@ - + Code table 0.0 - Discipline of processed data in the GRIB message, number of GRIB Master table 0 diff --git a/xml/Template.xml b/xml/Template.xml index 04ed32a..a092ab9 100644 --- a/xml/Template.xml +++ b/xml/Template.xml @@ -1,5 +1,5 @@ - + Identification template 1.0 - calendar definition 24 From 74c6a4b29c29269cf6cc85ab12c5a9e4259fdb94 Mon Sep 17 00:00:00 2001 From: Anna Milan Date: Wed, 10 Jul 2024 16:52:45 +0200 Subject: [PATCH 2/3] 247 code table 49 add an entry to encode a probability based on a quantile distribution instead of based on a threshold (#265) * fix rebase conflict xml,txt files * fix rebase conflicts 247 adding entry in COde table 4.9 and associated note * fix rebase conflicts xml,txt files * xml,txt files * #247 changing PDF acronym to probability distribution function * xml,txt files * remove odd char * xml,txt files * xml,txt files * remove datestamp from XML gen * xml,txt files --------- Co-authored-by: Enrico Fucile Co-authored-by: Sebastien Villaume --- GRIB2_CodeFlag_4_9_CodeTable_en.csv | 5 +++-- notes/CodeFlag_notes.csv | 3 ++- txt/CodeFlag.txt | 3 ++- xml/CodeFlag.xml | 8 +++++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/GRIB2_CodeFlag_4_9_CodeTable_en.csv b/GRIB2_CodeFlag_4_9_CodeTable_en.csv index 3bf7e53..6ca1597 100644 --- a/GRIB2_CodeFlag_4_9_CodeTable_en.csv +++ b/GRIB2_CodeFlag_4_9_CodeTable_en.csv @@ -9,6 +9,7 @@ Probability type,,6,,Probability of event in above normal category,(see Notes 1 Probability type,,7,,Probability of event in near normal category,(see Notes 1 and 2),"7,9",,Operational Probability type,,8,,Probability of event in below normal category,(see Notes 1 and 2),"7,9",,Operational Probability type,,9,,Probability based on counts of categorical boolean,(see Note 3),155,,Operational -Probability type,,10-191,,Reserved,,,,Operational +Probability type,,10,,Probability of event within the quantile of the probability distribution function,(see Note 4),247a,,Operational +Probability type,,11-191,,Reserved,,,,Operational Probability type,,192-254,,Reserved for local use,,,,Operational -Probability type,,255,,Missing,,,,Operational +Probability type,,255,,Missing,,,,Operational \ No newline at end of file diff --git a/notes/CodeFlag_notes.csv b/notes/CodeFlag_notes.csv index 349110f..28d7392 100644 --- a/notes/CodeFlag_notes.csv +++ b/notes/CodeFlag_notes.csv @@ -149,4 +149,5 @@ noteID,note 152,"The following additional arguments must be specified: • Circle - 1 argument for the radius in metres • Rectangle - 2 arguments for the length in 1. west-east and 2. south-north in metres • Square - 1 argument for the length of the equal-length sides in metres • Wedge - 3 arguments for 1. radius in metres and 2. start and 3. end radius in arithmetic degrees with 0 on the positive axis along west-east and counted counter-clockwise. • span of grid cells - 2 arguments regarding the number of grid cells in 1. west-east and 2. south-north so that the span is i+/-x and j+/-y" 153,"The option quantile needs two additional arguments: 1) The total number of quantiles and 2) the quantile value." 154,"These parameters are intended to be used with templates 4.121 and 4.122 in which the spatiotemporal criteria is encoded used to get a categorical yes/no per grid point of each ensemble member." -155,"Scale Factor of Lower Limit, Scaled Value of Lower Limit, Scale Factor of Upper Limit and Scaled Value of Upper Limit must be set to missing. This entry is intended for, but not limited to, entries 5 to 7 in Code table 4.2 discipline 0 category 191." \ No newline at end of file +155,"Scale Factor of Lower Limit, Scaled Value of Lower Limit, Scale Factor of Upper Limit and Scaled Value of Upper Limit must be set to missing. This entry is intended for, but not limited to, entries 5 to 7 in Code table 4.2 discipline 0 category 191." +247a,"When using entry 10, the lower limit is used to encode the quantile q (must be an integer between 0 and Q) while the upper limit is used to encode the total number of quantiles Q. This defines the probability of the parameter falling within quantile q. For instance, to encode the probability of falling within the 10th percentile, then q=10 and Q=100; to encode the probability of falling within the 1st tercile, then q=1 and Q=3." diff --git a/txt/CodeFlag.txt b/txt/CodeFlag.txt index 98c850c..810b614 100644 --- a/txt/CodeFlag.txt +++ b/txt/CodeFlag.txt @@ -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 probability distribution function,(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 diff --git a/xml/CodeFlag.xml b/xml/CodeFlag.xml index a10159c..da45bf8 100644 --- a/xml/CodeFlag.xml +++ b/xml/CodeFlag.xml @@ -12434,7 +12434,13 @@ Code table 4.9 - Probability type - 10-191 + 10 + Probability of event within the quantile of the probability distribution function + Operational + + + Code table 4.9 - Probability type + 11-191 Reserved Operational From 4c90c65efbdee4d33ea8524f993928b86dc89313 Mon Sep 17 00:00:00 2001 From: Anna Milan Date: Thu, 11 Jul 2024 14:31:24 +0200 Subject: [PATCH 3/3] 253 new normal and tangential velocity.... (#270) * xml,txt files * xml,txt files * issue #253 update branch * xml,txt files * Update GRIB2_CodeFlag_4_2_10_4_CodeTable_en.csv 53 and 54 for normal and tangential component of water velocity, as entry 52 is used in issue 244 for mixed layed depth. * xml,txt files --------- Co-authored-by: Enrico Fucile Co-authored-by: Sibylle Krebber <62389319+SibylleK@users.noreply.github.com> --- GRIB2_CodeFlag_4_2_10_4_CodeTable_en.csv | 4 +++- notes/CodeFlag_notes.csv | 3 ++- txt/CodeFlag.txt | 4 +++- xml/CodeFlag.xml | 14 +++++++++++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/GRIB2_CodeFlag_4_2_10_4_CodeTable_en.csv b/GRIB2_CodeFlag_4_2_10_4_CodeTable_en.csv index d656e0e..dfba439 100644 --- a/GRIB2_CodeFlag_4_2_10_4_CodeTable_en.csv +++ b/GRIB2_CodeFlag_4_2_10_4_CodeTable_en.csv @@ -49,6 +49,8 @@ Parameter number by product discipline and parameter category,"Product disciplin Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",49,,Sea water column integrated zonal mass transport,,,kg m-1 s-1,Operational Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",50,,Sea water column integrated practical salinity,,,g kg-1 m,Operational Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",51,,Sea water column integrated salinity,,,kg kg-1 m,Operational -Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",52-191,,Reserved,,,,Operational +Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",53,,Normal component of water velocity,(see Note 3),253a,m s-1,Operational +Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",54,,Tangential component of water velocity,(see Note 3),253a,m s-1,Operational +Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",55-191,,Reserved,,,,Operational Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",192-254,,Reserved for local use,,,,Operational Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",255,,Missing,,,,Operational diff --git a/notes/CodeFlag_notes.csv b/notes/CodeFlag_notes.csv index 28d7392..5d04456 100644 --- a/notes/CodeFlag_notes.csv +++ b/notes/CodeFlag_notes.csv @@ -150,4 +150,5 @@ noteID,note 153,"The option quantile needs two additional arguments: 1) The total number of quantiles and 2) the quantile value." 154,"These parameters are intended to be used with templates 4.121 and 4.122 in which the spatiotemporal criteria is encoded used to get a categorical yes/no per grid point of each ensemble member." 155,"Scale Factor of Lower Limit, Scaled Value of Lower Limit, Scale Factor of Upper Limit and Scaled Value of Upper Limit must be set to missing. This entry is intended for, but not limited to, entries 5 to 7 in Code table 4.2 discipline 0 category 191." -247a,"When using entry 10, the lower limit is used to encode the quantile q (must be an integer between 0 and Q) while the upper limit is used to encode the total number of quantiles Q. This defines the probability of the parameter falling within quantile q. For instance, to encode the probability of falling within the 10th percentile, then q=10 and Q=100; to encode the probability of falling within the 1st tercile, then q=1 and Q=3." +253a,In relation to local coordinate axes at a (grid) cell edge. +247a,"When using entry 10, the lower limit is used to encode the quantile q (must be an integer between 0 and Q) while the upper limit is used to encode the total number of quantiles Q. This defines the probability of the parameter falling within quantile q. For instance, to encode the probability of falling within the 10th percentile, then q=10 and Q=100; to encode the probability of falling within the 1st tercile, then q=1 and Q=3." \ No newline at end of file diff --git a/txt/CodeFlag.txt b/txt/CodeFlag.txt index 810b614..4746ff1 100644 --- a/txt/CodeFlag.txt +++ b/txt/CodeFlag.txt @@ -1846,7 +1846,9 @@ Code table 4.2 - Parameter number by product discipline and parameter category," Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",49,,Sea water column integrated zonal mass transport,,,kg m-1 s-1,Operational Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",50,,Sea water column integrated practical salinity,,,g kg-1 m,Operational Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",51,,Sea water column integrated salinity,,,kg kg-1 m,Operational -Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",52-191,,Reserved,,,,Operational +Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",53,,Normal component of water velocity,(see Note 3),253a,m s-1,Operational +Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",54,,Tangential component of water velocity,(see Note 3),253a,m s-1,Operational +Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",55-191,,Reserved,,,,Operational Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",192-254,,Reserved for local use,,,,Operational Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties",255,,Missing,,,,Operational Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 10 - Oceanographic products, parameter category 191: miscellaneous",0,,Seconds prior to initial reference time (defined in Section 1),,,s,Operational diff --git a/xml/CodeFlag.xml b/xml/CodeFlag.xml index da45bf8..0926c5c 100644 --- a/xml/CodeFlag.xml +++ b/xml/CodeFlag.xml @@ -11084,7 +11084,19 @@ Code table 4.2 - Parameter number by product discipline and parameter category - 52-191 + 53 + Normal component of water velocity + Operational + + + Code table 4.2 - Parameter number by product discipline and parameter category + 54 + Tangential component of water velocity + Operational + + + Code table 4.2 - Parameter number by product discipline and parameter category + 55-191 Reserved Operational