ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-19 09:20:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Matthias Hochsteger 2023-12-11 19:06:51 +01:00
parent f6bdb3ccb0
commit 95d5e868dd
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/meshing/meshfunc.cpp
View File

@ -275,7 +275,6 @@ namespace netgen
auto & mesh = *md.mesh; auto & mesh = *md.mesh;
auto domain = md.domain; auto domain = md.domain;
MeshingParameters & mp = md.mp; MeshingParameters & mp = md.mp;
cout << "try to close open quads " << md.domain << endl;
int oldne; int oldne;
if (multithread.terminate) if (multithread.terminate)
@ -283,7 +282,6 @@ namespace netgen
mesh.CalcSurfacesOfNode(); mesh.CalcSurfacesOfNode();
mesh.FindOpenElements(domain); mesh.FindOpenElements(domain);
cout << "\thave close open elements " << mesh.GetNOpenElements() << endl;
if (!mesh.GetNOpenElements()) if (!mesh.GetNOpenElements())
return; return;
@ -294,7 +292,6 @@ namespace netgen
if (mesh.HasOpenQuads()) if (mesh.HasOpenQuads())
{ {
cout << "\thave close open quads" << endl;
string rulefile = ngdir; string rulefile = ngdir;
const char ** rulep = NULL; const char ** rulep = NULL;
@ -356,7 +353,6 @@ namespace netgen
<< "mesh has " << mesh.GetNE() << " prism/pyramid elements" << endl; << "mesh has " << mesh.GetNE() << " prism/pyramid elements" << endl;
mesh.FindOpenElements(domain); mesh.FindOpenElements(domain);
cout << "\thave close open elements " << mesh.GetNOpenElements() << endl;
} }
} }
@ -364,8 +360,8 @@ namespace netgen
if (mesh.HasOpenQuads()) if (mesh.HasOpenQuads())
{ {
if(debugparam.write_mesh_on_error) { if(debugparam.write_mesh_on_error) {
md.mesh->Save("open_quads_"+ToString(md.domain)+".vol.gz"); md.mesh->Save("open_quads_starting_mesh_"+ToString(md.domain)+".vol.gz");
GetOpenElements(*md.mesh, md.domain)->Save("open" + ToString(md.domain)+".vol"); GetOpenElements(*md.mesh, md.domain)->Save("open_quads_rest_" + ToString(md.domain)+".vol.gz");
} }
PrintSysError ("mesh has still open quads"); PrintSysError ("mesh has still open quads");
throw NgException ("Stop meshing since too many attempts"); throw NgException ("Stop meshing since too many attempts");

2
libsrc/meshing/python_mesh.cpp
View File

@ -1298,7 +1298,7 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
CreateMPfromKwargs(mp, kwargs); CreateMPfromKwargs(mp, kwargs);
} }
MeshVolume (mp, self); MeshVolume (mp, self);
// OptimizeVolume (mp, self); OptimizeVolume (mp, self);
}, py::arg("mp")=nullptr, }, py::arg("mp")=nullptr,
meshingparameter_description.c_str(), meshingparameter_description.c_str(),
py::call_guard<py::gil_scoped_release>()) py::call_guard<py::gil_scoped_release>())

7
libsrc/visualization/vsmesh.cpp
View File

@ -456,7 +456,7 @@ namespace netgen
const auto& seg = (*mesh)[si]; const auto& seg = (*mesh)[si];
Point<3> c = Center((*mesh)[seg[0]], (*mesh)[seg[1]]); Point<3> c = Center((*mesh)[seg[0]], (*mesh)[seg[1]]);
glRasterPos3d (c[0], c[1], c[2]); glRasterPos3d (c[0], c[1], c[2]);
snprintf (buf, size(buf), "%d", int(seg.edgenr)); snprintf (buf, size(buf), "%d", int(si));
MyOpenGLText (buf); MyOpenGLText (buf);
} }
} }
@ -507,10 +507,7 @@ namespace netgen
(*mesh)[sel[2]], (*mesh)[sel[2]],
(*mesh)[sel[3]]); (*mesh)[sel[3]]);
glRasterPos3d (c[0], c[1], c[2]); glRasterPos3d (c[0], c[1], c[2]);
// auto & fd = mesh->GetFaceDescriptor(sel.GetIndex()); snprintf (buf, size(buf), "%d", int(sei));
// string s = ToString(fd.DomainIn()) + "/" + ToString(fd.DomainOut());
// snprintf (buf, size(buf), "%s", s.c_str());
snprintf (buf, size(buf), "%d", int(sel.GetIndex()));
MyOpenGLText (buf); MyOpenGLText (buf);
} }
} }