MIR-592 Wind vector components at the poles, fixed displacement

src/mir/method/fe/FiniteElement.cc

@@ -246,6 +246,11 @@ void FiniteElement::print(std::ostream& out) const {
 }
 
 
+int FiniteElement::version() const {
+    return 1;
+}
+
+
 bool FiniteElement::sameAs(const Method& other) const {
     const auto* o = dynamic_cast<const FiniteElement*>(&other);
     return (o != nullptr) && meshGeneratorParams_.sameAs(o->meshGeneratorParams_) &&

src/mir/method/fe/FiniteElement.h

@@ -105,6 +105,8 @@ class FiniteElement : public MethodWeighted {
     void json(eckit::JSON&) const override;
     void print(std::ostream&) const override;
 
+    int version() const override;
+
     // -- Overridden methods
     // None
 

src/mir/method/gridbox/GridBoxAverage.cc

@@ -186,7 +186,7 @@ const char* GridBoxAverage::name() const {
 
 
 int GridBoxAverage::version() const {
-    return 4;
+    return 5;
 }
 
 

src/mir/method/gridbox/GridBoxStatistics.cc

@@ -181,7 +181,7 @@ const char* GridBoxStatistics::name() const {
 
 
 int GridBoxStatistics::version() const {
-    return 4;
+    return 5;
 }
 
 

src/mir/method/knn/KNearestNeighbours.cc

@@ -162,6 +162,11 @@ void KNearestNeighbours::print(std::ostream& out) const {
 }
 
 
+int KNearestNeighbours::version() const {
+    return 1;
+}
+
+
 WeightMatrix::Check KNearestNeighbours::validateMatrixWeights() const {
     return distanceWeighting().validateMatrixWeights();
 }

src/mir/method/knn/KNearestNeighbours.h

@@ -52,6 +52,7 @@ class KNearestNeighbours : public MethodWeighted {
     void print(std::ostream&) const override;
 
     const char* name() const override = 0;
+    int version() const override;
 
     virtual const pick::Pick& pick() const                               = 0;
     virtual const distance::DistanceWeighting& distanceWeighting() const = 0;

src/mir/method/voronoi/VoronoiMethod.cc

@@ -178,4 +178,9 @@ const char* VoronoiMethod::name() const {
 }
 
 
+int VoronoiMethod::version() const {
+    return 1;
+}
+
+
 }  // namespace mir::method::voronoi

src/mir/method/voronoi/VoronoiMethod.h

@@ -32,6 +32,7 @@ class VoronoiMethod : public MethodWeighted {
     void print(std::ostream&) const override;
     WeightMatrix::Check validateMatrixWeights() const override;
     const char* name() const override;
+    int version() const override;
 
     knn::pick::NClosestOrNearest pick_;
 };

src/mir/util/Point2ToPoint3.cc

@@ -37,9 +37,10 @@ Point2ToPoint3::Point3Displaced::Point3Displaced(double poleDisplacement) : eps_
 
 
 Point3 Point2ToPoint3::Point3Displaced::make_point3(const Point2& p2) const {
-    const Point2 p2d{p2[0], Latitude::NORTH_POLE == p2[1]   ? p2[1] - eps_
-                            : Latitude::SOUTH_POLE == p2[1] ? p2[1] + eps_
-                                                            : p2[1]};
+    const Point2 p2d{Latitude::NORTH_POLE <= p2[0] + eps_   ? p2[0] - eps_
+                     : Latitude::SOUTH_POLE >= p2[0] - eps_ ? p2[0] + eps_
+                                                            : p2[0],
+                     p2[1]};
     return repres::Iterator::point_3D(p2d);
 }