Merge branch 'hotfix/1.21.3' into develop

ecmwf · Jun 18, 2024 · 000fcae · 000fcae
2 parents 3ec2763 + a08667c
commit 000fcae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.21.2
+1.21.3
diff --git a/src/mir/repres/gauss/reduced/Reduced.cc b/src/mir/repres/gauss/reduced/Reduced.cc
@@ -345,7 +345,7 @@ std::vector<util::GridBox> Reduced::gridBoxes() const {
                 r.emplace_back(n, w, s, std::min(bbox_.east().value(), lon1.value()));
             }
 
-            ASSERT(lon0 < lon1.normalise(lon0));
+            ASSERT(lon0 <= lon1.normalise(lon0));
         }
     }
 

diff --git a/src/mir/repres/gauss/regular/RegularGG.cc b/src/mir/repres/gauss/regular/RegularGG.cc
@@ -101,7 +101,7 @@ std::vector<util::GridBox> RegularGG::gridBoxes() const {
                            std::max(bbox_.south().value(), latEdges[j + 1]), lonEdges[i + 1]);
         }
 
-        ASSERT(periodic ? lon0 == lon1.normalise(lon0) : lon0 < lon1.normalise(lon0));
+        ASSERT(periodic ? lon0 == lon1.normalise(lon0) : lon0 <= lon1.normalise(lon0));
     }
 
     ASSERT(r.size() == Ni_ * Nj_);

diff --git a/src/mir/repres/latlon/ReducedLL.cc b/src/mir/repres/latlon/ReducedLL.cc
@@ -325,7 +325,7 @@ std::vector<util::GridBox> ReducedLL::gridBoxes() const {
                 r.emplace_back(latEdges[j], w, latEdges[j + 1], e);
             }
 
-            ASSERT(lon0 < lon1.normalise(lon0));
+            ASSERT(lon0 <= lon1.normalise(lon0));
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -345,7 +345,7 @@ std::vector<util::GridBox> Reduced::gridBoxes() const { @@
                     r.emplace_back(n, w, s, std::min(bbox_.east().value(), lon1.value()));
                 }
-                ASSERT(lon0 < lon1.normalise(lon0));
+                ASSERT(lon0 <= lon1.normalise(lon0));
             }
         }
@@ Expand Down @@