Merge branch 'hotfix/1.21.2' into develop

pmaciel · pmaciel · commit 393ca290314d · 2024-06-04T16:17:41.000+02:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.21.1
+1.21.2
diff --git a/src/mir/key/style/ECMWFStyle.cc b/src/mir/key/style/ECMWFStyle.cc
@@ -186,7 +186,8 @@ static std::string target_gridded_from_parametrisation(const param::MIRParametri
     }
 
     if (user.has("area")) {
-        if (field.has("gridded_regular_ll") && user.has("grid") && !same_points(user, field)) {
+        std::vector<double> grid_v;
+        if (field.has("gridded_regular_ll") && same->get("grid", grid_v) && !same_points(user, field)) {
             check_rotated_regular_ll();
             return prefix + "regular-ll";
         }

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,8 @@ static std::string target_gridded_from_parametrisation(const param::MIRParametri`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`if (user.has("area")) {`
`189`		`- if (field.has("gridded_regular_ll") && user.has("grid") && !same_points(user, field)) {`
	`189`	`+ std::vector<double> grid_v;`
	`190`	`+ if (field.has("gridded_regular_ll") && same->get("grid", grid_v) && !same_points(user, field)) {`
`190`	`191`	`check_rotated_regular_ll();`
`191`	`192`	`return prefix + "regular-ll";`
`192`	`193`	`}`