Willem's suggested modifications from ecmwf#167

phlndrwd · Jan 10, 2024 · abc8c27 · abc8c27
1 parent e734e7a
commit abc8c27
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/atlas/meshgenerator/detail/CubedSphereDualMeshGenerator.cc b/src/atlas/meshgenerator/detail/CubedSphereDualMeshGenerator.cc
@@ -62,10 +62,14 @@ CubedSphereDualMeshGenerator::CubedSphereDualMeshGenerator(const eckit::Parametr
     }
 
     // Get partitioner.
-    std::string partitioner;
-    try { p.get("partitioner.type", partitioner); } catch( std::exception& ) {}
-    p.get("partitioner", partitioner);
-    if( partitioner.size() ) {
+    if (p.has("partitioner.type")) {
+        std::string partitioner;
+        p.get("partitioner.type", partitioner);
+        options.set("partitioner", partitioner);
+    }
+    else if (p.has("partitioner")) {
+        std::string partitioner;
+        p.get("partitioner", partitioner);
         options.set("partitioner", partitioner);
     }
 }

diff --git a/src/atlas/meshgenerator/detail/CubedSphereMeshGenerator.cc b/src/atlas/meshgenerator/detail/CubedSphereMeshGenerator.cc
@@ -72,10 +72,14 @@ CubedSphereMeshGenerator::CubedSphereMeshGenerator(const eckit::Parametrisation&
     }
 
     // Get partitioner.
-    std::string partitioner;
-    try { p.get("partitioner.type", partitioner); } catch( std::exception& ) {}
-    p.get("partitioner", partitioner);
-    if( partitioner.size() ) {
+    if (p.has("partitioner.type")) {
+        std::string partitioner;
+        p.get("partitioner.type", partitioner);
+        options.set("partitioner", partitioner);
+    }
+    else if (p.has("partitioner")) {
+        std::string partitioner;
+        p.get("partitioner", partitioner);
         options.set("partitioner", partitioner);
     }
 }