eckit::geo::Grid

Author: pmaciel

src/eckit/geo/grid/ORCA.cc

@@ -75,7 +75,7 @@ const ORCA::ORCARecord& orca_record(const Spec& spec) {
 
 
 ORCA::ORCA(const Spec& spec) :
-    Regular(spec),
+    Grid(spec),
     name_(spec.get_string("name")),
     arrangement_(arrangement_from_string(spec.get_string("orca_arrangement"))),
     record_(orca_record(spec)),
@@ -285,8 +285,11 @@ std::string ORCA::arrangement_to_string(Arrangement a) {
 
 
 void ORCA::fill_spec(spec::Custom& custom) const {
-    custom.set("grid", name_ + "_" + arrangement_to_string(arrangement_));
-    if (auto _uid = uid(); !GridSpecByUID::instance().exists(_uid)) {
+    auto grid = name_ + "_" + arrangement_to_string(arrangement_);
+    custom.set("grid", grid);
+
+    if (auto _uid = uid(); !GridSpecByName::instance().exists(grid) ||
+                           GridSpecByName::instance().match(grid).spec(grid)->get_string("orca_uid") != _uid) {
         custom.set("uid", _uid);
     }
 }

src/eckit/geo/grid/ORCA.h

@@ -15,10 +15,11 @@
 #include <array>
 #include <cstddef>
 #include <cstdint>
+#include <memory>
 
 #include "eckit/geo/Arrangement.h"
+#include "eckit/geo/Grid.h"
 #include "eckit/geo/container/PointsContainer.h"
-#include "eckit/geo/grid/Regular.h"
 
 
 namespace eckit {
@@ -29,7 +30,7 @@ class PathName;
 namespace eckit::geo::grid {
 
 
-class ORCA final : public Regular {
+class ORCA final : public Grid {
 public:
 
     // -- Types
@@ -66,8 +67,8 @@ class ORCA final : public Regular {
 
     // -- Methods
 
-    size_t nx() const override { return record_.nj(); }
-    size_t ny() const override { return record_.ni(); }
+    size_t nx() const { return record_.nj(); }
+    size_t ny() const { return record_.ni(); }
 
     std::string name() const { return name_; }
     std::string arrangement() const;
@@ -80,7 +81,11 @@ class ORCA final : public Regular {
     iterator cend() const override;
 
     uid_type calculate_uid() const override;
+
     const std::string& type() const override;
+    std::vector<size_t> shape() const override { return {record_.ni(), record_.nj()}; }
+
+    size_t size() const override { return record_.ni() * record_.nj(); };
 
     bool includesNorthPole() const override { return true; }
     bool includesSouthPole() const override { return true; }  // FIXME: not sure this is semanticaly correct

src/eckit/geo/grid/ReducedGaussian.cc

@@ -71,14 +71,6 @@ ReducedGaussian::ReducedGaussian(size_t N, const BoundingBox& bbox) :
     ReducedGaussian(N, util::reduced_octahedral_pl(N), bbox) {}
 
 
-// ReducedGaussian::ReducedGaussian(size_t N, const pl_type& pl, const BoundingBox& bbox) :
-//     N_(check_N(N)), pl_(pl), j_(0), Nj_(pl.size()), x_(Nj_), y_(make_y_range(N, bbox)) {
-//     ASSERT(N_ * 2 == pl_.size());
-//     ASSERT(0 < N_ && Nj_ <= 2 * N_);
-//     ASSERT(y_);
-// }
-
-
 Grid::iterator ReducedGaussian::cbegin() const {
     return iterator{new geo::iterator::Reduced(*this, 0)};
 }

src/eckit/geo/grid/unstructured/FESOM.cc

@@ -207,8 +207,11 @@ std::string FESOM::arrangement_to_string(Arrangement a) {
 
 
 void FESOM::fill_spec(spec::Custom& custom) const {
-    custom.set("grid", name_ + "_" + arrangement_to_string(arrangement_));
-    if (auto _uid = uid(); !GridSpecByUID::instance().exists(_uid)) {
+    auto grid = name_ + "_" + arrangement_to_string(arrangement_);
+    custom.set("grid", grid);
+
+    if (auto _uid = uid(); !GridSpecByName::instance().exists(grid) ||
+                           GridSpecByName::instance().match(grid).spec(grid)->get_string("fesom_uid") != _uid) {
         custom.set("uid", _uid);
     }
 }

src/eckit/geo/iterator/Unstructured.cc

@@ -37,13 +37,12 @@ struct UnstructuredInstance : Instance, Unstructured {
 
 
 Unstructured::Unstructured(const Grid& grid, size_t index, std::shared_ptr<container::PointsContainer> container) :
-    projection_(grid.projection()), container_(container), index_(index), size_(container_->size()), uid_(grid.uid()) {
+    container_(container), index_(index), size_(container_->size()), uid_(grid.uid()) {
     ASSERT(container_->size() == grid.size());
 }
 
 
-Unstructured::Unstructured(const Grid& grid) :
-    projection_(grid.projection()), index_(grid.size()), size_(grid.size()), uid_(grid.uid()) {}
+Unstructured::Unstructured(const Grid& grid) : index_(grid.size()), size_(grid.size()), uid_(grid.uid()) {}
 
 
 bool Unstructured::operator==(const geo::Iterator& other) const {
@@ -80,7 +79,7 @@ Unstructured::operator bool() const {
 
 Point Unstructured::operator*() const {
     ASSERT(container_);
-    return projection_.fwd(container_->get(index_));
+    return container_->get(index_);
 }
 
 

src/eckit/geo/iterator/Unstructured.h

@@ -17,12 +17,9 @@
 #include "eckit/geo/Iterator.h"
 
 
-namespace eckit::geo {
-class Projection;
-namespace container {
+namespace eckit::geo::container {
 class PointsContainer;
 }
-}  // namespace eckit::geo
 
 
 namespace eckit::geo::iterator {
@@ -40,8 +37,6 @@ class Unstructured : public Iterator {
 
     // -- Members
 
-    const Projection& projection_;
-
     std::shared_ptr<container::PointsContainer> container_;
     size_t index_;
     const size_t size_;

src/eckit/runtime/Tool.cc

@@ -23,19 +23,7 @@ Tool::~Tool() {}
 int Tool::start() {
     int status = 0;
 
-    try {
-        run();
-    }
-    catch (Exception& e) {
-        status = 1;
-        Log::error() << "** " << e.what() << " Caught in " << Here() << std::endl;
-        Log::error() << "** Exception terminates " << name() << std::endl;
-    }
-    catch (std::exception& e) {
-        status = 1;
-        Log::error() << "** " << e.what() << " Caught in " << Here() << std::endl;
-        Log::error() << "** Exception terminates " << name() << std::endl;
-    }
+    run();
 
     return status;
 }

tests/geo/grid_healpix.cc

@@ -39,7 +39,7 @@ CASE("gridspec") {
     std::unique_ptr<const Grid> grid2(GridFactory::build(spec2));
 
     EXPECT_EQUAL(grid2->size(), 48);
-    EXPECT_EQUAL(grid2->spec_str(), R"({"grid":"H2","order":"nested"})");
+    EXPECT_EQUAL(grid2->spec_str(), R"({"grid":"H2n"})");
 
     spec::Custom spec3({{"grid", "h2"}, {"order", "ring"}});
     std::unique_ptr<const Grid> grid3(GridFactory::build(spec3));