Consistency with SphericalVector: rename 'ancillary_scheme' to 'scheme'

JCSDA-internal · Jun 10, 2024 · d766d88 · d766d88
1 parent c0b8577
commit d766d88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/atlas/interpolation/method/binning/Binning.cc b/src/atlas/interpolation/method/binning/Binning.cc
@@ -33,10 +33,11 @@ MethodBuilder<Binning> __builder("binning");
 
 
 Binning::Binning(const Config& config) : Method(config) {
-  const auto* ptr_config = dynamic_cast<const eckit::LocalConfiguration*>(&config);
-  interpAncillaryScheme_ = ptr_config->getSubConfiguration("ancillary_scheme");
-  halo_exchange_ = ptr_config->getBool("halo_exchange", true);
-  adjoint_ = ptr_config->getBool("adjoint", false);
+  const auto* conf = dynamic_cast<const eckit::LocalConfiguration*>(&config);
+  ATLAS_ASSERT(conf, "config must be derived from eckit::LocalConfiguration");
+  interpAncillaryScheme_ = conf->getSubConfiguration("scheme");
+  adjoint_ = conf->getBool("adjoint", false);
+  halo_exchange_ = conf->getBool("halo_exchange", true);
 }
 
 

diff --git a/src/tests/interpolation/test_interpolation_binning.cc b/src/tests/interpolation/test_interpolation_binning.cc
@@ -124,7 +124,7 @@ CASE("rigridding from high to low resolution; grid type: CS-LFR") {
 
 
   const auto scheme = util::Config("type", "binning") |
-                      util::Config("ancillary_scheme", option::type("cubedsphere-bilinear"));
+                      util::Config("scheme", option::type("cubedsphere-bilinear"));
 
   Interpolation regrid_high2low(scheme, csfs_s, csfs_t);
 
@@ -179,7 +179,7 @@ CASE("rigridding from high to low resolution; grid type: O") {
 
 
   const auto scheme = util::Config("type", "binning") |
-                      util::Config("ancillary_scheme", option::type("structured-bilinear"));
+                      util::Config("scheme", option::type("structured-bilinear"));
 
   Interpolation regrid_high2low(scheme, ncfs_s, ncfs_t);
 
@@ -232,7 +232,7 @@ CASE("dot-product test for the rigridding from high to low resolution; grid type
   fs_t.add(field_01_t);
 
   const auto scheme = util::Config("type", "binning") |
-                      util::Config("ancillary_scheme", option::type("cubedsphere-bilinear")) |
+                      util::Config("scheme", option::type("cubedsphere-bilinear")) |
                       util::Config("adjoint", true);
 
   Interpolation regrid_high2low(scheme, csfs_s, csfs_t);