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

domainwise meshing and optimization enabled

Browse Source
This commit is contained in:
Christopher Lackner 2016-12-02 14:59:59 +01:00
parent e31cc7dfa1
commit 0d36c69c25
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsrc/meshing/improve3.cpp
View File

@ -18,6 +18,7 @@ namespace netgen
point is inner point. point is inner point.
*/ */
void MeshOptimize3d :: CombineImprove (Mesh & mesh, void MeshOptimize3d :: CombineImprove (Mesh & mesh,
OPTIMIZEGOAL goal) OPTIMIZEGOAL goal)
{ {
@ -41,6 +42,8 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
double totalbad = 0; double totalbad = 0;
for (ElementIndex ei = 0; ei < ne; ei++) for (ElementIndex ei = 0; ei < ne; ei++)
{ {
if(mesh.GetDimension()==3 && mp.only3D_domain_nr && mp.only3D_domain_nr != mesh.VolumeElement(ei).GetIndex())
continue;
double elerr = CalcBad (mesh.Points(), mesh[ei], 0); double elerr = CalcBad (mesh.Points(), mesh[ei], 0);
totalbad += elerr; totalbad += elerr;
elerrs[ei] = elerr; elerrs[ei] = elerr;
@ -55,8 +58,9 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
for (ElementIndex ei = 0; ei < ne; ei++) for (ElementIndex ei = 0; ei < ne; ei++)
if (!mesh[ei].IsDeleted()) if (!mesh[ei].IsDeleted())
for (int j = 0; j < mesh[ei].GetNP(); j++) if(!(mesh.GetDimension()==3 && mp.only3D_domain_nr && mp.only3D_domain_nr != mesh.VolumeElement(ei).GetIndex()))
elementsonnode.Add (mesh[ei][j], ei); for (int j = 0; j < mesh[ei].GetNP(); j++)
elementsonnode.Add (mesh[ei][j], ei);
INDEX_2_HASHTABLE<int> edgetested (np+1); INDEX_2_HASHTABLE<int> edgetested (np+1);
@ -64,6 +68,8 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
for (ElementIndex ei = 0; ei < ne; ei++) for (ElementIndex ei = 0; ei < ne; ei++)
{ {
if(mesh.GetDimension()==3 && mp.only3D_domain_nr && mp.only3D_domain_nr != mesh.VolumeElement(ei).GetIndex())
continue;
if (multithread.terminate) if (multithread.terminate)
break; break;
@ -238,7 +244,8 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
totalbad = 0; totalbad = 0;
for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++) for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
totalbad += CalcBad (mesh.Points(), mesh[ei], 0); if(!(mesh.GetDimension()==3 && mp.only3D_domain_nr && mp.only3D_domain_nr != mesh.VolumeElement(ei).GetIndex()))
totalbad += CalcBad (mesh.Points(), mesh[ei], 0);
if (goal == OPT_QUALITY) if (goal == OPT_QUALITY)
{ {
@ -247,8 +254,9 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
int cntill = 0; int cntill = 0;
for (ElementIndex ei = 0; ei < ne; ei++) for (ElementIndex ei = 0; ei < ne; ei++)
if (!mesh.LegalTet (mesh[ei])) if(!(mesh.GetDimension()==3 && mp.only3D_domain_nr && mp.only3D_domain_nr != mesh.VolumeElement(ei).GetIndex()))
cntill++; if (!mesh.LegalTet (mesh[ei]))
cntill++;
PrintMessage (5, cntill, " illegal tets"); PrintMessage (5, cntill, " illegal tets");
} }

4
libsrc/meshing/meshfunc.cpp
View File

@ -32,6 +32,8 @@ namespace netgen
int nonconsist = 0; int nonconsist = 0;
for (int k = 1; k <= mesh3d.GetNDomains(); k++) for (int k = 1; k <= mesh3d.GetNDomains(); k++)
{ {
if(mp.only3D_domain_nr && mp.only3D_domain_nr !=k)
continue;
PrintMessage (3, "Check subdomain ", k, " / ", mesh3d.GetNDomains()); PrintMessage (3, "Check subdomain ", k, " / ", mesh3d.GetNDomains());
mesh3d.FindOpenElements(k); mesh3d.FindOpenElements(k);
@ -63,6 +65,8 @@ namespace netgen
for (int k = 1; k <= mesh3d.GetNDomains(); k++) for (int k = 1; k <= mesh3d.GetNDomains(); k++)
{ {
if(mp.only3D_domain_nr && mp.only3D_domain_nr !=k)
continue;
if (multithread.terminate) if (multithread.terminate)
break; break;

2
libsrc/meshing/meshtype.hpp
View File

@ -1110,6 +1110,8 @@ namespace netgen
double badellimit = 175; double badellimit = 175;
bool check_impossible = 0; bool check_impossible = 0;
int only3D_domain_nr = -1;
/// ///
int secondorder = 0; int secondorder = 0;

9
libsrc/meshing/python_mesh.cpp
View File

@ -590,18 +590,21 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
py::class_<MP> (m, "MeshingParameters") py::class_<MP> (m, "MeshingParameters")
.def(py::init<>()) .def(py::init<>())
.def("__init__", .def("__init__",
[](MP *instance, double maxh, bool quad_dominated, int optsteps2d, int optsteps3d) [](MP *instance, double maxh, bool quad_dominated, int optsteps2d, int optsteps3d,
int only3D_domain)
{ {
new (instance) MeshingParameters; new (instance) MeshingParameters;
instance->maxh = maxh; instance->maxh = maxh;
instance->quad = int(quad_dominated); instance->quad = int(quad_dominated);
instance->optsteps2d = optsteps2d; instance->optsteps2d = optsteps2d;
instance->optsteps3d = optsteps3d; instance->optsteps3d = optsteps3d;
instance->only3D_domain_nr = only3D_domain;
}, },
py::arg("maxh")=1000, py::arg("maxh")=1000,
py::arg("quad_dominated")=false, py::arg("quad_dominated")=false,
py::arg("optsteps2d") = 3, py::arg("optsteps2d") = 3,
py::arg("optsteps3d") = 3 py::arg("optsteps3d") = 3,
py::arg("only3D_domain") = 0
, ,
"create meshing parameters" "create meshing parameters"
) )