Merge branch 'hotfix/1.10.16'

ecmwf · Oct 11, 2023 · b7a1440 · b7a1440
2 parents ef6ba29 + 79d5aff
commit b7a1440
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.10.15
+1.10.16
diff --git a/src/metkit/hypercube/HyperCube.cc b/src/metkit/hypercube/HyperCube.cc
@@ -256,14 +256,14 @@ std::vector<std::pair<metkit::mars::MarsRequest, size_t>> HyperCube::request(std
     return requests;
 }
 
-std::vector<metkit::mars::MarsRequest> HyperCube::vacantRequests() const {
+std::vector<metkit::mars::MarsRequest> HyperCube::aggregatedRequests(bool remaining) const {
 
-    if (countVacant() == 0)
+    if (countVacant() == (remaining ? 0 : size()))
         return std::vector<metkit::mars::MarsRequest>{};
 
     std::set<size_t> idxs;
     for(size_t i = 0; i < set_.size(); ++i) {
-        if (set_[i])
+        if (set_[i] == remaining)
             idxs.emplace(i);
     }
 

diff --git a/src/metkit/hypercube/HyperCube.h b/src/metkit/hypercube/HyperCube.h
@@ -44,9 +44,11 @@ class HyperCube {
     size_t size() const {return cube_.count(); }
 
     size_t fieldOrdinal(const metkit::mars::MarsRequest&, bool noholes = true) const;
-    std::vector<metkit::mars::MarsRequest> vacantRequests() const;
+    std::vector<metkit::mars::MarsRequest> vacantRequests() const { return aggregatedRequests(true); }
+    std::vector<metkit::mars::MarsRequest> requests() const { return aggregatedRequests(false); }
 
 protected:
+    std::vector<metkit::mars::MarsRequest> aggregatedRequests(bool remaining) const;
     int indexOf(const metkit::mars::MarsRequest&) const;
     bool clear(int index);
     metkit::mars::MarsRequest requestOf(size_t index) const;