eckit::geometry

ecmwf · Aug 23, 2023 · 2261835 · 2261835
1 parent 0663703
commit 2261835
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/src/eckit/geometry/grid/Gaussian.cc b/src/eckit/geometry/grid/Gaussian.cc
@@ -16,6 +16,7 @@
 #include <cmath>
 #include <map>
 
+#include "eckit/config/Configuration.h"
 #include "eckit/exception/Exceptions.h"
 #include "eckit/geometry/Domain.h"
 #include "eckit/geometry/util.h"

diff --git a/src/eckit/geometry/grid/IrregularLatlon.cc b/src/eckit/geometry/grid/IrregularLatlon.cc
@@ -14,6 +14,7 @@
 
 #include <algorithm>
 
+#include "eckit/config/Configuration.h"
 #include "eckit/geometry/area/BoundingBox.h"
 
 

diff --git a/src/eckit/geometry/grid/ORCA.cc b/src/eckit/geometry/grid/ORCA.cc
@@ -113,6 +113,7 @@ ORCA::ORCA(const Configuration& config) :
 
 
     // TODO
+    ASSERT(dimensions_.size() == 2);
     ASSERT(0 < dimensions_[0]);
     ASSERT(0 < dimensions_[1]);
 
@@ -124,11 +125,12 @@ ORCA::ORCA(const Configuration& config) :
     ASSERT(pivot_[0] >= 0);
     ASSERT(pivot_[1] >= 0);
 
-    size_t size = dimensions_[0] * dimensions_[1];
-    ASSERT(0 < size);
-    ASSERT(longitudes_.size() == size);
-    ASSERT(latitudes_.size() == size);
-    ASSERT(flags_.size() == size);
+    auto n = static_cast<size_t>(dimensions_[0] & dimensions_[1]);
+    ASSERT(0 < n);
+
+    ASSERT(longitudes_.size() == n);
+    ASSERT(latitudes_.size() == n);
+    ASSERT(flags_.size() == n);
 
 
     auto url = config.getString("url_prefix", "") + config.getString("url");

diff --git a/src/eckit/geometry/grid/ORCA.h b/src/eckit/geometry/grid/ORCA.h
@@ -127,9 +127,7 @@ class ORCA final : public Grid {
 
     const area::BoundingBox& boundingBox() const override;
 
-    size_t size() const override {
-        return ni_ * nj_;
-    }
+    size_t size() const override { return ni() * nj(); }
 
     bool includesNorthPole() const override { return true; }
     bool includesSouthPole() const override { return true; }  // FIXME: not sure this is semanticaly correct

diff --git a/src/eckit/geometry/grid/ReducedLL.cc b/src/eckit/geometry/grid/ReducedLL.cc
@@ -16,6 +16,7 @@
 #include <cmath>
 #include <sstream>
 
+#include "eckit/config/Configuration.h"
 #include "eckit/geometry/Domain.h"
 #include "eckit/geometry/Projection.h"
 #include "eckit/types/FloatCompare.h"

diff --git a/src/eckit/geometry/grid/UnstructuredGrid.cc b/src/eckit/geometry/grid/UnstructuredGrid.cc
@@ -12,6 +12,7 @@
 
 #include "eckit/geometry/grid/UnstructuredGrid.h"
 
+#include "eckit/config/Configuration.h"
 #include "eckit/exception/Exceptions.h"
 #include "eckit/geometry/iterator/ListI.h"