Allow vector<int> as domain, project_boundaries in BoundaryLayerParameters

libsrc/meshing/boundarylayer.cpp

@@ -1571,10 +1571,19 @@ namespace netgen
 
       if(params.project_boundaries.has_value())
         {
-          regex pattern(*params.project_boundaries);
+          auto proj_bnd = *params.project_boundaries;
-          for(int i = 1; i<=mesh.GetNFD(); i++)
+          if(string* s = get_if<string>(&proj_bnd); s)
-            if(regex_match(mesh.GetFaceDescriptor(i).GetBCName(), pattern))
+            {
-              par_project_boundaries.Append(i);
+              regex pattern(*s);
+              for(int i = 1; i<=mesh.GetNFD(); i++)
+                if(regex_match(mesh.GetFaceDescriptor(i).GetBCName(), pattern))
+                  par_project_boundaries.Append(i);
+            }
+          else
+           {
+              for(auto id : *get_if<std::vector<int>>(&proj_bnd))
+                par_project_boundaries.Append(id);
+           }
         }
 
       if(double* height = get_if<double>(&params.thickness); height)
@@ -1598,10 +1607,14 @@ namespace netgen
             if(regex_match(mesh.GetMaterial(i), pattern))
               domains.SetBit(i);
         }
+      else if(int *idomain = get_if<int>(&params.domain); idomain)
+        {
+          domains.SetBit(*idomain);
+        }
       else
         {
-          auto idomain = *get_if<int>(&params.domain);
+          for (auto i : *get_if<std::vector<int>>(&params.domain))
-          domains.SetBit(idomain);
+            domains.SetBit(i);
         }
   }
 

libsrc/meshing/meshtype.cpp

@@ -2907,42 +2907,30 @@ namespace netgen
 
   ostream & operator<< (ostream & ost, const BoundaryLayerParameters & mp)
   {
+    auto print_vec = [&ost](auto & v) {
+        ost << "[";
+        for (const auto & val : v)
+          ost << val << " ";
+        ost << "]";
+    };
     ost << "BoundaryLayerParameters" << endl;
     ost << "  boundary: ";
     switch(mp.boundary.index())
       {
-        case 0:
+        case 0: ost << std::get<0>(mp.boundary); break;
-        ost << std::get<0>(mp.boundary);
+        case 1: ost << std::get<1>(mp.boundary); break;
-        break;
+        case 2: print_vec(std::get<2>(mp.boundary)); break;
-        case 1:
-        ost << std::get<1>(mp.boundary);
-        break;
-        case 2:
-        ost << "[";
-        for (auto val : std::get<2>(mp.boundary))
-          ost << val << " ";
-        ost << "]";
-        break;
       }
     ost << "\n  thickness: ";
     switch(mp.thickness.index())
       {
-        case 0:
+        case 0: ost << std::get<0>(mp.thickness); break;
-        ost << std::get<0>(mp.thickness);
+        case 1: print_vec(std::get<1>(mp.thickness)); break;
-        break;
-        case 1:
-        ost << "[";
-        for (auto val : std::get<1>(mp.thickness))
-          ost << val << " ";
-        ost << "]";
-        break;
       }
     ost <<"\n  new_material: ";
     switch(mp.new_material.index())
       {
-        case 0:
+        case 0: ost << std::get<0>(mp.new_material); break;
-        ost << std::get<0>(mp.new_material);
-        break;
         case 1:
         for (const auto & [key, value] : std::get<1>(mp.new_material))
           ost << key << " -> " << value << ", ";
@@ -2951,15 +2939,22 @@ namespace netgen
     ost << "\n  domain: ";
     switch(mp.domain.index())
       {
-        case 0:
+        case 0: ost << std::get<0>(mp.domain); break;
-        ost << std::get<0>(mp.domain);
+        case 1: ost << std::get<1>(mp.domain); break;
-        break;
+        case 2: print_vec(std::get<2>(mp.domain)); break;
-        case 1:
-        ost << std::get<1>(mp.domain);
-        break;
       }
     ost << "\n  outside: " << mp.outside;
-    ost << "\n  project_boundaries: " << (mp.project_boundaries ? ToString(*mp.project_boundaries) : "nullopt");
+    ost << "\n  project_boundaries: ";
+    if(mp.project_boundaries) {
+      auto & proj_bnd = *mp.project_boundaries;
+      switch(proj_bnd.index())
+        {
+          case 0: ost << std::get<0>(proj_bnd); break;
+          case 1: print_vec(std::get<1>(proj_bnd)); break;
+        }
+    }
+    else
+      ost << "nullopt";
     ost << "\n  grow_edges: " << mp.grow_edges;
     ost << "\n  limit_growth_vectors: " << mp.limit_growth_vectors;
     ost << "\n  sides_keep_surfaceindex: " << mp.sides_keep_surfaceindex;

libsrc/meshing/meshtype.hpp

@@ -1279,9 +1279,9 @@ namespace netgen
     std::variant<string, int, std::vector<int>> boundary;
     std::variant<double, std::vector<double>> thickness;
     std::variant<string, std::map<string, string>> new_material;
-    std::variant<string, int> domain;
+    std::variant<string, int, std::vector<int>> domain;
     bool outside;
-    std::optional<string> project_boundaries;
+    std::optional<std::variant<string, std::vector<int>>> project_boundaries;
     bool grow_edges;
     bool limit_growth_vectors;
     bool sides_keep_surfaceindex;

libsrc/meshing/python_mesh.cpp

@@ -1472,8 +1472,8 @@ py::arg("point_tolerance") = -1.)
     .def ("BoundaryLayer", [](Mesh & self, variant<string, int, std::vector<int>> boundary,
                               variant<double, std::vector<double>> thickness,
                               variant<string, map<string, string>> material,
-                              variant<string, int> domain, bool outside,
+                              variant<string, int, std::vector<int>> domain, bool outside,
-                              optional<string> project_boundaries,
+                              optional<variant<string, std::vector<int>>> project_boundaries,
                               bool grow_edges, bool limit_growth_vectors,
                               bool sides_keep_surfaceindex,
                               bool keep_surfaceindex)
@@ -1725,9 +1725,9 @@ py::arg("point_tolerance") = -1.)
         std::variant<string, int, std::vector<int>> boundary,
         std::variant<double, std::vector<double>> thickness,
         std::variant<string, std::map<string, string>> new_material,
-        std::variant<string, int> domain,
+        std::variant<string, int, std::vector<int>> domain,
         bool outside,
-        std::optional<string> project_boundaries,
+        std::optional<std::variant<string, std::vector<int>>> project_boundaries,
         bool grow_edges,
         bool limit_growth_vectors,
         bool sides_keep_surfaceindex,