X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2FStdMeshers.xml;h=72cccae412c682b36c24644bbb720f0b5dfc1ac7;hb=b4e2459e139f1cc9257bb4cfb20dda80afdeabf8;hp=4adf93e83eb002565033a74f26dd1a0636b3c7e6;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml
index 4adf93e83..72cccae41 100644
--- 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-2008  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
@@ -40,7 +40,7 @@
                 dim="0"/>
 
     <hypothesis type="LocalLength"
-                label-id="Average length"
+                label-id="Local Length"
                 icon-id="mesh_hypo_length.png"
                 dim="1"/>
 
@@ -54,6 +54,11 @@
                 icon-id="mesh_hypo_length.png"
                 dim="1"/>
 
+    <hypothesis type="FixedPoints1D"
+                label-id="Fixed points 1D"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
+
     <hypothesis type="StartEndLength"
                 label-id="Start and End Length"
                 icon-id="mesh_hypo_length.png"
@@ -91,12 +96,6 @@
                 auxiliary="true"
                 dim="2"/>
 
-    <hypothesis	type="TrianglePreference"
-		label-id="Triangle Preference"
-                icon-id="mesh_algo_mefisto.png"
-		auxiliary="true"
-		dim="2"/>
-		
     <hypothesis type="QuadraticMesh"
                 label-id="Quadratic Mesh"
                 icon-id="mesh_algo_quad.png"
@@ -117,7 +116,6 @@
     <hypothesis type="MaxElementVolume"
                 label-id="Max. Element Volume"
                 icon-id="mesh_hypo_volume.png"
-		need-geom = "false"
                 dim="3"/>
 
     <hypothesis type="ProjectionSource3D"
@@ -135,6 +133,16 @@
                 icon-id="mesh_hypo_length.png"
                 dim="1"/>
 
+    <hypothesis type="ImportSource2D"
+                label-id="Source Faces"
+                icon-id="mesh_hypo_area.png"
+                dim="2"/>
+
+    <hypothesis type="ImportSource1D"
+                label-id="Source Edges"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
+
     <hypothesis type="NumberOfLayers"
                 label-id="Number of Layers"
                 icon-id="mesh_hypo_length.png"
@@ -144,6 +152,33 @@
                 label-id="Distribution of Layers"
                 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"
+                dim="2"/>
+
+    <hypothesis type="LayerDistribution2D"
+                label-id="Distribution of Layers"
+                icon-id="mesh_hypo_length.png"
+                dim="2"/>
+
+    <hypothesis type="QuadrangleParams"
+                label-id="Quadrangle Parameters"
+                icon-id="mesh_hypo_length.png"
+                dim="2"/>
+
+    <hypothesis type="CartesianParameters3D"
+                label-id="Body Fitting Parameters"
+                icon-id="mesh_hypo_length.png"
+                dim="3"/>
+
   </hypotheses>
 
   <algorithms>
@@ -158,7 +193,7 @@
     <algorithm type="Regular_1D"
 	       label-id="Wire discretisation"
 	       icon-id="mesh_algo_regular.png"
-               hypos="LocalLength,MaxLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength"
+               hypos="LocalLength,MaxLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength,FixedPoints1D"
                opt-hypos="Propagation,QuadraticMesh"
                input="VERTEX"
                output="EDGE"
@@ -167,7 +202,7 @@
     <algorithm type="CompositeSegment_1D"
 	       label-id="Composite side discretisation"
 	       icon-id="mesh_algo_regular.png"
-               hypos="LocalLength,MaxLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength"
+               hypos="LocalLength,MaxLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength,FixedPoints1D"
                opt-hypos="Propagation,QuadraticMesh"
                input="VERTEX"
                output="EDGE"
@@ -184,7 +219,7 @@
     <algorithm type="Quadrangle_2D"
                label-id="Quadrangle (Mapping)"
                icon-id="mesh_algo_quad.png"
-               opt-hypos="QuadranglePreference,TrianglePreference"
+               hypos="QuadrangleParams"
                input="EDGE"
                output="QUAD"
                dim="2"/>
@@ -193,6 +228,8 @@
                label-id="Hexahedron (i,j,k)"
                icon-id="mesh_algo_hexa.png"
                input="QUAD"
+	       need-geom="false"
+               opt-hypos="ViscousLayers"
                dim="3"/>
 
     <algorithm type="Projection_1D"
@@ -210,6 +247,14 @@
                output="QUAD,TRIA"
                dim="2"/>
 
+    <algorithm type="Projection_1D2D"
+               label-id="Projection 1D-2D"
+               icon-id="mesh_algo_quad.png"
+               input=""
+               hypos="ProjectionSource2D"
+               output="QUAD,TRIA"
+               dim="2"/>
+
     <algorithm type="Projection_3D"
                label-id="Projection 3D"
                icon-id="mesh_algo_hexa.png"
@@ -217,6 +262,21 @@
                input="QUAD,TRIA"
                dim="3"/>
 
+    <algorithm type="Import_1D"
+               label-id="Use existing 1D elements"
+               icon-id="mesh_algo_regular.png"
+               hypos="ImportSource1D"
+               output="EDGE"
+               dim="1"/>
+
+    <algorithm type="Import_1D2D"
+               label-id="Use existing 2D elements"
+               icon-id="mesh_algo_quad.png"
+               hypos="ImportSource2D"
+               output="QUAD,TRIA"
+               support-submeshes="false"
+               dim="2"/>
+
     <algorithm type="Prism_3D"
                label-id="3D extrusion"
                icon-id="mesh_algo_hexa.png"
@@ -244,6 +304,21 @@
                output="QUAD,TRIA"
                dim="2"/>
 
+    <algorithm type="RadialQuadrangle_1D2D"
+               label-id="Radial quadrangle 1D2D"
+               icon-id="mesh_algo_quad.png"
+               hypos="NumberOfLayers2D, LayerDistribution2D"
+               input="EDGE"
+               output="QUAD,TRIA"
+               dim="2"/>
+
+    <algorithm type="Cartesian_3D"
+               label-id="Body Fitting"
+               icon-id="mesh_algo_hexa.png"
+               hypos="CartesianParameters3D"
+               support-submeshes="false"
+               dim="3"/>
+
   </algorithms>
 </meshers-group>
 
@@ -277,6 +352,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>