Skip to content

DE-3673 Fix levtype for time statistics on snow depth (228141) #294

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
cplltr wants to merge 4 commits into
base: hotfix/2.10.3
Choose a base branch
from
+25 −1
Open

DE-3673 Fix levtype for time statistics on snow depth (228141) #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebe8829
fix levtype for time-mean snow depth (235078/237078/238078/239078) sf…
cplltr Aug 24, 2026
6b00641
Add statistical mappings for 228038
cplltr Aug 26, 2026
fc5f7fc
Update fixMapToSol with snow temperature
cplltr Aug 27, 2026
d18aa21
Ensure clean merge into develop
cplltr Aug 28, 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
10 changes: 10 additions & 0 deletions src/multio/mars2mars/Rules.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,15 @@ auto fixMapToSol() {
setKey(&dm::FullMarsRecord::levtype, dm::LevType::SOL)); //
}

auto fixSnowMapToSol() {
return rule(
all(OneOf{&dm::FullMarsRecord::levtype, {dm::LevType::SFC}}, Has{&dm::FullMarsRecord::levelist},
NoneOf{&dm::FullMarsRecord::levelist, {0}},
matchParams(235078, 237078, 238078, 239078, 235238, 237238, 238238, 239238,
235406, 237406, 238406, 239406)), //
setKey(&dm::FullMarsRecord::levtype, dm::LevType::SOL));
}


auto fixRunOffWaterParam205() {
return rule(all(matchParams(205)), //
Expand Down Expand Up @@ -662,6 +671,7 @@ const RuleList& fixIFSOutput() {
fixHeightAboveGround10m(), //
fixHeightAboveSea(), //
fixMapToSol(), //
fixSnowMapToSol(), //
fixWindspeedU100m(), //
fixWindspeedU200m(), //
fixWindspeedV100m(), //
Expand Down
16 changes: 15 additions & 1 deletion tests/multio/mars2mars/test_multio_mars2mars_mappings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,9 @@ CASE("Test mapToSol") {
using namespace multio::mars2mars;
using namespace multio::datamod;

std::vector<std::int64_t> paramIds{{33, 238, 228038, 260360, 262000, 262024, 260199}};
std::vector<std::int64_t> paramIds{{33, 238, 228038, 228141, 235078, 237078, 238078, 239078, 235080, 237080,
238080, 239080, 235238, 237238, 238238, 239238, 235406, 237406, 238406,
239406, 260360, 262000, 262024, 260199}};

for (auto paramId : paramIds) {
FullMarsRecord mars;
Expand All @@ -481,6 +483,18 @@ CASE("Test mapToSol") {
EXPECT(res);
EXPECT(mars.levtype.get() == LevType::SOL);
}

FullMarsRecord levelZeroMars;
MiscRecord levelZeroMisc;

levelZeroMars.param.set(235406);
levelZeroMars.levtype.set(LevType::SFC);
levelZeroMars.levelist.set(0);

auto levelZeroResult = mars2mars::applyMappings(mars2mars::allRules(), levelZeroMars, levelZeroMisc);

EXPECT(!levelZeroResult);
EXPECT(levelZeroMars.levtype.get() == LevType::SFC);
};


Expand Down
Loading