Merge pull request #47 from ecmwf/feature/parametrization

Feature/parametrization

Author: dsarmany

src/multio/CMakeLists.txt

@@ -110,6 +110,8 @@ list( APPEND multio_domain_srcs
 )
 
 list( APPEND multio_message_srcs
+    message/BaseMetadata.h
+    message/BaseMetadata.cc
     message/Message.cc
     message/MessageHeader.cc
     message/Message.h
@@ -131,6 +133,8 @@ list( APPEND multio_message_srcs
     message/SharedPayload.h
     message/SharedPayloadException.cc
     message/SharedPayloadException.h
+    message/Parametrization.cc
+    message/Parametrization.h
     message/Peer.cc
     message/Peer.h
     message/MetadataMapping.cc

src/multio/action/aggregate/Aggregate.cc

@@ -47,7 +47,6 @@ bool Aggregate::handleField(const Message& msg) {
 }
 
 auto Aggregate::flushCount(const Message& msg) {
-
     auto res = flushes_[msg.fieldId()].emplace(msg.source());
 
     if (not res.second) {

src/multio/action/aggregate/AggregationCatalogue.cc

@@ -3,6 +3,8 @@
 
 #include "multio/domain/Mappings.h"
 
+#include "multio/message/Parametrization.h"
+
 namespace multio::action {
 
 message::Message& AggregationCatalogue::getMessage(const std::string& key) {

src/multio/action/encode/GribEncoder.cc

@@ -32,9 +32,9 @@
 
 #include "multio/LibMultio.h"
 #include "multio/util/DateTime.h"
+#include "multio/util/Environment.h"
 #include "multio/util/Metadata.h"
 #include "multio/util/Substitution.h"
-#include "multio/util/Environment.h"
 
 #include "multio/util/PrecisionTag.h"
 
@@ -557,7 +557,7 @@ QueriedMarsKeys setMarsKeys(GribEncoder& g, const Dict& md) {
 void applyOverwrites(GribEncoder& g, const message::Metadata& md) {
     if (auto searchOverwrites = md.find("encoder-overwrites"); searchOverwrites != md.end()) {
         // TODO Refactor with visitor
-        for (const auto& kv : searchOverwrites->second.get<message::Metadata>()) {
+        for (const auto& kv : searchOverwrites->second.get<message::BaseMetadata>()) {
             if (g.hasKey(kv.first.value().c_str())) {
                 kv.second.visit(eckit::Overloaded{
                     [](const auto& v) -> util::IfTypeOf<decltype(v), MetadataTypes::AllNested> {},
@@ -639,7 +639,7 @@ void setDateAndStatisticalFields(GribEncoder& g, const message::Metadata& in,
     auto significanceOfReferenceTime = lookUp<std::int64_t>(md, "significanceOfReferenceTime")();
     if (!significanceOfReferenceTime) {
         if (auto searchEncoderOverwrites = md.find("encoder-overwrites"); searchEncoderOverwrites != md.end()) {
-            const auto& overwrites = md.get<message::Metadata>("encoder-overwrites");
+            const auto& overwrites = md.get<message::BaseMetadata>("encoder-overwrites");
             significanceOfReferenceTime = lookUp<std::int64_t>(overwrites, "significanceOfReferenceTime")();
         }
     }

src/multio/action/encode/GridDownloader.cc

@@ -25,8 +25,8 @@
 #include "eckit/mpi/Comm.h"
 
 #include "multio/message/Glossary.h"
-#include "multio/util/Substitution.h"
 #include "multio/util/Environment.h"
+#include "multio/util/Substitution.h"
 
 namespace {
 const std::unordered_map<std::string, int> latParamIds{

src/multio/action/encode/MioGribHandle.cc

@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <string>
 
+#include "MetadataUtils.h"
 #include "multio/LibMultio.h"
 #include "multio/message/Glossary.h"
 #include "multio/util/Substitution.h"
-#include "MetadataUtils.h"
 
 
 namespace multio::action {
@@ -35,7 +35,7 @@ void ScaleMapping::applyMapping(message::Metadata& md) const {
 
         auto it = scaleMap_.find(cparam);
         if (it != scaleMap_.end()) {
-            md.set(glossary().paramId, std::stoll(it->second)); 
+            md.set(glossary().paramId, std::stoll(it->second));
             md.set(glossary().param, it->second.c_str());
         }
     }

src/multio/action/scale/Mapping.cc

@@ -14,7 +14,8 @@ std::string extractParam(const multio::message::Metadata& md) {
     std::string cparam{};
     if (auto param = md.getOpt<std::string>(glossary().param); param) {
         cparam = *param;
-    } else if (auto paramId = md.getOpt<std::int64_t>(glossary().paramId); paramId) {
+    }
+    else if (auto paramId = md.getOpt<std::int64_t>(glossary().paramId); paramId) {
         cparam = std::to_string(*paramId);
     }
     else {
@@ -23,4 +24,4 @@ std::string extractParam(const multio::message::Metadata& md) {
 
     return cparam;
 }
-}
+}  // namespace multio::action

src/multio/action/scale/MetadataUtils.cc

@@ -6,6 +6,5 @@
 #include "multio/message/Metadata.h"
 
 namespace multio::action {
-    std::string extractParam(const multio::message::Metadata& md);
-
+std::string extractParam(const multio::message::Metadata& md);
 }

src/multio/action/scale/MetadataUtils.h

@@ -21,8 +21,8 @@
 #include "multio/util/PrecisionTag.h"
 
 #include "multio/action/scale/Mapping.h"
-#include "multio/action/scale/Scaling.h"
 #include "multio/action/scale/MetadataUtils.h"
+#include "multio/action/scale/Scaling.h"
 
 
 namespace multio::action {
@@ -57,12 +57,12 @@ void Scale::executeImpl(message::Message msg) {
         executeNext(std::move(msg));
         return;
     }
-    //Scale the message
+    // Scale the message
     util::dispatchPrecisionTag(msg.precision(), [&](auto pt) {
         using Precision = typename decltype(pt)::type;
-        ScaleMessage<Precision>(msg); // Modify msg in place
+        ScaleMessage<Precision>(msg);  // Modify msg in place
     });
-    //pass on the modified message
+    // pass on the modified message
     executeNext(std::move(msg));
     return;
 }