Small tidy up

ecmwf · Nov 13, 2024 · 14e3372 · 14e3372
1 parent a3fdd50
commit 14e3372
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/pygribjump/src/pygribjump/pygribjump.py b/pygribjump/src/pygribjump/pygribjump.py
@@ -258,7 +258,7 @@ class ExtractionRequest:
         The ranges to extract.
     """
     def __init__(self, req, ranges, gridHash=None):
-        reqstr = dic_to_request(req) 
+        reqstr = dic_to_request(req)
         rangestr = list_to_rangestr(ranges)
         request = ffi.new('gribjump_extraction_request_t**')
         c_reqstr = ffi.new("char[]", reqstr.encode())

diff --git a/src/gribjump/Engine.cc b/src/gribjump/Engine.cc
@@ -45,6 +45,8 @@ Engine::~Engine() {}
 metkit::mars::MarsRequest Engine::buildRequestMap(ExtractionRequests& requests, ExItemMap& keyToExtractionItem ){
     // Split strings into one unified map
     // We also canonicalise the requests such that their keys are in alphabetical order
+    /// @todo: Note that it is not in general possible to arbitrary requests into a single request. In future, we should look into
+    /// merging into the minimum number of requests.
 
     std::map<std::string, std::set<std::string>> keyValues;
     for (auto& r : requests) {

diff --git a/src/gribjump/ExtractionData.cc b/src/gribjump/ExtractionData.cc
@@ -14,8 +14,6 @@
 #include "eckit/value/Value.h"
 #include "eckit/io/Buffer.h"
 
-#include "metkit/mars/MarsParser.h"
-
 namespace gribjump {
 
 namespace {

diff --git a/src/gribjump/ExtractionData.h b/src/gribjump/ExtractionData.h
@@ -65,8 +65,6 @@ class ExtractionResult  {
 private: // members
     std::vector<std::vector<double>> values_;
     std::vector<std::vector<std::bitset<64>>> mask_;
-
-    friend class Serialiser;
 };
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -94,8 +92,6 @@ class ExtractionRequest {
     std::vector<Range> ranges_;
     std::string request_;
     std::string gridHash_;
-
-    friend class Serialiser;
 };
 
 //----------------------------------------------------------------------------------------------------------------------