diff --git a/src/Tools/YamsPlug/YamsPlugDialog.ui b/src/Tools/YamsPlug/YamsPlugDialog.ui
index 05963b5d6..2bb101ba7 100644
--- a/src/Tools/YamsPlug/YamsPlugDialog.ui
+++ b/src/Tools/YamsPlug/YamsPlugDialog.ui
@@ -6,8 +6,8 @@
0
0
- 799
- 602
+ 800
+ 500
@@ -19,6 +19,22 @@
-
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 10
+ 20
+
+
+
+
-
@@ -38,35 +54,70 @@
Qt::Horizontal
-
- QSizePolicy::Minimum
-
- 60
+ 30
20
+ -
+
+
+ Save
+
+
+
+ 18
+ 18
+
+
+
+
+ -
+
+
+ Load
+
+
+
+ 18
+ 18
+
+
+
+
-
- Save Params
+ Save
+
+
+ 18
+ 18
+
+
-
- Load Params
+ Load
+
+
+ 18
+ 18
+
+
-
- Default Params
+ Default
@@ -77,8 +128,8 @@
- 338
- 25
+ 30
+ 20
@@ -95,6 +146,22 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 10
+ 20
+
+
+
+
-
@@ -136,14 +203,7 @@
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Quality improvement</span> is done by point smoothing and edge swapping</p></td></tr></table></body></html>
+ Quality improvement is done by point smoothing and edge swapping.
Quality improvement Only (0)
@@ -156,7 +216,7 @@ p, li { white-space: pre-wrap; }
-
- the given surface triangulation is enriched (no coarsening at all) in such away that the distance
+ The given surface triangulation is enriched (no coarsening at all) in such away that the distance
between the elements in the final mesh and those of the initial one is bounded by auser specified tolerance value.
One should use this option, to enrich the mesh where purely
geometrical features may be insuficiently fine, i.e. the resulting mesh will be least as fine as the input.
@@ -174,7 +234,7 @@ The meshes obtained with those settings may not be suitable for computation.
- a uniform subdivision of the given surface triangulation is performed :
+ An uniform subdivision of the given surface triangulation is performed :
each triangle of the given surface triangulation is considered at and
is divided into identical triangles.
@@ -189,7 +249,7 @@ is divided into identical triangles.
-
- a surface sandpapering without shrinkage of the given surface
+ A surface sandpapering without shrinkage of the given surface
triangulation is performed, i.e., the high curvature variations of the
given surface will be smoothed out without shrinking the volume in
doing so. If ridges are defined, they will be kept as they are in the
@@ -276,16 +336,6 @@ good quality elements
70
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html>
-
Units
@@ -338,22 +388,10 @@ p, li { white-space: pre-wrap; }
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set chordal deviation tolerance:</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This parameter enables the user to bound the maximal chordal deviation allowed,</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">that is, the maximal distance allowed between the detected curve and the plane P</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">of the corresponding mesh face.</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In other words, it avoids having faces too far away from the curve </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">they represent (or should represent).</p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html>
+ This parameter enables the user to bound the maximal chordal deviation allowed,
+that is the maximal distance allowed between the detected curve
+and the plane P of the corresponding mesh face.
+In other words, it avoids having faces too far away from the curve they should represent.
Chordal deviation Tolerance
@@ -376,9 +414,9 @@ p, li { white-space: pre-wrap; }
true
- If the Units parameter is relative epsilon max correspond to 0.0001x s x tolerance parameter where s is the size of the bounding box of the domain.
-If the Units parameter is absolute, the tolerance parameter is expressed in model units :
-if P=2 and point coordinaters are givin in millimetre, it menas that the maximal chordal deviation is 2 mm
+ If the Units parameter is relative, epsilon max correspond to 0.0001*s*Tolerance, where s is the size of the bounding box of the domain.
+If the Units parameter is absolute, the tolerance parameter is expressed in model units:
+ if P=2 and point coordinates are given in millimeters, the maximal chordal deviation is 2 mm.
100000.000000000000000
@@ -413,8 +451,8 @@ if P=2 and point coordinaters are givin in millimetre, it menas that the maximal
40
70
- 191
- 33
+ 190
+ 31
@@ -423,7 +461,13 @@ if P=2 and point coordinaters are givin in millimetre, it menas that the maximal
- Mesh File (GMF format)
+ Mesh File GMF format
+
+
+
+ 18
+ 18
+
@@ -444,18 +488,14 @@ if P=2 and point coordinaters are givin in millimetre, it menas that the maximal
- 190
+ 40
30
- 41
+ 190
31
-
-
-
-
- :select1.png:select1.png
+ Mesh Object Browser
@@ -482,34 +522,6 @@ if P=2 and point coordinaters are givin in millimetre, it menas that the maximal
-
-
-
- 40
- 30
- 141
- 31
-
-
-
-
- 10
- false
-
-
-
- QFrame::Box
-
-
- Smesh mesh
-
-
- false
-
-
- 0
-
-
@@ -524,38 +536,36 @@ if P=2 and point coordinaters are givin in millimetre, it menas that the maximal
- GBUnit
- GBTolerance_2
groupBox
GBOptim
- Advanced Remeshing Options
+ Advanced Remeshing Options
-
+
10
10
750
- 70
+ 120
- You can disable :
+ You can set/unset
- 100
+ 30
20
271
- 23
+ 25
- if not set (ridge detection disabled), Yams will not try to detect any new ridge edge by its own mechanism :
+ If not set (ridge detection disabled), Yams will not try to detect any new ridge edge by its own mechanism :
it will consider as ridge only the ridges given in the mesh.
All non-ridge edges that would have been detected as ridge by the Ridge angle paramaeter
(see below) will be considered as part of the same continuous patch.
@@ -572,10 +582,10 @@ when all other possible ridges are not geometric ridges to take into account.
- 100
- 40
+ 30
+ 50
271
- 23
+ 25
@@ -590,127 +600,159 @@ or add vertices (refines) to change the mesh.
true
+
+
+
+
+ 30
+ 80
+ 271
+ 25
+
+
+
+ If set, Yams creates new vertices placed on the curved surface and adds them to elements.
+It means one extra vertex on edge (P2 or quadratic triangles).
+New created vertices are saved in the .mesh file under keyword section 'Vertices'
+
+
+ split edge
+
+
+ false
+
+
+
+
10
- 100
+ 140
750
- 320
+ 280
- You can control :
+ You can control
+##1
- 10
+ 30
30
- 91
- 23
+ 100
+ 25
- 0.890000000000000
+ 0.89
- 0.010000000000000
+ 0.01
- 0.040000000000000
+ 0.04
- 120
- 20
- 631
- 61
+ 140
+ 30
+ 630
+ 30
This field (as well as tolerance) enables the user to control the accuracy of the
piecewise linear approximation of the surface. This parameter enables the user to
-control the maximal angle allowed between two adjacent faces. It can be used to
+control the maximal angle allowed between two adjacent faces. It can be used to
bound the maximal deviation of the mesh faces from the tangent planes at mesh vertices.
In other words, it avoids having sharp angles between faces representing a smooth curve.
This parameter enables the user to specify the maximal chordal deviation "max relatively to the curvature.
Following that criterion:
-- if the chordal deviation epsilon is smaller than epsilon max *r, it is acceptable to remove the considered point;
+- if the chordal deviation epsilon is smaller than epsilon max*r, it is acceptable to remove the considered point;
- if the chordal deviation epsilon is greater than epsiolon max*r, the considered mesh face should be redefined
-by adding a point on the curve.
+ by adding a point on the curve.
One can see that the smaller the radius r, the harder it is to satisfy this criterion:
epsilon max is a real value corresponding to a percentage, the ratio between the chordal deviation to
the local curvature. This field is used only for optimisation style -O values of -1, 0 and 1.
The default value for "max is set to 0:04 which leads to angles of less than 33 degrees between two adjacent
-faces .
+faces.
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Geometrical approximation : Maximum angle allowed between a face and a curve </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">(not separated by a ridge).</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html>
+ Geometrical approximation:
+Maximum angle allowed between a face and a curve (not separated by a ridge).
+
+
+##2
+
+
+
+ 30
+ 70
+ 100
+ 25
+
+
+
+ 90.
+
+
+ 45.
- 120
+ 140
70
- 581
- 71
+ 630
+ 30
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ridge angle:</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">if the angle between the normal vectors of two adjacent faces exceeds</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">this value, the edge common to the faces is a ridge</p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html>
+ If the angle between the normal vectors of two adjacent faces exceeds this value,
+the edge common to the faces is a ridge.
-
+##3
+
- 10
- 90
- 91
- 23
+ 30
+ 110
+ 100
+ 25
+
+ 0.01
+
- 90.000000000000000
+ 100.
+
+
+ 0.1
- 45.000000000000000
+ 100.
- 120
- 140
- 521
- 41
+ 140
+ 110
+ 630
+ 30
- This parameter allows the user to prescribe a maximal size hmax
+ This parameter allows the user to prescribe a maximal size hmax
for the mesh elements i.e., the lengths of the edges with respect to the specified
size map. The corresponding values are either relative or absolute depending on the choosen parameter.
The default values are automatically set based on the surface geometry (curvature dependent) and its
@@ -719,24 +761,80 @@ Please note that, as it is not strictly possible to obey the given or computed s
size may be slightly bigger than the prescribed ones.
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximal size allowed around vertices:</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the lengths of the edges with respect to the specified size map.</p></td></tr></table></body></html>
+ Maximal size allowed around vertices,
+the lengths of the edges with respect to the specified size map.
+
+
+##4
+
+
+
+ 30
+ 150
+ 100
+ 25
+
+
+
+ 0.
+
+
+ 100.
+
+
+ 0.1
+
+
+ 5.
+
+
+
+
+
+ 140
+ 150
+ 630
+ 30
+
+
+
+ This parameter allows the user to prescribe a maximal size hmax
+for the mesh elements i.e., the lengths of the edges with respect to the specified
+ size map. The corresponding values are either relative or absolute depending on the choosen parameter.
+The default values are automatically set based on the surface geometry (curvature dependent) and its
+bounding box size.
+Please note that, as it is not strictly possible to obey the given or computed size map, the actual maximal
+size may be slightly bigger than the prescribed ones.
+
+
+ Minimal size allowed around vertices,
+the lengths of the edges with respect to the specified size map.
+
+
+##5
+
+
+
+ 30
+ 190
+ 100
+ 25
+
+
+
+ 0.01
+
+
+ 1.3
- 120
- 240
- 591
- 61
+ 140
+ 190
+ 630
+ 30
@@ -749,140 +847,8 @@ This procedure is de-activated if yams computes a mesh for finite element with o
The default value is 1.3, which is the usual value set for computational meshes.
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Mesh Gradation ie the element size variation in the triangulation:</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Yams will avoid having two adjacent edges which sizes </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">vary more than the given gradation.</p></td></tr></table></body></html>
-
-
-
-
-
- 10
- 250
- 91
- 23
-
-
-
- 0.010000000000000
-
-
- 1.300000000000000
-
-
-
-
-
- 10
- 150
- 91
- 23
-
-
-
- 0.010000000000000
-
-
- 100.000000000000000
-
-
- 0.100000000000000
-
-
- 100.000000000000000
-
-
-
-
-
- 120
- 190
- 521
- 41
-
-
-
- This parameter allows the user to prescribe a maximal size hmax
-for the mesh elements i.e., the lengths of the edges with respect to the specified
- size map. The corresponding values are either relative or absolute depending on the choosen parameter.
-The default values are automatically set based on the surface geometry (curvature dependent) and its
-bounding box size.
-Please note that, as it is not strictly possible to obey the given or computed size map, the actual maximal
-size may be slightly bigger than the prescribed ones.
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimal size allowed around vertices:</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the lengths of the edges with respect to the specified size map.</p></td></tr></table></body></html>
-
-
-
-
-
- 10
- 200
- 91
- 23
-
-
-
- 0.000000000000000
-
-
- 100.000000000000000
-
-
- 0.100000000000000
-
-
- 5.000000000000000
-
-
-
-
-
-
- 10
- 440
- 750
- 60
-
-
-
- You can enable :
-
-
-
-
- 100
- 20
- 271
- 23
-
-
-
- if set, Yams creates new vertices placed on the curved surface and adds them to elements.
-It means one extra vertex on edge (P2 or quadratic triangles).
-New created vertices are saved in the .mesh file under keyword section Vertices
-
-
- split edge
-
-
- false
+ Mesh Gradation: the element size variation in the triangulation.
+Yams will avoid having two adjacent edges which sizes vary more than the given gradation.
@@ -895,7 +861,7 @@ New created vertices are saved in the .mesh file under keyword section Vertices
10
- 30
+ 10
750
130
@@ -903,93 +869,52 @@ New created vertices are saved in the .mesh file under keyword section Vertices
Yams Generic Options
-
+
+
- 40
+ 20
30
- 441
- 27
+ 100
+ 25
-
- -
-
-
- Verbosity Level
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 28
- 20
-
-
-
-
- -
-
10
- 7
+ 3
-
-
-
-
+
+
- 40
- 70
- 441
- 27
+ 130
+ 30
+ 600
+ 30
-
- -
-
-
-
- 225
- 25
-
-
+
+ sets the verbosity level.
+From 0 (no detail) to 10 (very detailed).
+Default is 3.
+
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
-<tr>
-<td style="border: none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory size (in Mbytes)</p></td></tr></table></body></html>
+ Verbosity level
-
- -
-
-
- Qt::Horizontal
-
-
-
- 28
- 20
-
-
-
-
- -
+
+
+
+ 20
+ 70
+ 100
+ 25
+
+
The program requires roughly about 370 bytes per point. It is thus possible to estimate a priori
the required memory size to complete a job. As an example of memory space needed, a mesh
@@ -1000,7 +925,7 @@ The memory needed for mesh modification is allocated dynamically at the beginnin
memory allowed, it will stop inserting points and, if possible, the current mesh will be saved as it is,
valid and conformal, provided the input mesh was valid and conformal.
Specify the memory if:
-- the automatically allocated memory reveals insufficient when the user asked to enrich the given mesh;
+- the automatically allocated memory reveals insufficient when the user asked to enrich the given mesh.
- you want to limit the amount of memory used by the program.
If the input mesh size requires more memory than requested or if the allocated memory (user defined or not)
exceeds the machine capabilities, the tool will stop because of insufficient memory.
@@ -1012,15 +937,35 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
0
-
-
-
+
+
+
+
+ 130
+ 70
+ 600
+ 30
+
+
+
+
+ 130
+ 700
+ 600
+ 30
+
+
+
+ Memory size (in Mbytes)
+
+
+
10
- 230
+ 150
750
140
@@ -1038,7 +983,7 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
- File used to save Yams Params :
+ File used to save Yams hypothesis parameters :
@@ -1053,10 +998,6 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
-
-
- :open.png:open.png
-