Skip to content

Commit 2fd0579

Browse files
shahramnshahramn
committed
Merge branch 'hotfix/2.34.1'
2 parents 859894a + 6f5783e commit 2fd0579

27 files changed

+376
-102
lines changed

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.34.0
1+
2.34.1

‎definitions/grib2/cfVarName.def

+6-2
Original file line numberDiff line numberDiff line change
@@ -7841,7 +7841,9 @@
78417841
parameterCategory = 4 ;
78427842
parameterNumber = 27 ;
78437843
typeOfFirstFixedSurface = 168 ;
7844-
typeOfSecondFixedSurface = 168 ;
7844+
typeOfSecondFixedSurface = 255 ;
7845+
scaledValueOfSecondFixedSurface = missing() ;
7846+
scaleFactorOfSecondFixedSurface = missing() ;
78457847
}
78467848
#Sea water potential temperature tendency due to newtonian relaxation
78477849
'thetaodmp' = {
@@ -9028,7 +9030,9 @@
90289030
parameterCategory = 4 ;
90299031
parameterNumber = 27 ;
90309032
typeOfFirstFixedSurface = 168 ;
9031-
typeOfSecondFixedSurface = 168 ;
9033+
typeOfSecondFixedSurface = 255 ;
9034+
scaledValueOfSecondFixedSurface = missing() ;
9035+
scaleFactorOfSecondFixedSurface = missing() ;
90329036
typeOfStatisticalProcessing = 0 ;
90339037
}
90349038
#Time-mean sea water potential temperature tendency due to newtonian relaxation

‎definitions/grib2/cfVarName.legacy.def

+17
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,20 @@
157157
typeOfStatisticalProcessing = 1 ;
158158
lengthOfTimeRange = 24 ;
159159
}
160+
#Upward sea water velocity
161+
'wo' = {
162+
discipline = 10 ;
163+
parameterCategory = 4 ;
164+
parameterNumber = 27 ;
165+
typeOfFirstFixedSurface = 168 ;
166+
typeOfSecondFixedSurface = 168 ;
167+
}
168+
#Time-mean upward sea water velocity
169+
'avg_wo' = {
170+
discipline = 10 ;
171+
parameterCategory = 4 ;
172+
parameterNumber = 27 ;
173+
typeOfFirstFixedSurface = 168 ;
174+
typeOfSecondFixedSurface = 168 ;
175+
typeOfStatisticalProcessing = 0 ;
176+
}

‎definitions/grib2/localConcepts/s2s/cfVarName.def

+7
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,11 @@
182182
scaledValueOfSecondFixedSurface = missing() ;
183183
scaleFactorOfSecondFixedSurface = missing() ;
184184
typeOfStatisticalProcessing = 0 ;
185+
}
186+
#Snow depth water equivalent
187+
'sd' = {
188+
discipline = 0 ;
189+
parameterCategory = 1 ;
190+
parameterNumber = 60 ;
191+
typeOfStatisticalProcessing = 0 ;
185192
}

‎definitions/grib2/localConcepts/s2s/name.def

+7
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,11 @@
182182
scaledValueOfSecondFixedSurface = missing() ;
183183
scaleFactorOfSecondFixedSurface = missing() ;
184184
typeOfStatisticalProcessing = 0 ;
185+
}
186+
#Snow depth water equivalent
187+
'Snow depth water equivalent' = {
188+
discipline = 0 ;
189+
parameterCategory = 1 ;
190+
parameterNumber = 60 ;
191+
typeOfStatisticalProcessing = 0 ;
185192
}

‎definitions/grib2/localConcepts/s2s/paramId.def

+7
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,11 @@
182182
scaledValueOfSecondFixedSurface = missing() ;
183183
scaleFactorOfSecondFixedSurface = missing() ;
184184
typeOfStatisticalProcessing = 0 ;
185+
}
186+
#Snow depth water equivalent
187+
'228141' = {
188+
discipline = 0 ;
189+
parameterCategory = 1 ;
190+
parameterNumber = 60 ;
191+
typeOfStatisticalProcessing = 0 ;
185192
}

