Skip to content

Commit

Permalink
Merge branch 'hotfix/2.34.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@shahramn
shahramn committed Feb 23, 2024
2 parents 859894a + 6f5783e commit 2fd0579
Show file tree
Hide file tree
Showing 27 changed files with 376 additions and 102 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.34.0
2.34.1
8 changes: 6 additions & 2 deletions definitions/grib2/cfVarName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7841,7 +7841,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Sea water potential temperature tendency due to newtonian relaxation
'thetaodmp' = {
Expand Down Expand Up @@ -9028,7 +9030,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea water potential temperature tendency due to newtonian relaxation
Expand Down
17 changes: 17 additions & 0 deletions definitions/grib2/cfVarName.legacy.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,20 @@
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#Upward sea water velocity
'wo' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
}
#Time-mean upward sea water velocity
'avg_wo' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfStatisticalProcessing = 0 ;
}
7 changes: 7 additions & 0 deletions definitions/grib2/localConcepts/s2s/cfVarName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,11 @@
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Snow depth water equivalent
'sd' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 60 ;
typeOfStatisticalProcessing = 0 ;
}
7 changes: 7 additions & 0 deletions definitions/grib2/localConcepts/s2s/name.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,11 @@
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Snow depth water equivalent
'Snow depth water equivalent' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 60 ;
typeOfStatisticalProcessing = 0 ;
}
7 changes: 7 additions & 0 deletions definitions/grib2/localConcepts/s2s/paramId.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,11 @@
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Snow depth water equivalent
'228141' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 60 ;
typeOfStatisticalProcessing = 0 ;
}
7 changes: 7 additions & 0 deletions definitions/grib2/localConcepts/s2s/shortName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,11 @@
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Snow depth water equivalent
'sd' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 60 ;
typeOfStatisticalProcessing = 0 ;
}
7 changes: 7 additions & 0 deletions definitions/grib2/localConcepts/s2s/units.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,11 @@
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Snow depth water equivalent
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 60 ;
typeOfStatisticalProcessing = 0 ;
}
8 changes: 6 additions & 2 deletions definitions/grib2/name.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7841,7 +7841,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Sea water potential temperature tendency due to newtonian relaxation
'Sea water potential temperature tendency due to newtonian relaxation' = {
Expand Down Expand Up @@ -9028,7 +9030,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea water potential temperature tendency due to newtonian relaxation
Expand Down
17 changes: 17 additions & 0 deletions definitions/grib2/name.legacy.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,20 @@
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#Upward sea water velocity
'Upward sea water velocity' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
}
#Time-mean upward sea water velocity
'Time-mean upward sea water velocity' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfStatisticalProcessing = 0 ;
}
8 changes: 6 additions & 2 deletions definitions/grib2/paramId.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7841,7 +7841,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Sea water potential temperature tendency due to newtonian relaxation
'262508' = {
Expand Down Expand Up @@ -9028,7 +9030,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea water potential temperature tendency due to newtonian relaxation
Expand Down
17 changes: 17 additions & 0 deletions definitions/grib2/paramId.legacy.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,20 @@
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#Upward sea water velocity
'262507' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
}
#Time-mean upward sea water velocity
'263507' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfStatisticalProcessing = 0 ;
}
8 changes: 6 additions & 2 deletions definitions/grib2/shortName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7841,7 +7841,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Sea water potential temperature tendency due to newtonian relaxation
'thetaodmp' = {
Expand Down Expand Up @@ -9028,7 +9030,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea water potential temperature tendency due to newtonian relaxation
Expand Down
17 changes: 17 additions & 0 deletions definitions/grib2/shortName.legacy.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,20 @@
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#Upward sea water velocity
'wo' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
}
#Time-mean upward sea water velocity
'avg_wo' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfStatisticalProcessing = 0 ;
}
3 changes: 2 additions & 1 deletion definitions/grib2/stepUnits.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
# template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def";
# codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy;

meta stepUnits optimal_step_units(forecastTime,indicatorOfUnitOfTimeRange,lengthOfTimeRange,indicatorOfUnitForTimeRange) : transient,dump;
# See ECC-1768 re why no_copy is needed
meta stepUnits optimal_step_units(forecastTime,indicatorOfUnitOfTimeRange,lengthOfTimeRange,indicatorOfUnitForTimeRange) : dump,no_copy;
transient startStepUnit = 255 : hidden; # 255 means MISSING. See code table 4.4
transient endStepUnit = 255 : hidden;
# The lowercase version is to unify it with the helper key in the MARS language
Expand Down
2 changes: 1 addition & 1 deletion definitions/grib2/tables/local/ecmf/1/4.2.0.1.table
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Code table 4.2 - discipline=0 category=1 for ECMWF
192 192 Snow evaporation rate (kg m-2 s-1)
193 193 Total precipitation rate (m s-1)
194 194 Accumulated freezing rain (m)
194 194 Freezing rain precipitation rate (m s-1)
195 195 Convective precipitation rate (m s-1)
196 196 Large-scale precipitation rate (m s-1)
197 197 Snow evaporation rate (m of water equivalent s-1)
Expand Down
8 changes: 6 additions & 2 deletions definitions/grib2/units.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7841,7 +7841,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Sea water potential temperature tendency due to newtonian relaxation
'K s**-1' = {
Expand Down Expand Up @@ -9028,7 +9030,9 @@
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea water potential temperature tendency due to newtonian relaxation
Expand Down
17 changes: 17 additions & 0 deletions definitions/grib2/units.legacy.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,20 @@
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#Upward sea water velocity
'm s**-1' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
}
#Time-mean upward sea water velocity
'm s**-1' = {
discipline = 10 ;
parameterCategory = 4 ;
parameterNumber = 27 ;
typeOfFirstFixedSurface = 168 ;
typeOfSecondFixedSurface = 168 ;
typeOfStatisticalProcessing = 0 ;
}
8 changes: 7 additions & 1 deletion definitions/mars/grib.mmsf.fc.def
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
alias mars.step = endStep;
if (levtype is "o2d" || levtype is "o3d") {
alias mars.step = stepRange;
} else {
alias mars.step = endStep;
}

if (class is "od") { alias mars.system = systemNumber; }
if (class is "me") { alias mars.system = systemNumber; }
if (class is "en") { alias mars.system = systemNumber; }
if (class is "c3") { alias mars.system = systemNumber; }
if (class is "ci") { alias mars.system = systemNumber; }
alias mars.number = perturbationNumber;
alias mars.method = methodNumber;

Expand Down
1 change: 1 addition & 0 deletions definitions/mars/grib.msmm.fcmean.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ if (class is "od") { alias mars.system = systemNumber; }
if (class is "me") { alias mars.system = systemNumber; }
if (class is "en") { alias mars.system = systemNumber; }
if (class is "c3") { alias mars.system = systemNumber; }
if (class is "ci") { alias mars.system = systemNumber; }

# See ECC-624
if (centre == 80 && subCentre == 98 && class is "c3") {
Expand Down
Loading

0 comments on commit 2fd0579

Please sign in to comment.