Merge branch 'hotfix/1.21.1'

ecmwf · May 30, 2024 · 3e4dc72 · 3e4dc72
2 parents 979a904 + a339bc1
commit 3e4dc72
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.21.0
+1.21.1
diff --git a/src/mir/key/style/ECMWFStyle.cc b/src/mir/key/style/ECMWFStyle.cc
@@ -185,7 +185,14 @@ static std::string target_gridded_from_parametrisation(const param::MIRParametri
         return "points";
     }
 
-    if (user.has("area") || rotation) {
+    if (user.has("area")) {
+        if (field.has("gridded_regular_ll") && user.has("grid") && !same_points(user, field)) {
+            check_rotated_regular_ll();
+            return prefix + "regular-ll";
+        }
+    }
+
+    if (rotation) {
         if (field.has("gridded_regular_ll") && !same_points(user, field)) {
             check_rotated_regular_ll();
             return prefix + "regular-ll";

diff --git a/tests/plans/MIR-361.001.test b/tests/plans/MIR-361.001.test
@@ -3,4 +3,4 @@ MIR-340.grib
 # mir
 --area=50/-21/25/6
 # plan
-Gridded2RegularLL[increments=Increments[west_east=0.35,south_north=0.35],bbox=BoundingBox[north=89.75,west=-21,south=-89.8,east=338.8],interpolation=linear,method=FiniteElement[name=linear,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=BoundingBox[north=50,west=-21,south=25,east=6],lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0,validateMesh=0,projectionFail=missing-value]]|Save[output=...]
+AreaCropper[bbox=BoundingBox[north=50,west=-21,south=25,east=6]]|Save[output=...]
diff --git a/tests/plans/MIR-361.003.test b/tests/plans/MIR-361.003.test
@@ -3,4 +3,4 @@ MIR-360.grib
 # mir
 --area=85/-80/25/40
 # plan
-Gridded2RegularLL[increments=Increments[west_east=1,south_north=1],bbox=BoundingBox[north=90,west=0,south=-90,east=359],interpolation=linear,method=FiniteElement[name=linear,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=BoundingBox[north=85,west=-80,south=25,east=40],lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0,validateMesh=0,projectionFail=missing-value]]|Save[output=...]
+AreaCropper[bbox=BoundingBox[north=85,west=-80,south=25,east=40]]|Save[output=...]
diff --git a/tests/plans/MIR-361.011.test b/tests/plans/MIR-361.011.test
@@ -3,4 +3,4 @@ MIR-361.grib
 # mir
 --area=89.5/-179.5/-89.5/179.5
 # plan
-Gridded2RegularLL[increments=Increments[west_east=1,south_north=1],bbox=BoundingBox[north=89.5,west=0.5,south=-89.5,east=359.5],interpolation=linear,method=FiniteElement[name=linear,nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=BoundingBox[north=89.5,west=-179.5,south=-89.5,east=179.5],lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0,validateMesh=0,projectionFail=missing-value]]|Save[output=...]
+AreaCropper[bbox=BoundingBox[north=89.5,west=-179.5,south=-89.5,east=179.5]]|Save[output=...]