From: Renaud Nédélec <renaud.nedelec@opencascade.com>
Date: Wed, 23 Jul 2014 13:06:02 +0000 (+0200)
Subject: EDF 8523: Enable generation of 2D joint elements from GUI
X-Git-Tag: V7_5_0a1~41
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=80a2161a03ebf91c268fedf095e13cb822191566;p=modules%2Fsmesh.git

EDF 8523: Enable generation of 2D joint elements from GUI
---

diff --git a/doc/salome/gui/SMESH/images/duplicate04.png b/doc/salome/gui/SMESH/images/duplicate04.png
index 70cb4adfb..eab51a1fb 100644
Binary files a/doc/salome/gui/SMESH/images/duplicate04.png and b/doc/salome/gui/SMESH/images/duplicate04.png differ
diff --git a/doc/salome/gui/SMESH/input/double_nodes_page.doc b/doc/salome/gui/SMESH/input/double_nodes_page.doc
index ce643d326..dcdc6f491 100644
--- a/doc/salome/gui/SMESH/input/double_nodes_page.doc
+++ b/doc/salome/gui/SMESH/input/double_nodes_page.doc
@@ -130,25 +130,27 @@ This mode duplicates nodes located on boundaries between given groups of volumes
 
 Parameters to be defined in this mode:
 <ul>
-  <li><b>Groups of volumes</b> (<em>mandatory</em>): list of volume
+  <li><b>Groups (faces or volumes) </b> (<em>mandatory</em>): list of mesh
     groups. These groups should be disjoint, i.e. should not have shared
-    volumes.</li>
+    elements.</li>
   <li> If <b>Create joint elements</b> option is activated, flat
     elements are created on the duplicated nodes: a triangular facet
     shared by two volumes of two groups generates a flat prism, a
-    quadrangular facet generates a flat hexahedron.
+    quadrangular facet generates a flat hexahedron. 
+    Correspondingly 2D joint elements (null area faces) are generated
+    where edges are shared by two faces.
     <br>
-    The created flat volumes are stored in groups. These groups are named
+    The created flat volumes (or faces) are stored in groups. These groups are named
     according to the position of the group in the list of groups: group
     "j_n_p" is a group of flat elements that are built between the group \#n
     and the group \#p in the group list. All the flat elements are gathered
-    into the group named "joints3D". The flat element of the multiple
+    into the group named "joints3D" (correspondingly "joints2D"). The flat element of the multiple
     junctions between the simple junction are stored in a group named
     "jointsMultiples".</li>
-  <li> If <b>On all boundaries</b> option is activated, the volumes,
-    which are not included into <b>Groups of volumes</b>, are considered
+  <li> If <b>On all boundaries</b> option is activated, the volumes (or faces),
+    which are not included into <b>Groups</b> input, are considered
     as another group and thus the nodes on the boundary
-    between <b>Groups of volumes</b> and the remaining mesh are also
+    between <b>Groups</b> and the remaining mesh are also
     duplicated.</li>
 </ul>
 
diff --git a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
index 368aa77ca..ad4997644 100644
--- a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
@@ -602,7 +602,8 @@ void SMESHGUI_DuplicateNodesDlg::onSelectionChanged()
         ok = ( aGroupType != SMESH::NODE );
         break;
       case 3:
-        ok = ( aGroupType == SMESH::VOLUME );
+        ok = ( aGroupType == SMESH::VOLUME || 
+	       aGroupType == SMESH::FACE );
         break;
       }
     }
diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 9b9183530..7e1bb3da3 100644
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -6775,7 +6775,7 @@ It is impossible to read point coordinates from file</translation>
     </message>
     <message>
         <source>GROUP_VOLUME_GROUPS</source>
-        <translation>Groups of volumes</translation>
+        <translation>Groups (faces or volumes)</translation>
     </message>
     <message>
         <source>CONSTRUCT_NEW_GROUP_NODES</source>
diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index d4b783654..f20d819eb 100755
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -6745,6 +6745,10 @@ Il y a trop peu de points dans le fichier </translation>
         <source>GROUP_ELEMS_TO_REPLACE</source>
         <translation>Groupe des éléments dont les nœuds sont à remplacer</translation>
     </message>
+    <message>
+        <source>GROUP_VOLUME_GROUPS</source>
+        <translation>Groupes (faces ou volumes)</translation>
+    </message>
     <message>
         <source>CONSTRUCT_NEW_GROUP_NODES</source>
         <translation>Construire un groupe avec les nœuds nouvellement créés</translation>