core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes to bad merge

This commit is contained in:
Matthew Griffith 2024-12-20 17:09:26 +00:00
parent df67b31d67
commit c3f794706f
4 changed files with 60 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
definitions/grib2/localConcepts/ecmf/name.def
View File

@ -2467,8 +2467,8 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
'Mean surface runoff rate' = {
#Time-mean surface runoff rate
'Time-mean surface runoff rate' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
@ -2476,8 +2476,8 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
'Mean sub-surface runoff rate' = {
#Time-mean sub-surface runoff rate
'Time-mean sub-surface runoff rate' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
@ -14009,39 +14009,6 @@
parameterCategory = 20 ;
parameterNumber = 192 ;
}
<<<<<<< HEAD
#Emission mass flux from commercial buildings heating
'Emission mass flux from commercial buildings heating' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 77 ;
sourceSinkChemicalPhysicalProcess = 197 ;
}
#Emission mass flux from residential heating
'Emission mass flux from residential heating' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 77 ;
sourceSinkChemicalPhysicalProcess = 198 ;
}
#Emission mass flux from oil refineries and transformation industry
'Emission mass flux from oil refineries and transformation industry' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 77 ;
sourceSinkChemicalPhysicalProcess = 199 ;
}
#Emission mass flux from gas production
'Emission mass flux from gas production' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 77 ;
sourceSinkChemicalPhysicalProcess = 200 ;
}
#Volume-mean total column mixing ratio
'Volume-mean total column mixing ratio' = {
localTablesVersion = 2 ;
@ -14142,8 +14109,6 @@
parameterNumber = 77 ;
sourceSinkChemicalPhysicalProcess = 200 ;
}
=======
>>>>>>> origin/develop
#Stream function gradient
'Stream function gradient' = {
discipline = 192 ;
@ -18630,8 +18595,8 @@
parameterCategory = 172 ;
parameterNumber = 45 ;
}
#Mean large-scale precipitation rate
'Mean large-scale precipitation rate' = {
#Time-mean large-scale precipitation rate
'Time-mean large-scale precipitation rate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -18639,8 +18604,8 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'Mean convective precipitation rate' = {
#Time-mean convective precipitation rate
'Time-mean convective precipitation rate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -18648,8 +18613,8 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'Mean total snowfall rate' = {
#Time-mean total snowfall rate
'Time-mean total snowfall rate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -18657,20 +18622,20 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean short-wave heating rate
'Mean short-wave heating rate' = {
#Time-mean short-wave (solar) heating rate
'Time-mean short-wave (solar) heating rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 153 ;
}
#Mean long-wave heating rate
'Mean long-wave heating rate' = {
#Time-mean long-wave (thermal) heating rate
'Time-mean long-wave (thermal) heating rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 154 ;
}
#Evaporation
'Evaporation' = {
#Time-mean evaporation rate
'Time-mean evaporation rate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -18678,8 +18643,8 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
'Mean runoff rate' = {
#Time-mean runoff rate
'Time-mean runoff rate' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
@ -18687,8 +18652,8 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
'Mean total precipitation rate' = {
#Time-mean total precipitation rate
'Time-mean total precipitation rate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -18696,14 +18661,14 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
'Convective snowfall' = {
#Time-mean convective snowfall rate
'Time-mean convective snowfall rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 239 ;
}
#Large scale snowfall
'Large scale snowfall' = {
#Time-mean large-scale snowfall rate
'Time-mean large-scale snowfall rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 240 ;

30
definitions/grib2/localConcepts/ecmf/paramId.def
View File

@ -2467,7 +2467,7 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
#Time-mean surface runoff rate
'172008' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -2476,7 +2476,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
#Time-mean sub-surface runoff rate
'172009' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -5263,12 +5263,6 @@
parameterCategory = 213 ;
parameterNumber = 221 ;
}
#Cosine of solar zenith angle
'214001' = {
discipline = 192 ;
parameterCategory = 214 ;
parameterNumber = 1 ;
}
#UV biologically effective dose
'214002' = {
discipline = 192 ;
@ -18601,7 +18595,7 @@
parameterCategory = 172 ;
parameterNumber = 45 ;
}
#Mean large-scale precipitation rate
#Time-mean large-scale precipitation rate
'172142' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18610,7 +18604,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
#Time-mean convective precipitation rate
'172143' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18619,7 +18613,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
#Time-mean total snowfall rate
'172144' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18628,19 +18622,19 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean short-wave heating rate
#Time-mean short-wave (solar) heating rate
'172153' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 153 ;
}
#Mean long-wave heating rate
#Time-mean long-wave (thermal) heating rate
'172154' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 154 ;
}
#Evaporation
#Time-mean evaporation rate
'172182' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18649,7 +18643,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
#Time-mean runoff rate
'172205' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -18658,7 +18652,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
#Time-mean total precipitation rate
'172228' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18667,13 +18661,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
#Time-mean convective snowfall rate
'172239' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 239 ;
}
#Large scale snowfall
#Time-mean large-scale snowfall rate
'172240' = {
discipline = 192 ;
parameterCategory = 172 ;

30
definitions/grib2/localConcepts/ecmf/shortName.def
View File

@ -2467,7 +2467,7 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
#Time-mean surface runoff rate
'msror' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -2476,7 +2476,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
#Time-mean sub-surface runoff rate
'mssror' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -5263,12 +5263,6 @@
parameterCategory = 213 ;
parameterNumber = 221 ;
}
#Cosine of solar zenith angle
'uvcossza' = {
discipline = 192 ;
parameterCategory = 214 ;
parameterNumber = 1 ;
}
#UV biologically effective dose
'uvbed' = {
discipline = 192 ;
@ -18601,7 +18595,7 @@
parameterCategory = 172 ;
parameterNumber = 45 ;
}
#Mean large-scale precipitation rate
#Time-mean large-scale precipitation rate
'mlsprt' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18610,7 +18604,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
#Time-mean convective precipitation rate
'cprate' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18619,7 +18613,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
#Time-mean total snowfall rate
'mtsfr' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18628,19 +18622,19 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean short-wave heating rate
#Time-mean short-wave (solar) heating rate
'mswhr' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 153 ;
}
#Mean long-wave heating rate
#Time-mean long-wave (thermal) heating rate
'mlwhr' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 154 ;
}
#Evaporation
#Time-mean evaporation rate
'erate' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18649,7 +18643,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
#Time-mean runoff rate
'mrort' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -18658,7 +18652,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
#Time-mean total precipitation rate
'tprate' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18667,13 +18661,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
#Time-mean convective snowfall rate
'~' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 239 ;
}
#Large scale snowfall
#Time-mean large-scale snowfall rate
'~' = {
discipline = 192 ;
parameterCategory = 172 ;

30
definitions/grib2/localConcepts/ecmf/units.def
View File

@ -2467,7 +2467,7 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
#Time-mean surface runoff rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -2476,7 +2476,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
#Time-mean sub-surface runoff rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -5263,12 +5263,6 @@
parameterCategory = 213 ;
parameterNumber = 221 ;
}
#Cosine of solar zenith angle
'~' = {
discipline = 192 ;
parameterCategory = 214 ;
parameterNumber = 1 ;
}
#UV biologically effective dose
'~' = {
discipline = 192 ;
@ -18601,7 +18595,7 @@
parameterCategory = 172 ;
parameterNumber = 45 ;
}
#Mean large-scale precipitation rate
#Time-mean large-scale precipitation rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18610,7 +18604,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
#Time-mean convective precipitation rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18619,7 +18613,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
#Time-mean total snowfall rate
'm of water equivalent s**-1' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18628,19 +18622,19 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean short-wave heating rate
#Time-mean short-wave (solar) heating rate
'K s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 153 ;
}
#Mean long-wave heating rate
#Time-mean long-wave (thermal) heating rate
'K s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 154 ;
}
#Evaporation
#Time-mean evaporation rate
'm of water equivalent s**-1' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18649,7 +18643,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
#Time-mean runoff rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 2 ;
@ -18658,7 +18652,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
#Time-mean total precipitation rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 0 ;
@ -18667,13 +18661,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
#Time-mean convective snowfall rate
'm of water equivalent s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 239 ;
}
#Large scale snowfall
#Time-mean large-scale snowfall rate
'm of water equivalent s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;