X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2FGHS3DPlugin.xml;h=1989d2087be54e9f0298dec71fa602436cf13e5c;hb=f264dfaecc1f66c2f4a300fe007b818a92a475f8;hp=b0cebaa38d8b582ff5bbc63e88c297e4ecdd3132;hpb=49fb797789d9300b06ac40ba8bd7f91b0e5c61e4;p=plugins%2Fghs3dplugin.git

diff --git a/resources/GHS3DPlugin.xml b/resources/GHS3DPlugin.xml
index b0cebaa..1989d20 100644
--- a/resources/GHS3DPlugin.xml
+++ b/resources/GHS3DPlugin.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2004-2012  CEA/DEN, EDF R&D
+  Copyright (C) 2004-2016  CEA/DEN, EDF R&D
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
-  version 2.1 of the License.
+  version 2.1 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,15 +25,16 @@
 
 <meshers>
 
-<meshers-group name="GHS3D"
-               resources="GHS3DPlugin"
+<meshers-group name      ="GHS3D"
+               resources ="GHS3DPlugin"
+               idl-module="GHS3DPlugin"
                server-lib="GHS3DEngine"
-               gui-lib="GHS3DPluginGUI">
+               gui-lib   ="GHS3DPluginGUI">
   <hypotheses>
-    <hypothesis type="GHS3D_Parameters"
-		label-id="GHS3D Parameters"
-		icon-id="mesh_hypo_ghs3d.png"
-		dim="3">
+    <hypothesis type    ="MG-Tetra Parameters"
+		label-id="MG-Tetra Parameters"
+		icon-id ="mesh_hypo_ghs3d.png"
+		dim     ="3">
       <python-wrap>
         <accumulative-methods>
           SetEnforcedVertex,
@@ -50,20 +51,45 @@
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
+
+    <hypothesis type    ="MG-Tetra Optimization Parameters"
+                label-id="MG-Tetra Optimization Parameters"
+                icon-id ="mesh_hypo_ghs3d.png"
+                dim     ="3">
+    </hypothesis>
+
   </hypotheses>
 
   <algorithms>
-    <algorithm type="GHS3D_3D"
-               label-id="Tetrahedron (GHS3D)"
-               icon-id="mesh_tree_hypo_ghs3d.png"
-               input="TRIA,QUAD"
+    <algorithm type     ="MG-Tetra"
+               label-id ="MG-Tetra"
+               icon-id  ="mesh_tree_hypo_ghs3d.png"
+               group-id ="1"
+               priority ="30"
+               input    ="TRIA,QUAD"
+               output   ="TETRA,PYRAMID"
 	       need-geom="false"
-               opt-hypos="GHS3D_Parameters, ViscousLayers"
-               dim="3">
+               opt-hypos="MG-Tetra Parameters,ViscousLayers"
+               dim      ="3">
+      <python-wrap>
+        <algo>MG-Tetra=Tetrahedron(algo=smeshBuilder.MG_Tetra)</algo>
+        <hypo>MG-Tetra Parameters=Parameters()</hypo>
+        <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetFaces(1),SetFaces(2),SetMethod())</hypo>
+      </python-wrap>
+    </algorithm>
+
+    <algorithm type     ="MG-Tetra Optimization"
+               label-id ="MG-Tetra Optimization"
+               icon-id  ="mesh_tree_hypo_ghs3d.png"
+               group-id ="2"
+               input    ="TETRA"
+               output   ="TETRA"
+               need-geom="never"
+               opt-hypos="MG-Tetra Optimization Parameters"
+               dim      ="3">
       <python-wrap>
-        <algo>GHS3D_3D=Tetrahedron(algo=smesh.GHS3D)</algo>
-        <hypo>GHS3D_Parameters=Parameters()</hypo>
-        <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces())</hypo>
+        <algo>MG-Tetra Optimization=Tetrahedron(algo=smeshBuilder.MG_Tetra_Optimization)</algo>
+        <hypo>MG-Tetra Optimization Parameters=Parameters()</hypo>
       </python-wrap>
     </algorithm>