‎definitions/grib2/localConcepts/s2s/shortName.def

+7
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,11 @@
182182
scaledValueOfSecondFixedSurface = missing() ;
183183
scaleFactorOfSecondFixedSurface = missing() ;
184184
typeOfStatisticalProcessing = 0 ;
185+
}
186+
#Snow depth water equivalent
187+
'sd' = {
188+
discipline = 0 ;
189+
parameterCategory = 1 ;
190+
parameterNumber = 60 ;
191+
typeOfStatisticalProcessing = 0 ;
185192
}

‎definitions/grib2/localConcepts/s2s/units.def

+7
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,11 @@
182182
scaledValueOfSecondFixedSurface = missing() ;
183183
scaleFactorOfSecondFixedSurface = missing() ;
184184
typeOfStatisticalProcessing = 0 ;
185+
}
186+
#Snow depth water equivalent
187+
'kg m**-2' = {
188+
discipline = 0 ;
189+
parameterCategory = 1 ;
190+
parameterNumber = 60 ;
191+
typeOfStatisticalProcessing = 0 ;
185192
}

‎definitions/grib2/name.def

+6-2
Original file line numberDiff line numberDiff line change
@@ -7841,7 +7841,9 @@
78417841
parameterCategory = 4 ;
78427842
parameterNumber = 27 ;
78437843
typeOfFirstFixedSurface = 168 ;
7844-
typeOfSecondFixedSurface = 168 ;
7844+
typeOfSecondFixedSurface = 255 ;
7845+
scaledValueOfSecondFixedSurface = missing() ;
7846+
scaleFactorOfSecondFixedSurface = missing() ;
78457847
}
78467848
#Sea water potential temperature tendency due to newtonian relaxation
78477849
'Sea water potential temperature tendency due to newtonian relaxation' = {
@@ -9028,7 +9030,9 @@
90289030
parameterCategory = 4 ;
90299031
parameterNumber = 27 ;
90309032
typeOfFirstFixedSurface = 168 ;
9031-
typeOfSecondFixedSurface = 168 ;
9033+
typeOfSecondFixedSurface = 255 ;
9034+
scaledValueOfSecondFixedSurface = missing() ;
9035+
scaleFactorOfSecondFixedSurface = missing() ;
90329036
typeOfStatisticalProcessing = 0 ;
90339037
}
90349038
#Time-mean sea water potential temperature tendency due to newtonian relaxation

‎definitions/grib2/name.legacy.def

+17
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,20 @@
157157
typeOfStatisticalProcessing = 1 ;
158158
lengthOfTimeRange = 24 ;
159159
}
160+
#Upward sea water velocity
161+
'Upward sea water velocity' = {
162+
discipline = 10 ;
163+
parameterCategory = 4 ;
164+
parameterNumber = 27 ;
165+
typeOfFirstFixedSurface = 168 ;
166+
typeOfSecondFixedSurface = 168 ;
167+
}
168+
#Time-mean upward sea water velocity
169+
'Time-mean upward sea water velocity' = {
170+
discipline = 10 ;
171+
parameterCategory = 4 ;
172+
parameterNumber = 27 ;
173+
typeOfFirstFixedSurface = 168 ;
174+
typeOfSecondFixedSurface = 168 ;
175+
typeOfStatisticalProcessing = 0 ;
176+
}

‎definitions/grib2/paramId.def

+6-2
Original file line numberDiff line numberDiff line change
@@ -7841,7 +7841,9 @@
78417841
parameterCategory = 4 ;
78427842
parameterNumber = 27 ;
78437843
typeOfFirstFixedSurface = 168 ;
7844-
typeOfSecondFixedSurface = 168 ;
7844+
typeOfSecondFixedSurface = 255 ;
7845+
scaledValueOfSecondFixedSurface = missing() ;
7846+
scaleFactorOfSecondFixedSurface = missing() ;
78457847
}
78467848
#Sea water potential temperature tendency due to newtonian relaxation
78477849
'262508' = {
@@ -9028,7 +9030,9 @@
90289030
parameterCategory = 4 ;
90299031
parameterNumber = 27 ;
90309032
typeOfFirstFixedSurface = 168 ;
9031-
typeOfSecondFixedSurface = 168 ;
9033+
typeOfSecondFixedSurface = 255 ;
9034+
scaledValueOfSecondFixedSurface = missing() ;
9035+
scaleFactorOfSecondFixedSurface = missing() ;
90329036
typeOfStatisticalProcessing = 0 ;
90339037
}
90349038
#Time-mean sea water potential temperature tendency due to newtonian relaxation

