From 0c3cd4b00966ca98671eb5c7c617ccc3342cc993 Mon Sep 17 00:00:00 2001
From: David Bold <dave@ipp.mpg.de>
Date: Mon, 1 Sep 2025 12:09:51 +0200
Subject: [PATCH 1/2] Allow more parallel boundary regions

Also allow to set boundaries for bndry_par_xin/xout and
bndry_par_yup/ydown
---
 src/mesh/boundary_factory.cxx | 98 ++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 41 deletions(-)

diff --git a/src/mesh/boundary_factory.cxx b/src/mesh/boundary_factory.cxx
index d112a216ad..5934daff31 100644
--- a/src/mesh/boundary_factory.cxx
+++ b/src/mesh/boundary_factory.cxx
@@ -228,46 +228,82 @@ BoundaryOpBase* BoundaryFactory::createFromOptions(const string& varname,
 
   string prefix("bndry_");
 
-  string side;
+  std::array<string, 5> sides;
+  sides[0] = region->label;
   switch (region->location) {
   case BNDRY_XIN: {
-    side = "xin";
+    sides[1] = "xin";
     break;
   }
   case BNDRY_XOUT: {
-    side = "xout";
+    sides[1] = "xout";
     break;
   }
   case BNDRY_YDOWN: {
-    side = "ydown";
+    sides[1] = "ydown";
     break;
   }
   case BNDRY_YUP: {
-    side = "yup";
+    sides[1] = "yup";
     break;
   }
   case BNDRY_PAR_FWD_XIN: {
-    side = "par_yup_xin";
+    sides[1] = "par_yup_xin";
     break;
   }
   case BNDRY_PAR_FWD_XOUT: {
-    side = "par_yup_xout";
+    sides[1] = "par_yup_xout";
     break;
   }
   case BNDRY_PAR_BKWD_XIN: {
-    side = "par_ydown_xin";
+    sides[1] = "par_ydown_xin";
     break;
   }
   case BNDRY_PAR_BKWD_XOUT: {
-    side = "par_ydown_xout";
+    sides[1] = "par_ydown_xout";
     break;
   }
   default: {
-    side = "all";
+    sides[1] = "all";
     break;
   }
   }
 
+  switch (region->location) {
+  case BNDRY_PAR_FWD_XIN:
+  case BNDRY_PAR_BKWD_XIN: {
+    sides[2] = "par_xin";
+    break;
+  }
+  case BNDRY_PAR_BKWD_XOUT:
+  case BNDRY_PAR_FWD_XOUT: {
+    sides[2] = "par_xout";
+    break;
+  }
+  default: {
+    sides[2] = "all";
+    break;
+  }
+  }
+  switch (region->location) {
+  case BNDRY_PAR_FWD_XIN:
+  case BNDRY_PAR_FWD_XOUT: {
+    sides[3] = "par_yup";
+    break;
+  }
+  case BNDRY_PAR_BKWD_XIN:
+  case BNDRY_PAR_BKWD_XOUT: {
+    sides[3] = "par_ydown";
+    break;
+  }
+  default: {
+    sides[3] = "all";
+    break;
+  }
+  }
+
+  sides[4] = region->isParallel ? "par_all" : "all";
+
   // Get options
   Options* options = Options::getRoot();
 
@@ -275,27 +311,10 @@ BoundaryOpBase* BoundaryFactory::createFromOptions(const string& varname,
   Options* varOpts = options->getSection(varname);
   string set;
 
-  /// First try looking for (var, region)
-  if (varOpts->isSet(prefix + region->label)) {
-    varOpts->get(prefix + region->label, set, "");
-    return create(set, region);
-  }
-
-  /// Then (var, side)
-  if (varOpts->isSet(prefix + side)) {
-    varOpts->get(prefix + side, set, "");
-    return create(set, region);
-  }
-
-  /// Then (var, all)
-  if (region->isParallel) {
-    if (varOpts->isSet(prefix + "par_all")) {
-      varOpts->get(prefix + "par_all", set, "");
-      return create(set, region);
-    }
-  } else {
-    if (varOpts->isSet(prefix + "all")) {
-      varOpts->get(prefix + "all", set, "");
+  /// First try looking for (var, ...)
+  for (const auto& side : sides) {
+    if (varOpts->isSet(prefix + side)) {
+      varOpts->get(prefix + side, set, "");
       return create(set, region);
     }
   }
@@ -303,16 +322,13 @@ BoundaryOpBase* BoundaryFactory::createFromOptions(const string& varname,
   // Get the "all" options
   varOpts = options->getSection("all");
 
-  /// Then (all, region)
-  if (varOpts->isSet(prefix + region->label)) {
-    varOpts->get(prefix + region->label, set, "");
-    return create(set, region);
-  }
-
-  /// Then (all, side)
-  if (varOpts->isSet(prefix + side)) {
-    varOpts->get(prefix + side, set, "");
-    return create(set, region);
+  /// First try looking for (all, ...)
+  for (const auto& side : sides) {
+    if (varOpts->isSet(prefix + side)) {
+      varOpts->get(prefix + side, set,
+                   region->isParallel ? "parallel_dirichlet_o2" : "dirichlet");
+      return create(set, region);
+    }
   }
 
   /// Then (all, all)

From 4cd217b833710c2f401c2185dcc8ce927c48e664 Mon Sep 17 00:00:00 2001
From: David Bold <dave@ipp.mpg.de>
Date: Wed, 4 Mar 2026 10:41:41 +0100
Subject: [PATCH 2/2] Add missing header

---
 src/mesh/boundary_factory.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesh/boundary_factory.cxx b/src/mesh/boundary_factory.cxx
index 5934daff31..fd5bbdc70d 100644
--- a/src/mesh/boundary_factory.cxx
+++ b/src/mesh/boundary_factory.cxx
@@ -6,6 +6,7 @@
 #include <bout/options.hxx>
 #include <bout/utils.hxx>
 
+#include <array>
 #include <list>
 #include <map>
 #include <string>