Skip to content

Commit 4ee6bf0

Browse files
authored
Merge branch 'FT2025-2' into 317-new-wave-parameters
2 parents 2dc26fb + 1c104b5 commit 4ee6bf0

File tree

5 files changed

+62
-8
lines changed

5 files changed

+62
-8
lines changed

GRIB2_CodeFlag_4_2_1_0_CodeTable_en.csv

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ Parameter number by product discipline and parameter category,"Product disciplin
2020
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",18,,Floodplain outflow of water,,,m3 s-1,Operational
2121
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",19,,Floodpath outflow of water,,,m3 s-1,Operational
2222
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",20,,Water on surface,,,kg m-2,Operational
23-
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",21-191,,Reserved,,,,Operational
23+
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",21,,Water surface elevation,(see Note 5),315a,m,Operational
24+
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",22,,Groundwater return flow rate,(see Note 6),315b,m3 s-1,Operational
25+
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",23,,River and floodplain storage,(see Note 7),315c,m3,Operational
26+
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",24,,Depth averaged river velocity,(see Note 8),315d,m s-1,Operational
27+
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",25-191,,Reserved,,,,Operational
2428
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",192-254,,Reserved for local use,,,,Operational
2529
Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",255,,Missing,,,,Operational

GRIB2_CodeFlag_4_2_2_4_CodeTable_en.csv

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Parameter number by product discipline and parameter category,"Product disciplin
33
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",1,,Fire outlook due to dry thunderstorm,,,(Code table 4.224),Operational
44
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",2,,Haines index,,,Numeric,Operational
55
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",3,,Fire burned area,,,%,Operational
6-
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",4,,Fosberg index,(see Note),87,Numeric,Operational
6+
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",4,,Fosberg index,(see Note 1),87,Numeric,Operational
77
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",5,,Forest Fire Weather Index (as defined by the Canadian Forest Service),,,Numeric,Operational
88
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",6,,Fine Fuel Moisture Code (as defined by the Canadian Forest Service),,,Numeric,Operational
99
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",7,,Duff Moisture Code (as defined by the Canadian Forest Service),,,Numeric,Operational
@@ -42,6 +42,8 @@ Parameter number by product discipline and parameter category,"Product disciplin
4242
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",40,,Injection height,,,m,Operational
4343
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",41,,Plume bottom height,,,m,Operational
4444
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",42,,Plume top height,,,m,Operational
45-
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",43-191,,Reserved,,,,Operational
45+
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",43,,Probability of fire detection,(see Note 2),316a,%,Operation
46+
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",44,,Probability of ignition from lightning,(see Note 3),316b,%,Operational
47+
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",45-191,,Reserved,,,,Operational
4648
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",192-254,,Reserved for local use,,,,Operational
4749
Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",255,,Missing,,,,Operational

notes/CodeFlag_notes.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,11 @@ noteID,note
178178
181,"This is a metric that quantifies the wave-induced mechanical fatigue on the sea-ice pack (0 means broken, 1 means solid). This metric only makes sense in the presence of sea ice."
179179
182,"The x- and y- components of the wave radiative stress to sea-ice are not necessarily equivalent to the u- and v- components (eastward/northward). The x- and y- components strictly follow the defined coordinate system which may or may not follow the eastward and northward directions."
180180
317a,"The atmospheric surface momentum flux is what the atmosphere is losing at the surface of the ocean. The surface momentum flux into the ocean is the momentum flux that is entering the ocean and driving the ocean circulation. The difference is that part of the atmospheric momentum flux goes into the waves and not into the ocean circulation or part of the momentum contained in the wave field that is transferred to the ocean when waves break. In short, the ocean surface has waves which modulate the momentum transfer between the atmosphere and the ocean interior."
181+
316a,"Probability that a fire will be observed in the grid box."
182+
316b,"Probability of ignition from lightning."
183+
315a,"Water surface elevation in the river and floodplains defined by the model as base elevation."
184+
315b,"Water flow from the groundwater storage to the main river channel."
185+
315c,"The amount of water stored in the main river channel and on the floodplain within a grid cell. The term storage refers to the total volume of water. This entry is the sum of entries 11 and 12."
186+
315d,"River flow velocity computed along the river network. It represents the mean speed of water movement in a cross-section of the river channel."
181187
GRIB-312-1,"Mean mass diameter is the diameter of a particle representing the mean mass of the particle size distribution."
182188
GRIB-312-2,"Estimated maximum diameter is the empirical estimate of the maximum particle size, based on a particle size distribution or its moments."

