ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 22:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Allow vector<int> as domain, project_boundaries in BoundaryLayerParameters

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-09-27 17:29:05 +02:00
parent 2ff62bc283
commit 7f8172aaf6
4 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/meshing/boundarylayer.cpp
View File

@ -1571,11 +1571,20 @@ namespace netgen
if(params.project_boundaries.has_value())
{
regex pattern(*params.project_boundaries);
auto proj_bnd = *params.project_boundaries;
if(string* s = get_if<string>(&proj_bnd); s)
{
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);
domains.SetBit(idomain);
for (auto i : *get_if<std::vector<int>>(&params.domain))
domains.SetBit(i);
}
}

57
libsrc/meshing/meshtype.cpp
View File

@ -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:
ost << std::get<0>(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;
case 0: ost << std::get<0>(mp.boundary); break;
case 1: ost << std::get<1>(mp.boundary); break;
case 2: print_vec(std::get<2>(mp.boundary)); break;
}
ost << "\n thickness: ";
switch(mp.thickness.index())
{
case 0:
ost << std::get<0>(mp.thickness);
break;
case 1:
ost << "[";
for (auto val : std::get<1>(mp.thickness))
ost << val << " ";
ost << "]";
break;
case 0: ost << std::get<0>(mp.thickness); break;
case 1: print_vec(std::get<1>(mp.thickness)); break;
}
ost <<"\n new_material: ";
switch(mp.new_material.index())
{
case 0:
ost << std::get<0>(mp.new_material);
break;
case 0: 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:
ost << std::get<0>(mp.domain);
break;
case 1:
ost << std::get<1>(mp.domain);
break;
case 0: ost << std::get<0>(mp.domain); break;
case 1: ost << std::get<1>(mp.domain); break;
case 2: print_vec(std::get<2>(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;

4
libsrc/meshing/meshtype.hpp
View File

@ -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;

8
libsrc/meshing/python_mesh.cpp
View File

@ -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,
optional<string> project_boundaries,
variant<string, int, std::vector<int>> domain, bool outside,
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,