Skip to content

Fixes for ERA6 re-encoding #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsarmany wants to merge 2 commits into
base: release/1.18.0
Choose a base branch
from
+8 −11
Open

Fixes for ERA6 re-encoding #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b08348e
Remove custom tables matchers
dsarmany Apr 11, 2026
9c289fd
Add missing params from ERA6 lwda output
dsarmany Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/metkit/mars2grib/backend/concepts/level/levelMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ inline std::size_t matchSFC(const long param) {
141208, 141209, 141215, 141216, 141220, 141229, 141232, range(143101, 143105), 143208, 143209, 143215,
143216, 143220, 143229, 143232, range(144101, 144105), 144208, 144209, 144215, 144216, 144220, 144229,
144232, range(145101, 145105), 145208, 145209, 145215, 145216, 145220, 145229, 145232, 160198,
range(162100, 162113), 200199, range(210186, 210191), range(210200, 210202), range(210262, 210264),
range(162100, 162113), 200199, range(210186, 210191), range(210198, 210202), range(210260, 210264),
range(222001, 222256), 228002, 228003, 228012, range(228015, 228022), 228024, 228026, 228027, 228032,
228035, 228036, range(228046, 228048), 228051, 228053, range(228057, 228060), 228129, 228130, 228141,
228143, 228144, range(228216, 228228), 228251, 229001, range(231001, 231003), 231005, 231010, 231012,
Expand Down Expand Up @@ -251,7 +251,7 @@ inline std::size_t matchO2D(const long param) {
if (matchAny(param, 262000, 262003, 262004, 262008, 262014, 262023)) {
return static_cast<std::size_t>(LevelType::IceLayerOnWater);
}
if (matchAny(param, 262001, 262005, 262006)) {
if (matchAny(param, 262001, 262005, 262006, 262906, 262907)) {
return static_cast<std::size_t>(LevelType::IceTopOnWater);
}
if (matchAny(param, 262002, 262009, 262011, 262015)) {
Expand All @@ -260,7 +260,8 @@ inline std::size_t matchO2D(const long param) {
if (matchAny(param, 262017, 262018)) {
return static_cast<std::size_t>(LevelType::EntireMeltPond);
}
if (matchAny(param, 262100, 262101, 262108, 262124, 262125, 262130, 262139, 262140, 262143)) {
if (matchAny(param, 262100, 262101, range(262108, 262112), 262124, 262125, 262130, 262139, 262140, 262143,
262900)) {
return static_cast<std::size_t>(LevelType::OceanSurface);
}
if (matchAny(param, range(262102, 262106))) {
Expand Down
8 changes: 4 additions & 4 deletions src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ std::size_t pointInTimeMatcher(const MarsDict_t& mars, const OptDict_t& opt) {
range(140098, 140105), 140112, 140113, range(140121, 140129), range(140131, 140134),
range(140207, 140209), 140211, 140212, range(140214, 140239), range(140244, 140249),
range(140252, 140254), 160198, range(162059, 162063), 162071, 162072, 162093, 174096, 200199,
range(210186, 210191), range(210200, 210202), range(210262, 210264), range(213101, 213160),
range(210186, 210191), range(210198, 210202), range(210260, 210264), range(213101, 213160),
range(228001, 228003), range(228007, 228020), 228023, 228024, 228029, 228032, 228037, 228038,
range(228044, 228048), 228050, 228052, range(228088, 228090), 228131, 228132, 228141, 228164,
range(228217, 228221), range(228231, 228237), 229001, 260004, 260005, 260015, 260038, 260048, 260109,
260121, 260123, 260132, 260199, 260242, 260255, 260260, 260289, 260290, 260292, 260293, 260360, 260509,
260688, 261001, 261002, range(261014, 261016), 261018, 261023, range(262000, 262009), 262011, 262014,
262015, 262017, 262018, 262023, 262024, range(262100, 262106), 262108, range(262113, 262116),
range(262118, 262125), 262130, range(262139, 262141), 262143, 262144, range(262500, 262502),
range(262505, 262507))) {
262015, 262017, 262018, 262023, 262024, range(262100, 262106), range(262108, 262112),
range(262113, 262116), range(262118, 262125), 262130, range(262139, 262141), 262143, 262144,
range(262500, 262502), range(262505, 262507), 262900, 262906, 262907)) {
return static_cast<std::size_t>(PointInTimeType::Default);
}

Expand Down
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/concepts/tables/tablesMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ std::size_t tablesMatcher(const MarsDict_t& mars, const OptDict_t& opt) {
using metkit::mars2grib::utils::dict_traits::get_or_throw;

const auto param = get_or_throw<long>(mars, "param");
// Chemical products
if (matchAny(param, range(233032, 233035), range(235062, 235064))) {
return static_cast<std::size_t>(TablesType::Custom);
}

return static_cast<size_t>(TablesType::Default);
}
Expand Down
Loading