‎definitions/grib2/paramId.legacy.def

+17
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,20 @@
157157
typeOfStatisticalProcessing = 1 ;
158158
lengthOfTimeRange = 24 ;
159159
}
160+
#Upward sea water velocity
161+
'262507' = {
162+
discipline = 10 ;
163+
parameterCategory = 4 ;
164+
parameterNumber = 27 ;
165+
typeOfFirstFixedSurface = 168 ;
166+
typeOfSecondFixedSurface = 168 ;
167+
}
168+
#Time-mean upward sea water velocity
169+
'263507' = {
170+
discipline = 10 ;
171+
parameterCategory = 4 ;
172+
parameterNumber = 27 ;
173+
typeOfFirstFixedSurface = 168 ;
174+
typeOfSecondFixedSurface = 168 ;
175+
typeOfStatisticalProcessing = 0 ;
176+
}

‎definitions/grib2/shortName.def

+6-2
Original file line numberDiff line numberDiff line change
@@ -7841,7 +7841,9 @@
78417841
parameterCategory = 4 ;
78427842
parameterNumber = 27 ;
78437843
typeOfFirstFixedSurface = 168 ;
7844-
typeOfSecondFixedSurface = 168 ;
7844+
typeOfSecondFixedSurface = 255 ;
7845+
scaledValueOfSecondFixedSurface = missing() ;
7846+
scaleFactorOfSecondFixedSurface = missing() ;
78457847
}
78467848
#Sea water potential temperature tendency due to newtonian relaxation
78477849
'thetaodmp' = {
@@ -9028,7 +9030,9 @@
90289030
parameterCategory = 4 ;
90299031
parameterNumber = 27 ;
90309032
typeOfFirstFixedSurface = 168 ;
9031-
typeOfSecondFixedSurface = 168 ;
9033+
typeOfSecondFixedSurface = 255 ;
9034+
scaledValueOfSecondFixedSurface = missing() ;
9035+
scaleFactorOfSecondFixedSurface = missing() ;
90329036
typeOfStatisticalProcessing = 0 ;
90339037
}
90349038
#Time-mean sea water potential temperature tendency due to newtonian relaxation

‎definitions/grib2/shortName.legacy.def

+17
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,20 @@
157157
typeOfStatisticalProcessing = 1 ;
158158
lengthOfTimeRange = 24 ;
159159
}
160+
#Upward sea water velocity
161+
'wo' = {
162+
discipline = 10 ;
163+
parameterCategory = 4 ;
164+
parameterNumber = 27 ;
165+
typeOfFirstFixedSurface = 168 ;
166+
typeOfSecondFixedSurface = 168 ;
167+
}
168+
#Time-mean upward sea water velocity
169+
'avg_wo' = {
170+
discipline = 10 ;
171+
parameterCategory = 4 ;
172+
parameterNumber = 27 ;
173+
typeOfFirstFixedSurface = 168 ;
174+
typeOfSecondFixedSurface = 168 ;
175+
typeOfStatisticalProcessing = 0 ;
176+
}

‎definitions/grib2/stepUnits.def

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def";
55
# codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy;
66

7-
meta stepUnits optimal_step_units(forecastTime,indicatorOfUnitOfTimeRange,lengthOfTimeRange,indicatorOfUnitForTimeRange) : transient,dump;
7+
# See ECC-1768 re why no_copy is needed
8+
meta stepUnits optimal_step_units(forecastTime,indicatorOfUnitOfTimeRange,lengthOfTimeRange,indicatorOfUnitForTimeRange) : dump,no_copy;
89
transient startStepUnit = 255 : hidden; # 255 means MISSING. See code table 4.4
910
transient endStepUnit = 255 : hidden;
1011
# The lowercase version is to unify it with the helper key in the MARS language

