Review: various refinements

Author: lewisn-met

src/atlas/interpolation/method/unstructured/SphericalMeanValue.cc

@@ -397,8 +397,7 @@ Method::Triplets SphericalMeanValue::projectPointToElements(size_t ip, const Ele
         nb_cols = currentPolygon.size();
         ATLAS_ASSERT(nb_cols == 3 || nb_cols == 4);
 
-        std::vector<double> polygonWeights;
-        polygonWeights.reserve(nb_cols);
+        std::vector<double> polygonWeights(nb_cols);
 
         if (currentPolygon.compute_vertex_weights(candidatePoint, polygonWeights.data(), polygonWeights.size()) == 1) {
             if (normalisation_) {

src/atlas/util/ConvexSphericalPolygon.cc

@@ -94,7 +94,6 @@ ConvexSphericalPolygon::ConvexSphericalPolygon(const PointLonLat points[], size_
         ++isp;
     }
     size_ = isp;
-    ATLAS_ASSERT(size_ > 2, "Polygon must have at least 3 points");
     validate();
 
     if (not valid_) {
@@ -121,7 +120,6 @@ ConvexSphericalPolygon::ConvexSphericalPolygon(const PointXYZ points[], size_t s
         ++isp;
     }
     size_ = isp;
-    ATLAS_ASSERT(size_ > 2, "Polygon must have at least 3 points");
     validate();
 
     if (not valid_) {

src/atlas/util/ConvexSphericalPolygon.h

@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include <optional>
 #include <vector>
 
 #include "eckit/deprecated.h"
@@ -87,7 +86,7 @@ class ConvexSphericalPolygon {
 
     size_t size() const { return size_; }
 
-    std::vector<PointXYZ> edge_normals() const {
+    std::vector<PointXYZ>& edge_normals() const {
         if (not computed_edge_normals_) {
             compute_edge_normals();
         }

src/tests/util/test_convexsphericalmeanvalue.cc

@@ -81,8 +81,7 @@ CASE("test_convex_spherical_polygon_triag") {
         size_t pointsOutside = 0;
 
         for (size_t i = 0; i < numberTestPoints; ++i) {
-            std::vector<double> polygonWeights;
-            polygonWeights.reserve(testTriangle.size());
+            std::vector<double> polygonWeights(testTriangle.size());
 
             if (testTriangle.compute_vertex_weights(candidatePoints[i], polygonWeights.data(), polygonWeights.size()) ==
                 1) {
@@ -163,8 +162,7 @@ CASE("test_spherical_polygon_nonplanar_quad") {
         size_t pointsOutside = 0;
 
         for (size_t i = 0; i < numberTestPoints; ++i) {
-            std::vector<double> polygonWeights;
-            polygonWeights.reserve(testQuad.size());
+            std::vector<double> polygonWeights(testQuad.size());
 
             if (testQuad.compute_vertex_weights(candidatePoints[i], polygonWeights.data(), polygonWeights.size()) ==
                 1) {
@@ -195,8 +193,7 @@ CASE("test_spherical_polygon_nonplanar_quad") {
         size_t pointsOutsideRotated = 0;
 
         for (size_t i = 0; i < numberTestPoints; ++i) {
-            std::vector<double> polygonWeightsRotated;
-            polygonWeightsRotated.reserve(testQuadRotated.size());
+            std::vector<double> polygonWeightsRotated(testQuadRotated.size());
 
             if (testQuadRotated.compute_vertex_weights(candidatePoints[i], polygonWeightsRotated.data(),
                                                        polygonWeightsRotated.size()) == 1) {