Skip to content

gathering levelist as double #101

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
danovaro wants to merge 1 commit into
base: develop
Choose a base branch
from
+122 −2
Open

gathering levelist as double #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 31 additions & 2 deletions src/metkit/codes/GRIBDecoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ bool GRIBDecoder::match(const eckit::message::Message& msg) const {
(p[0] == 'B' and p[1] == 'U' and p[2] == 'D' and p[3] == 'G'));
}

namespace {
bool isInteger(double val) {
double intpart;
return std::modf(val, &intpart) == 0.0;
}
} // namespace


void GRIBDecoder::getMetadata(const eckit::message::Message& msg, eckit::message::MetadataGatherer& gather,
const eckit::message::GetMetadataOptions& options) const {
Expand All @@ -59,14 +66,36 @@ void GRIBDecoder::getMetadata(const eckit::message::Message& msg, eckit::message

switch (options.valueRepresentation) {
case eckit::message::ValueRepresentation::String: {
gather.setValue(name, k.getString());
// TODO - remove as soon as https://jira.ecmwf.int/browse/ECC-2113 is fixed
if (k.name() == "levelist") {
double val = k.getDouble();
if (isInteger(val)) {
gather.setValue(name, eckit::translate<std::string>(static_cast<long>(val)));
}
else {
gather.setValue(name, eckit::translate<std::string>(val));
}
}
else {
gather.setValue(name, k.getString());
}
break;
}
case eckit::message::ValueRepresentation::Native: {
std::visit(
[&](auto&& v) {
using Type = std::decay_t<decltype(v)>;
if constexpr (std::is_same_v<Type, std::string> || std::is_arithmetic_v<Type>) {
// TODO - remove as soon as https://jira.ecmwf.int/browse/ECC-2113 is fixed
if (k.name() == "levelist") {
double val = k.getDouble();
if (isInteger(val)) {
gather.setValue(name, static_cast<long>(val));
}
else {
gather.setValue(name, val);
}
}
else if constexpr (std::is_same_v<Type, std::string> || std::is_arithmetic_v<Type>) {
gather.setValue(name, std::forward<decltype(v)>(v));
}
else if constexpr (std::is_same_v<Type, std::vector<uint8_t>>) {
Expand Down
3 changes: 3 additions & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ ecbuild_get_test_multidata( TARGET metkit_get_odb_data
multiodb2.odb
NOCHECK )

configure_file(pl.grib pl.grib COPYONLY)
configure_file(sol.grib sol.grib COPYONLY)

add_custom_target(soft_link_expand_test_data ALL
COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/expand" "${CMAKE_CURRENT_BINARY_DIR}/expand")

Expand Down
Binary file added tests/pl.grib
View file
Open in desktop
Binary file not shown.
Binary file added tests/sol.grib
View file
Open in desktop
Binary file not shown.
88 changes: 88 additions & 0 deletions tests/test_codes_decoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <vector>

#include "eckit/config/LocalConfiguration.h"
#include "eckit/io/FileHandle.h"
#include "eckit/io/MemoryHandle.h"
#include "eckit/message/Message.h"
#include "eckit/message/Reader.h"
Expand Down Expand Up @@ -454,6 +455,93 @@ CASE("test codessplitter unstr_latlot.tmpl String") {
}
}

CASE("test levelist String") {
eckit::FileHandle f("pl.grib");

eckit::message::Reader reader(f);
eckit::message::Message msg;

std::vector<std::string> expect{"0", "0.02", "0.2", "2", "20", "200"};
for (size_t i = 0; i < expect.size(); ++i) {
msg = reader.next();
EXPECT(msg);

MetadataSetter md;
eckit::message::TypedSetter<MetadataSetter> gatherer{md};
eckit::message::GetMetadataOptions mdOpts{};
mdOpts.valueRepresentation = eckit::message::ValueRepresentation::String;
msg.getMetadata(gatherer, mdOpts);
{ MD_EXPECT_STRING(md, "levelist", expect[i]); }
}
msg = reader.next();
EXPECT(!msg);
}

CASE("test levelist Native") {
eckit::FileHandle f("pl.grib");

eckit::message::Reader reader(f);
eckit::message::Message msg;

std::vector<double> expect{0, 0.02, 0.2, 2, 20, 200};
for (size_t i = 0; i < expect.size(); ++i) {
msg = reader.next();
EXPECT(msg);

MetadataSetter md;
eckit::message::TypedSetter<MetadataSetter> gatherer{md};
eckit::message::GetMetadataOptions mdOpts{};
mdOpts.valueRepresentation = eckit::message::ValueRepresentation::Native;
msg.getMetadata(gatherer, mdOpts);
{ MD_EXPECT_DOUBLE(md, "levelist", expect[i]); }
}
msg = reader.next();
EXPECT(!msg);
}

CASE("test levelist String") {
eckit::FileHandle f("sol.grib");

eckit::message::Reader reader(f);
eckit::message::Message msg;

std::vector<std::string> expect{"0.02", "0.2", "2", "20"};
for (size_t i = 0; i < expect.size(); ++i) {
msg = reader.next();
EXPECT(msg);

MetadataSetter md;
eckit::message::TypedSetter<MetadataSetter> gatherer{md};
eckit::message::GetMetadataOptions mdOpts{};
mdOpts.valueRepresentation = eckit::message::ValueRepresentation::String;
msg.getMetadata(gatherer, mdOpts);
{ MD_EXPECT_STRING(md, "levelist", expect[i]); }
}
msg = reader.next();
EXPECT(!msg);
}

CASE("test levelist Native") {
eckit::FileHandle f("sol.grib");

eckit::message::Reader reader(f);
eckit::message::Message msg;

std::vector<double> expect{0.02, 0.2, 2, 20};
for (size_t i = 0; i < expect.size(); ++i) {
msg = reader.next();
EXPECT(msg);

MetadataSetter md;
eckit::message::TypedSetter<MetadataSetter> gatherer{md};
eckit::message::GetMetadataOptions mdOpts{};
mdOpts.valueRepresentation = eckit::message::ValueRepresentation::Native;
msg.getMetadata(gatherer, mdOpts);
{ MD_EXPECT_DOUBLE(md, "levelist", expect[i]); }
}
msg = reader.next();
EXPECT(!msg);
}

//----------------------------------------------------------------------------------------------------------------------

Expand Down
Loading