Merge from V6_3_BR 06/06/2011

[modules/smesh.git] / resources / StdMeshers.xml

diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml
index 41c83c997d219654952a24f665582a8fa104c929..03987bfdf7317e36b5d5510546b65e5768ea9de6 100644 (file)
--- a/resources/StdMeshers.xml
+++ b/resources/StdMeshers.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -159,6 +159,12 @@
                 icon-id="mesh_hypo_length.png"
                 dim="3"/>
 
+    <hypothesis type="ViscousLayers"
+                label-id="Viscous Layers"
+                icon-id="mesh_algo_quad.png"
+                auxiliary="true"
+                dim="3"/>
+
     <hypothesis type="NumberOfLayers2D"
                 label-id="Number of Layers"
                 icon-id="mesh_hypo_length.png"
@@ -225,6 +231,7 @@
                icon-id="mesh_algo_hexa.png"
                input="QUAD"
               need-geom="false"
+               opt-hypos="ViscousLayers"
                dim="3"/>
 
     <algorithm type="Projection_1D"
@@ -332,6 +339,14 @@
                     hypos="NumberOfSegments"
                     algos="Regular_1D, Quadrangle_2D, Hexa_3D"/>
 
+    <hypotheses-set name="Automatic Triangulation"
+                    hypos="MaxLength"
+                    algos="Regular_1D, MEFISTO_2D"/>
+
+    <hypotheses-set name="Automatic Quadrangulation"
+                    hypos="NumberOfSegments"
+                    algos="Regular_1D, Quadrangle_2D"/>
+
 </hypotheses-set-group>
 
 </meshers>