Remove usage of GribHandle in metkit/pointdb

Author: pgeier

src/metkit/codes/CodesDataContent.cc

@@ -16,8 +16,6 @@
 #include "eckit/io/DataHandle.h"
 #include "eckit/io/MemoryHandle.h"
 
-#include "metkit/codes/GribHandle.h"
-
 namespace metkit {
 namespace codes {
 

src/metkit/codes/CodesSplitter.cc

@@ -13,11 +13,9 @@
 #include "eccodes.h"
 
 #include "eckit/io/PeekHandle.h"
-#include "eckit/log/Log.h"
 #include "eckit/message/Message.h"
 
 #include "metkit/codes/CodesDataContent.h"
-#include "metkit/codes/GribHandle.h"
 #include "metkit/codes/api/CodesAPI.h"
 #include "metkit/codes/api/CodesTypes.h"
 

src/metkit/codes/GribHandle.h

@@ -113,7 +113,7 @@ class GribHandle : private eckit::NonCopyable {
     bool owned_;
 };
 
-//------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------
 
 }  // namespace grib
 }  // namespace metkit

src/metkit/codes/GribIterator.h

@@ -42,7 +42,7 @@ class GribIterator : private eckit::NonCopyable {
     grib_iterator* iterator_;
 };
 
-//------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------
 
 }  // namespace grib
 }  // namespace metkit

src/metkit/pointdb/GribFieldInfo.cc

@@ -9,13 +9,12 @@
  */
 
 #include "metkit/pointdb/GribFieldInfo.h"
-#include "metkit/pointdb/GribDataSource.h"
 #include "metkit/codes/api/CodesAPI.h"
+#include "metkit/pointdb/GribDataSource.h"
 
 #include <bitset>
 
 using namespace eckit;
-using namespace metkit::grib;
 
 
 extern "C" {

src/metkit/pointdb/GribFieldInfo.h

@@ -19,17 +19,10 @@
 #include "eckit/types/FixedString.h"
 
 
-
 namespace eckit {
 class PathName;
 }
-namespace metkit {
-namespace grib {
-class GribHandle;
-}
-
-
-namespace pointdb {
+namespace metkit::pointdb {
 
 
 class GribDataSource;
@@ -73,8 +66,7 @@ class GribFieldInfo {
     }
 };
 
-}  // namespace pointdb
-}  // namespace metkit
+}  // namespace metkit::pointdb
 
 
 #endif

src/metkit/pointdb/GribHandleDataSource.cc

@@ -81,9 +81,12 @@ const GribFieldInfo& GribHandleDataSource::info() const {
             open();
 
             handle_->seek(offset_);
+            auto codesHandle = codes::codesHandleFromStream(
+                [&](uint8_t* buffer, int64_t len) -> int64_t { return handle_->read(buffer, len); });
 
-            grib::GribHandle h(*handle_);
-            info_.update(h);
+            ASSERT(codesHandle);
+
+            info_.update(*codesHandle.get());
 
             cache.dirName().mkdir();
 
@@ -92,7 +95,7 @@ const GribFieldInfo& GribHandleDataSource::info() const {
             f.close();
 
 
-            PointIndex::cache(h);
+            PointIndex::cache(*codesHandle.get());
         }
     }
     return info_;

src/metkit/pointdb/PointIndex.cc

@@ -14,11 +14,11 @@
 // #include "eckit/log/Timer.h"
 
 #include "metkit/pointdb/PointIndex.h"
+#include "eckit/io/FileHandle.h"
 #include "eckit/thread/AutoLock.h"
-#include "metkit/codes/GribHandle.h"
-#include "metkit/codes/GribIterator.h"
 // #include "eckit/io/StdFile.h"
 #include "eckit/config/Resource.h"
+#include "metkit/codes/api/CodesAPI.h"
 
 // #include "eccodes.h"
 
@@ -36,11 +36,9 @@ eckit::PathName PointIndex::cachePath(const std::string& dir, const std::string&
     return pointdbCachePath / dir / name;
 }
 
