kindred/create
1
1
Fork 0
Code Issues 47 Pull Requests Actions 4 Packages Projects 9 Releases 2 Wiki Activity

[Mesh] fix Gmsh mesh algorithms

Browse Source 
the numbers written to the geo file were wrong

- also update the list of currently supported algorithms (as of Gmsh 4.6 or newer)
This commit is contained in:
donovaly
2021-03-24 00:49:38 +01:00
committed by wwmayer
parent bcc669b930
commit bf08e25f34
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Mesh/Gui/RemeshGmsh.cpp
View File

@@ -93,14 +93,14 @@ GmshWidget::GmshWidget(QWidget* parent, Qt::WindowFlags fl)
d->ui.outputWindow->setReadOnly(true);
// Meshing algorithms
// 1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad
// 1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad,
// 9=Packing of Parallelograms
d->ui.method->addItem(tr("Automatic"), static_cast<int>(2));
d->ui.method->addItem(tr("Adaptive"), static_cast<int>(1));
d->ui.method->addItem(QString::fromLatin1("Delaunay"), static_cast<int>(5));
d->ui.method->addItem(tr("Frontal"), static_cast<int>(6));
d->ui.method->addItem(QString::fromLatin1("BAMG"), static_cast<int>(5));
d->ui.method->addItem(tr("Frontal Quad"), static_cast<int>(6));
d->ui.method->addItem(QString::fromLatin1("BAMG"), static_cast<int>(7));
d->ui.method->addItem(tr("Frontal Quad"), static_cast<int>(8));
d->ui.method->addItem(tr("Parallelograms"), static_cast<int>(9));
}
@@ -316,9 +316,9 @@ bool RemeshGmsh::writeProject(QString& inpFile, QString& outFile)
<< " Exit;\n"
<< "EndIf\n"
<< "Merge \"" << stl.filePath() << "\";\n\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad)\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad, 9=Packing of Parallelograms)\n"
<< "Mesh.Algorithm = " << algorithm << ";\n\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 5=Frontal Delaunay, 6=Frontal Hex, 7=MMG3D, 9=R-tree)\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 7=MMG3D, 9=R-tree, 10=HTX)\n"
<< "// Mesh.Algorithm3D = 1;\n\n"
<< "Mesh.CharacteristicLengthMax = " << maxSize << ";\n"
<< "Mesh.CharacteristicLengthMin = " << minSize << ";\n\n"

4
src/Mod/MeshPart/Gui/Tessellation.cpp
View File

@@ -484,9 +484,9 @@ bool Mesh2ShapeGmsh::writeProject(QString& inpFile, QString& outFile)
<< "// Second order nodes are created by linear interpolation instead by curvilinear\n"
<< "Mesh.SecondOrderLinear = 1;\n\n"
<< "// mesh algorithm, only a few algorithms are usable with 3D boundary layer generation\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=DelQuad)\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=DelQuad, 9=Packing of Parallelograms)\n"
<< "Mesh.Algorithm = " << algorithm << ";\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 5=Frontal Delaunay, 6=Frontal Hex, 7=MMG3D, 9=R-tree)\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 7=MMG3D, 9=R-tree, 10=HTX)\n"
<< "Mesh.Algorithm3D = 1;\n\n"
<< "// meshing\n"
<< "// set geometrical tolerance (also used for merging nodes)\n"