txt/CodeFlag.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,11 @@ Code table 4.2 - Parameter number by product discipline and parameter category,"
12751275
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",18,,Floodplain outflow of water,,,m3 s-1,Operational
12761276
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",19,,Floodpath outflow of water,,,m3 s-1,Operational
12771277
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",20,,Water on surface,,,kg m-2,Operational
1278-
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",21-191,,Reserved,,,,Operational
1278+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",21,,Water surface elevation,(see Note 5),315a,m,Operational
1279+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",22,,Groundwater return flow rate,(see Note 6),315b,m3 s-1,Operational
1280+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",23,,River and floodplain storage,(see Note 7),315c,m3,Operational
1281+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",24,,Depth averaged river velocity,(see Note 8),315d,m s-1,Operational
1282+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",25-191,,Reserved,,,,Operational
12791283
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",192-254,,Reserved for local use,,,,Operational
12801284
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products",255,,Missing,,,,Operational
12811285
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 1 - Hydrological products, parameter category 1: hydrology probabilities",0,,Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation),,,kg m-2,Operational
@@ -1416,7 +1420,7 @@ Code table 4.2 - Parameter number by product discipline and parameter category,"
14161420
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",1,,Fire outlook due to dry thunderstorm,,,(Code table 4.224),Operational
14171421
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",2,,Haines index,,,Numeric,Operational
14181422
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",3,,Fire burned area,,,%,Operational
1419-
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",4,,Fosberg index,(see Note),87,Numeric,Operational
1423+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",4,,Fosberg index,(see Note 1),87,Numeric,Operational
14201424
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",5,,Forest Fire Weather Index (as defined by the Canadian Forest Service),,,Numeric,Operational
14211425
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",6,,Fine Fuel Moisture Code (as defined by the Canadian Forest Service),,,Numeric,Operational
14221426
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",7,,Duff Moisture Code (as defined by the Canadian Forest Service),,,Numeric,Operational
@@ -1455,7 +1459,9 @@ Code table 4.2 - Parameter number by product discipline and parameter category,"
14551459
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",40,,Injection height,,,m,Operational
14561460
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",41,,Plume bottom height,,,m,Operational
14571461
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",42,,Plume top height,,,m,Operational
1458-
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",43-191,,Reserved,,,,Operational
1462+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",43,,Probability of fire detection,(see Note 2),316a,%,Operation
1463+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",44,,Probability of ignition from lightning,(see Note 3),316b,%,Operational
1464+
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",45-191,,Reserved,,,,Operational
14591465
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",192-254,,Reserved for local use,,,,Operational
14601466
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 4: fire weather products",255,,Missing,,,,Operational
14611467
Code table 4.2 - Parameter number by product discipline and parameter category,"Product discipline 2 - Land surface products, parameter category 5: glaciers and inland ice",0,,Glacier cover,(see Note),26,Proportion,Operational

xml/CodeFlag.xml

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7658,7 +7658,31 @@
76587658
</GRIB2_CodeFlag_en>
76597659
<GRIB2_CodeFlag_en>
76607660
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
7661-
<CodeFlag>21-191</CodeFlag>
7661+
<CodeFlag>21</CodeFlag>
7662+
<MeaningParameterDescription_en>Water surface elevation</MeaningParameterDescription_en>
7663+
<Status>Operational</Status>
7664+
</GRIB2_CodeFlag_en>
7665+
<GRIB2_CodeFlag_en>
7666+
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
7667+
<CodeFlag>22</CodeFlag>
7668+
<MeaningParameterDescription_en>Groundwater return flow rate</MeaningParameterDescription_en>
7669+
<Status>Operational</Status>
7670+
</GRIB2_CodeFlag_en>
7671+
<GRIB2_CodeFlag_en>
7672+
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
7673+
<CodeFlag>23</CodeFlag>
7674+
<MeaningParameterDescription_en>River and floodplain storage</MeaningParameterDescription_en>
7675+
<Status>Operational</Status>
7676+
</GRIB2_CodeFlag_en>
7677+
<GRIB2_CodeFlag_en>
7678+
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
7679+
<CodeFlag>24</CodeFlag>
7680+
<MeaningParameterDescription_en>Depth averaged river velocity</MeaningParameterDescription_en>
7681+
<Status>Operational</Status>
7682+
</GRIB2_CodeFlag_en>
7683+
<GRIB2_CodeFlag_en>
7684+
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
7685+
<CodeFlag>25-191</CodeFlag>
76627686
<MeaningParameterDescription_en>Reserved</MeaningParameterDescription_en>
76637687
<Status>Operational</Status>
76647688
</GRIB2_CodeFlag_en>
@@ -8738,7 +8762,19 @@
87388762
</GRIB2_CodeFlag_en>
87398763
<GRIB2_CodeFlag_en>
87408764
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
8741-
<CodeFlag>43-191</CodeFlag>
8765+
<CodeFlag>43</CodeFlag>
8766+
<MeaningParameterDescription_en>Probability of fire detection</MeaningParameterDescription_en>
8767+
<Status>Operation</Status>
8768+
</GRIB2_CodeFlag_en>
8769+
<GRIB2_CodeFlag_en>
8770+
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
8771+
<CodeFlag>44</CodeFlag>
8772+
<MeaningParameterDescription_en>Probability of ignition from lightning</MeaningParameterDescription_en>
8773+
<Status>Operational</Status>
8774+
</GRIB2_CodeFlag_en>
8775+
<GRIB2_CodeFlag_en>
8776+
<Title_en>Code table 4.2 - Parameter number by product discipline and parameter category</Title_en>
8777+
<CodeFlag>45-191</CodeFlag>
87428778
<MeaningParameterDescription_en>Reserved</MeaningParameterDescription_en>
87438779
<Status>Operational</Status>
87448780
</GRIB2_CodeFlag_en>

0 commit comments

Comments
 (0)