Merge branch 'feature/MIR-677' into develop

Author: pmaciel

src/mir/key/style/ECMWFStyle.cc

@@ -24,7 +24,10 @@
 #include "mir/key/grid/Grid.h"
 #include "mir/key/resol/Resol.h"
 #include "mir/output/MIROutput.h"
+#include "mir/param/CombinedParametrisation.h"
+#include "mir/param/DefaultParametrisation.h"
 #include "mir/param/MIRParametrisation.h"
+#include "mir/param/RuntimeParametrisation.h"
 #include "mir/param/SameParametrisation.h"
 #include "mir/repres/latlon/LatLon.h"
 #include "mir/util/BoundingBox.h"
@@ -333,7 +336,8 @@ void ECMWFStyle::sh2sh(action::ActionPlan& plan) const {
 
 
 void ECMWFStyle::grid2grid(action::ActionPlan& plan) const {
-    const auto& user = parametrisation_.userParametrisation();
+    const auto& user  = parametrisation_.userParametrisation();
+    const auto& field = parametrisation_.fieldParametrisation();
 
     bool rotation = user.has("rotation");
     bool vod2uv   = option(user, "vod2uv", false);
@@ -346,6 +350,21 @@ void ECMWFStyle::grid2grid(action::ActionPlan& plan) const {
 
     add_formula(plan, user, {"gridded", "raw"});
 
+    if (std::string intint; user.get("intermediate-interpolation", intint) && !intint.empty()) {
+        if (std::string intgrid; user.get("intgrid", intgrid) && !intgrid.empty()) {
+            auto runtime = new param::RuntimeParametrisation{parametrisation_};
+            runtime->set("interpolation", intint);
+            runtime->set("grid", intgrid);
+            runtime->unset("rotation");
+
+            static param::DefaultParametrisation defaults;
+            auto recombined = std::make_unique<param::CombinedParametrisation>(*runtime, field, defaults);
+            auto target     = target_gridded_from_parametrisation(*recombined, false);
+
+            plan.add("interpolate.grid2" + target, runtime);
+        }
+    }
+
     auto target = target_gridded_from_parametrisation(parametrisation_, rotation);
     if (!target.empty()) {
         plan.add("interpolate.grid2" + target);

src/tools/mir.cc

@@ -115,6 +115,9 @@ struct MIR : MIRTool {
         options_.push_back(
             new FactoryOption<method::MethodFactory>("interpolation", "Grid to grid interpolation method"));
 
+        options_.push_back(new FactoryOption<method::MethodFactory>("intermediate-interpolation",
+                                                                    "Grid to grid intermediate interpolation method"));
+
         options_.push_back(
             new FactoryOption<stats::FieldFactory>("interpolation-statistics", "Statistics interpolation method"));
 

tests/assertions/intermediate-interpolation=nn.core.test

@@ -0,0 +1,7 @@
+# input
+regular_ll.2-2.grib2
+# mir
+--intermediate-interpolation=nn --intgrid=O80 --interpolation=linear --grid=1/1
+# grib_get
+Ni=360
+Nj=181

tests/plans/intermediate-interpolation=nn.test

@@ -0,0 +1,6 @@
+# input
+regular_ll.2-2.grib2
+# mir
+--intermediate-interpolation=nn --intgrid=O80 --interpolation=linear --grid=1/1
+# plan
+Gridded2NamedGrid[grid=O80,interpolation=nn,method=KNearestNeighbours[nonLinear[MissingIfHeaviestMissing[]],solver=Multiply[],cropping=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0,nearestMethod=NearestNeighbourWithLowestIndex[nclosest=4],distanceWeighting=InverseDistanceWeightingSquared[]]]|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=none,lsmWeightAdjustment=0.2,pruneEpsilon=1e-10,poleDisplacement=0,validateMesh=0,projectionFail=missing-value]]|Save[output=...]