Skip to content

Commit

Permalink
Merge branch 'hotfix/2.36.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@shahramn
shahramn committed Aug 1, 2024
2 parents 7e35836 + d6213aa commit af67a8a
Show file tree
Hide file tree
Showing 14 changed files with 222 additions and 6 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.36.1
2.36.2
4 changes: 2 additions & 2 deletions definitions/grib1/local.98.11.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ constant secondsOfAnalysis = 0;
meta dateOfAnalysis g1date(centuryOfAnalysis,yearOfAnalysis,monthOfAnalysis,dayOfAnalysis) : dump;
meta timeOfAnalysis time(hourOfAnalysis,minuteOfAnalysis,secondsOfAnalysis) : dump;

alias date = dateOfAnalysis;
alias time = timeOfAnalysis;
alias mars.date = dateOfAnalysis;
alias mars.time = timeOfAnalysis;
40 changes: 40 additions & 0 deletions definitions/grib2/cfVarName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4958,6 +4958,16 @@
parameterNumber = 32 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'avg_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean geopotential
'avg_z' = {
discipline = 0 ;
Expand Down Expand Up @@ -5254,20 +5264,50 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'max_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'min_vsw' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'min_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 3 ;
}
#Time-standard-deviation volumetric soil moisture
'std_vsw' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 6 ;
}
#Time-standard-deviation most-unstable CAPE
'std_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 6 ;
}
#Cross sectional area of flow in channel
'chcross' = {
discipline = 1 ;
Expand Down
4 changes: 2 additions & 2 deletions definitions/grib2/local.98.11.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ constant secondsOfAnalysis = 0;
meta dateOfAnalysis g2date(yearOfAnalysis,monthOfAnalysis,dayOfAnalysis) : dump;
meta timeOfAnalysis time(hourOfAnalysis,minuteOfAnalysis,secondsOfAnalysis) : dump;

alias date = dateOfAnalysis;
alias time = timeOfAnalysis;
alias mars.date = dateOfAnalysis;
alias mars.time = timeOfAnalysis;
40 changes: 40 additions & 0 deletions definitions/grib2/name.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4958,6 +4958,16 @@
parameterNumber = 32 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'Time-mean most-unstable CAPE' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean geopotential
'Time-mean geopotential' = {
discipline = 0 ;
Expand Down Expand Up @@ -5254,20 +5264,50 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'Time-maximum most-unstable CAPE' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'Time-minimum volumetric soil moisture' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'Time-minimum most-unstable CAPE' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 3 ;
}
#Time-standard-deviation volumetric soil moisture
'Time-standard-deviation volumetric soil moisture' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 6 ;
}
#Time-standard-deviation most-unstable CAPE
'Time-standard-deviation most-unstable CAPE' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 6 ;
}
#Cross sectional area of flow in channel
'Cross sectional area of flow in channel' = {
discipline = 1 ;
Expand Down
40 changes: 40 additions & 0 deletions definitions/grib2/paramId.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4958,6 +4958,16 @@
parameterNumber = 32 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'235117' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean geopotential
'235129' = {
discipline = 0 ;
Expand Down Expand Up @@ -5254,20 +5264,50 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'237117' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'238077' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'238117' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 3 ;
}
#Time-standard-deviation volumetric soil moisture
'239077' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 6 ;
}
#Time-standard-deviation most-unstable CAPE
'239117' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 6 ;
}
#Cross sectional area of flow in channel
'240011' = {
discipline = 1 ;
Expand Down
40 changes: 40 additions & 0 deletions definitions/grib2/shortName.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4958,6 +4958,16 @@
parameterNumber = 32 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'avg_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean geopotential
'avg_z' = {
discipline = 0 ;
Expand Down Expand Up @@ -5254,20 +5264,50 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'max_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'min_vsw' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'min_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 3 ;
}
#Time-standard-deviation volumetric soil moisture
'std_vsw' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 6 ;
}
#Time-standard-deviation most-unstable CAPE
'std_mucape' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 6 ;
}
#Cross sectional area of flow in channel
'chcross' = {
discipline = 1 ;
Expand Down
40 changes: 40 additions & 0 deletions definitions/grib2/units.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4958,6 +4958,16 @@
parameterNumber = 32 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'J kg**-1' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean geopotential
'm**2 s**-2' = {
discipline = 0 ;
Expand Down Expand Up @@ -5254,20 +5264,50 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'J kg**-1' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'm**3 m**-3' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'J kg**-1' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 3 ;
}
#Time-standard-deviation volumetric soil moisture
'm**3 m**-3' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 25 ;
typeOfStatisticalProcessing = 6 ;
}
#Time-standard-deviation most-unstable CAPE
'J kg**-1' = {
discipline = 0 ;
parameterCategory = 7 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 17 ;
scaledValueOfFirstFixedSurface = missing() ;
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 6 ;
}
#Cross sectional area of flow in channel
'm**2' = {
discipline = 1 ;
Expand Down
5 changes: 5 additions & 0 deletions definitions/mars/grib.elda.mpp.def
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
alias mars.anoffset=offsetToEndOf4DvarWindow;
alias mars.number=perturbationNumber;

unalias mars.levtype;
unalias mars.levelist;
4 changes: 4 additions & 0 deletions definitions/mars/grib.enda.mpp.def
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
alias mars.number=perturbationNumber;

unalias mars.levtype;
unalias mars.levelist;
1 change: 1 addition & 0 deletions definitions/mars/type.table
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@
93 ppm Point value metrics
94 gwt Weather types
95 est Ensemble statistics
96 mpp Model physics perturbations
2 changes: 1 addition & 1 deletion src/accessor/grib_accessor_class_g2end_step.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static int unpack_multiple_time_ranges_double_(grib_accessor* a, double* val, si
long the_coded_unit = arr_coded_unit[i];
long the_coded_time_range = arr_coded_time_range[i];

eccodes::Step time_range{ the_coded_unit, the_coded_time_range };
eccodes::Step time_range{the_coded_time_range, the_coded_unit};
*val = (start_step + time_range).value<double>(eccodes::Unit(step_units));

return GRIB_SUCCESS;
Expand Down
1 change: 1 addition & 0 deletions src/grib_iterator_class_lambert_conformal.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ static int init_sphere(const grib_handle* h,
const long index = i + j * nx;
x = x0 + i * Dx;
xy2lonlat(radius, n, f, rho0_bare, LoVInRadians, x, y, &lonDeg, &latDeg);
lonDeg = normalise_longitude_in_degrees(lonDeg);
self->lons[index] = lonDeg;
self->lats[index] = latDeg;
}
Expand Down
Loading

0 comments on commit af67a8a

Please sign in to comment.