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 70cb4adfba7946199525fd6dc653770f74bdaefa..eab51a1fb8c3e03a8e82a9428e9433552a93bb52 100644 (file)
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 ce643d32680cab3d465471b0b66aa2dc9f717913..dcdc6f491833d20c7816db4c08607ab095d53770 100644 (file)
--- 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>
 
 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
     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
   <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>
     <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
     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>
     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
     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>
 
     duplicated.</li>
 </ul>
 

diff --git a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
index 368aa77ca6624905b542afd43c2ca2571e31d680..ad4997644dd4f5be795d78a3dc9b578ee8e67dfd 100644 (file)
--- 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::NODE );
         break;
       case 3:

-        ok = ( aGroupType == SMESH::VOLUME );
+        ok = ( aGroupType == SMESH::VOLUME || 
+              aGroupType == SMESH::FACE );

         break;
       }
     }
         break;
       }
     }

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 9b9183530da1a056070cc4ad44172bab53de8b36..7e1bb3da3cff806878e8a03007fa40838881e2c2 100644 (file)
--- 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>
     </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>
     </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 d4b783654c5b71732b475015a3f470b0cb128e63..f20d819eb85d5e11397a1739dd2aab121e88526d 100755 (executable)
--- 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>
         <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>
     <message>
         <source>CONSTRUCT_NEW_GROUP_NODES</source>
         <translation>Construire un groupe avec les nœuds nouvellement créés</translation>