‎definitions/grib2/tables/local/ecmf/1/4.2.0.1.table

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Code table 4.2 - discipline=0 category=1 for ECMWF
22
192 192 Snow evaporation rate (kg m-2 s-1)
33
193 193 Total precipitation rate (m s-1)
4-
194 194 Accumulated freezing rain (m)
4+
194 194 Freezing rain precipitation rate (m s-1)
55
195 195 Convective precipitation rate (m s-1)
66
196 196 Large-scale precipitation rate (m s-1)
77
197 197 Snow evaporation rate (m of water equivalent s-1)

‎definitions/grib2/units.def

+6-2
Original file line numberDiff line numberDiff line change
@@ -7841,7 +7841,9 @@
78417841
parameterCategory = 4 ;
78427842
parameterNumber = 27 ;
78437843
typeOfFirstFixedSurface = 168 ;
7844-
typeOfSecondFixedSurface = 168 ;
7844+
typeOfSecondFixedSurface = 255 ;
7845+
scaledValueOfSecondFixedSurface = missing() ;
7846+
scaleFactorOfSecondFixedSurface = missing() ;
78457847
}
78467848
#Sea water potential temperature tendency due to newtonian relaxation
78477849
'K s**-1' = {
@@ -9028,7 +9030,9 @@
90289030
parameterCategory = 4 ;
90299031
parameterNumber = 27 ;
90309032
typeOfFirstFixedSurface = 168 ;
9031-
typeOfSecondFixedSurface = 168 ;
9033+
typeOfSecondFixedSurface = 255 ;
9034+
scaledValueOfSecondFixedSurface = missing() ;
9035+
scaleFactorOfSecondFixedSurface = missing() ;
90329036
typeOfStatisticalProcessing = 0 ;
90339037
}
90349038
#Time-mean sea water potential temperature tendency due to newtonian relaxation

‎definitions/grib2/units.legacy.def

+17
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,20 @@
157157
typeOfStatisticalProcessing = 1 ;
158158
lengthOfTimeRange = 24 ;
159159
}
160+
#Upward sea water velocity
161+
'm s**-1' = {
162+
discipline = 10 ;
163+
parameterCategory = 4 ;
164+
parameterNumber = 27 ;
165+
typeOfFirstFixedSurface = 168 ;
166+
typeOfSecondFixedSurface = 168 ;
167+
}
168+
#Time-mean upward sea water velocity
169+
'm s**-1' = {
170+
discipline = 10 ;
171+
parameterCategory = 4 ;
172+
parameterNumber = 27 ;
173+
typeOfFirstFixedSurface = 168 ;
174+
typeOfSecondFixedSurface = 168 ;
175+
typeOfStatisticalProcessing = 0 ;
176+
}

‎definitions/mars/grib.mmsf.fc.def

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
alias mars.step = endStep;
1+
if (levtype is "o2d" || levtype is "o3d") {
2+
alias mars.step = stepRange;
3+
} else {
4+
alias mars.step = endStep;
5+
}
6+
27
if (class is "od") { alias mars.system = systemNumber; }
38
if (class is "me") { alias mars.system = systemNumber; }
49
if (class is "en") { alias mars.system = systemNumber; }
510
if (class is "c3") { alias mars.system = systemNumber; }
11+
if (class is "ci") { alias mars.system = systemNumber; }
612
alias mars.number = perturbationNumber;
713
alias mars.method = methodNumber;
814

‎definitions/mars/grib.msmm.fcmean.def

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if (class is "od") { alias mars.system = systemNumber; }
1010
if (class is "me") { alias mars.system = systemNumber; }
1111
if (class is "en") { alias mars.system = systemNumber; }
1212
if (class is "c3") { alias mars.system = systemNumber; }
13+
if (class is "ci") { alias mars.system = systemNumber; }
1314

1415
# See ECC-624
1516
if (centre == 80 && subCentre == 98 && class is "c3") {

0 commit comments

Comments
 (0)