-std::string PointIndex::cache(const metkit::grib::GribHandle& h) {
+std::string PointIndex::cache(const metkit::codes::CodesHandle& h) {
 
-    double lat, lon, value;
-
-    std::string md5 = h.geographyHash();
+    std::string md5 = h.getString("md5GridSection");
 
 
     AutoLock<Mutex> lock(mutex);
@@ -55,26 +53,20 @@ std::string PointIndex::cache(const metkit::grib::GribHandle& h) {
     }
     path.dirName().mkdir();
 
-    size_t v = h.getDataValuesSize();
+    size_t v = h.size("values");
 
 
     std::vector<Point> p;
     p.reserve(v);
 
-
-    metkit::grib::GribIterator iter(h);
     size_t j = 0;
+    for (auto data : h.values()) {
+        while (data.longitude < 0)
+            data.longitude += 360;
+        while (data.longitude >= 360)
+            data.longitude -= 360;
 
-    while (iter.next(lat, lon, value)) {
-
-        while (lon < 0)
-            lon += 360;
-        while (lon >= 360)
-            lon -= 360;
-
-        // ASSERT(lat >= -90 && lat <= 90);
-
-        p.push_back(Point(lat, lon, j));
+        p.push_back(Point(data.latitude, data.longitude, j));
         j++;
     }
 
@@ -90,8 +82,13 @@ std::string PointIndex::cache(const metkit::grib::GribHandle& h) {
     // codes_dump_content(h, f, "debug", 0, 0);
     // f.close();
 
+    // Write handle to file
     PathName grib = cachePath("grids", md5 + ".grib");
-    h.write(grib);
+    eckit::FileHandle fh(grib.localPath());
+    auto data = h.messageData();
+    fh.openForWrite(data.size());
+    fh.write(data.data(), data.size());
+    fh.close();
 
     PathName::rename(tmp, path);
 
@@ -111,9 +108,9 @@ PointIndex& PointIndex::lookUp(const std::string& md5) {
             PathName grib = cachePath("grids", md5 + ".grib");
             if (grib.exists()) {
                 Log::warning() << "Rebuilding index from " << grib << std::endl;
-                metkit::grib::GribHandle h(grib);
+                auto codesHandle = codes::codesHandleFromFile(grib.localPath(), codes::Product::GRIB);
 
-                ASSERT(cache(h) == md5);
+                ASSERT(cache(*codesHandle.get()) == md5);
             }
         }
 

src/metkit/pointdb/PointIndex.h

@@ -11,21 +11,13 @@
 #ifndef PointIndex_H
 #define PointIndex_H
 
-// #include <cmath>
 #include <memory>
 
-// #include "eckit/eckit.h"
-// #include "eckit/filesystem/PathName.h"
-
-
 #include "eckit/container/KDTree.h"
 #include "eckit/geometry/Point3.h"
+#include "metkit/codes/api/CodesAPI.h"
 
 namespace metkit {
-namespace grib {
-class GribHandle;
-}
-
 namespace pointdb {
 
 
@@ -99,7 +91,7 @@ class PointIndex {
     NodeInfo nearestNeighbour(double lat, double lon);
 
     static PointIndex& lookUp(const std::string& md5);
-    static std::string cache(const metkit::grib::GribHandle& h);
+    static std::string cache(const metkit::codes::CodesHandle& h);
 
     static eckit::PathName cachePath(const std::string& dir, const std::string& name);
 

tests/CMakeLists.txt

@@ -55,15 +55,6 @@ ecbuild_add_test( TARGET        metkit_test_odbsplitter
                   NO_AS_NEEDED
                   LIBS          metkit )
 
-ecbuild_add_test( TARGET        metkit_test_gribhandle
-                  CONDITION     HAVE_GRIB
-                  SOURCES       test_gribhandle.cc
-                  INCLUDES      "${ECKIT_INCLUDE_DIRS}" "${ECCODES_INCLUDE_DIR}"
-                  LIBS          metkit
-                  TEST_DEPENDS  grib_get_data
-                  NO_AS_NEEDED
-                  ENVIRONMENT   "${metkit_env}")
-
 foreach( test
         c_api
         codes_api