Update copyright

[modules/smesh.git] / src / SMDS / SMDS_Downward.cxx

diff --git a/src/SMDS/SMDS_Downward.cxx b/src/SMDS/SMDS_Downward.cxx
index f735c820aba60c33f90d211572fe426eac10d06a..87e773898d1ac78ace3240cde2572e6559d2e34a 100644 (file)
--- a/src/SMDS/SMDS_Downward.cxx
+++ b/src/SMDS/SMDS_Downward.cxx
@@ -1,9 +1,25 @@
-/*
- * SMDS_Downward.cxx
- *
- *  Created on: Jun 3, 2010
- *      Author: prascle
- */
+// Copyright (C) 2010-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// File: SMDS_Downward.cxx
+// Created: Jun 3, 2010
+// Author: prascle
 
 #include "SMDS_Downward.hxx"
 #include "SMDS_Mesh.hxx"
@@ -27,6 +43,24 @@ vector<int> SMDS_Downward::_cellDimension;
  */
 int SMDS_Downward::getCellDimension(unsigned char cellType)
 {
+  if (_cellDimension.empty())
+    {
+      _cellDimension.resize(VTK_MAXTYPE + 1, 0);
+      _cellDimension[VTK_LINE] = 1;
+      _cellDimension[VTK_QUADRATIC_EDGE] = 1;
+      _cellDimension[VTK_TRIANGLE] = 2;
+      _cellDimension[VTK_QUADRATIC_TRIANGLE] = 2;
+      _cellDimension[VTK_QUAD] = 2;
+      _cellDimension[VTK_QUADRATIC_QUAD] = 2;
+      _cellDimension[VTK_TETRA] = 3;
+      _cellDimension[VTK_QUADRATIC_TETRA] = 3;
+      _cellDimension[VTK_HEXAHEDRON] = 3;
+      _cellDimension[VTK_QUADRATIC_HEXAHEDRON] = 3;
+      _cellDimension[VTK_WEDGE] = 3;
+      _cellDimension[VTK_QUADRATIC_WEDGE] = 3;
+      _cellDimension[VTK_PYRAMID] = 3;
+      _cellDimension[VTK_QUADRATIC_PYRAMID] = 3;
+    }
   return _cellDimension[cellType];
 }
 
@@ -416,11 +450,11 @@ int SMDS_Down1D::computeFaces(int* pts, int* vtkIds, int nbcells, int* downFaces
           downTypes[cnt] = vtkType;
           cnt++;
         }
-      else
+      else if (SMDS_Downward::getCellDimension(vtkType) == 3)
         {
           int volId = _grid->CellIdToDownId(vtkId);
           SMDS_Downward * downvol = _grid->getDownArray(vtkType);
-          const int *downIds = downvol->getDownCells(volId);
+          //const int *downIds = downvol->getDownCells(volId);
           const unsigned char* downTypesVol = downvol->getDownTypes(volId);
           int nbFaces = downvol->getNumberOfDownCells(volId);
           const int* faceIds = downvol->getDownCells(volId);
@@ -782,7 +816,6 @@ void SMDS_Down3D::getNodeIds(int cellId, std::set<int>& nodeSet)
 int SMDS_Down3D::FindFaceByNodes(int cellId, ElemByNodesType& faceByNodes)
 {
   int *faces = &_cellIds[_nbDownCells * cellId];
-  int faceNodeSet[10];
   int npoints = 0;
 
   for (int i = 0; i < _nbDownCells; i++)
@@ -790,11 +823,7 @@ int SMDS_Down3D::FindFaceByNodes(int cellId, ElemByNodesType& faceByNodes)
       if ((faces[i] >= 0) && (faceByNodes.vtkType == _cellTypes[i]))
         {
           if (npoints == 0)
-            {
-              for (int j = 0; j < faceByNodes.nbNodes; j++)
-                faceNodeSet[j] = faceByNodes.nodeIds[j];
-              npoints = faceByNodes.nbNodes;
-            }
+            npoints = faceByNodes.nbNodes;
 
           int nodeSet[10];
           int npts = this->_grid->getDownArray(faceByNodes.vtkType)->getNodeSet(faces[i], nodeSet);
@@ -947,15 +976,15 @@ void SMDS_DownQuadTriangle::addDownCell(int cellId, int lowCellId, unsigned char
 {
   //ASSERT((cellId >=0)&& (cellId < _maxId));
   //ASSERT(aType == VTK_QUADRATIC_EDGE);
-  int *faces = &_cellIds[_nbDownCells * cellId];
+  int *edges = &_cellIds[_nbDownCells * cellId];
   for (int i = 0; i < _nbDownCells; i++)
     {
-      if (faces[i] < 0)
+      if (edges[i] < 0)
         {
-          faces[i] = lowCellId;
+          edges[i] = lowCellId;
           return;
         }
-      if (faces[i] == lowCellId)
+      if (edges[i] == lowCellId)
         return;
     }
   ASSERT(0);
@@ -1100,7 +1129,7 @@ SMDS_DownTetra::~SMDS_DownTetra()
 {
 }
 
-void SMDS_DownTetra::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownTetra::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
   set<int> setNodes;
   setNodes.clear();
@@ -1113,7 +1142,8 @@ void SMDS_DownTetra::getOrderedNodesOfFace(int cellId, std::vector<int>& ordered
   _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
 
   set<int> tofind;
-  int ids[12] = { 0, 1, 2, 0, 1, 3, 0, 2, 3, 1, 2, 3 };
+  int ids[12] = { 0, 1, 2,  0, 3, 1,  2, 3, 0,   1, 3, 2 };
+//int ids[12] = { 2, 1, 0,  1, 3, 0,  0, 3, 2,   2, 3, 1 };
   for (int k = 0; k < 4; k++)
     {
       tofind.clear();
@@ -1207,9 +1237,36 @@ SMDS_DownQuadTetra::~SMDS_DownQuadTetra()
 {
 }
 
-void SMDS_DownQuadTetra::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownQuadTetra::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
-  // TODO
+  set<int> setNodes;
+  setNodes.clear();
+  for (int i = 0; i < orderedNodes.size(); i++)
+    setNodes.insert(orderedNodes[i]);
+  //MESSAGE("cellId = " << cellId);
+
+  vtkIdType npts = 0;
+  vtkIdType *nodes; // will refer to the point id's of the volume
+  _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+  set<int> tofind;
+  int ids[24] = { 0, 1, 2, 4, 5, 6,  0, 3, 1, 7, 8, 4,  2, 3, 0, 9, 7, 6,  1, 3, 2, 8, 9, 5 };
+//int ids[24] = { 2, 1, 0, 5, 4, 6,  1, 3, 0, 8, 7, 4,  0, 3, 2, 7, 9, 6,  2, 3, 1, 9, 8, 5 };
+  for (int k = 0; k < 4; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 6; i++)
+        tofind.insert(nodes[ids[6 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 6; i++)
+            orderedNodes[i] = nodes[ids[6 * k + i]];
+          return;
+        }
+    }
+  MESSAGE("=== Problem volume " << _vtkCellIds[cellId] << " " << _grid->_mesh->fromVtkToSmds(_vtkCellIds[cellId]));
+  MESSAGE(orderedNodes[0] << " " << orderedNodes[1] << " " << orderedNodes[2]);
+  MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
 }
 
 void SMDS_DownQuadTetra::addDownCell(int cellId, int lowCellId, unsigned char aType)
@@ -1263,8 +1320,8 @@ void SMDS_DownQuadTetra::computeFacesWithNodes(int cellId, ListElemByNodesType&
   facesWithNodes.elems[1].nodeIds[1] = nodes[1];
   facesWithNodes.elems[1].nodeIds[2] = nodes[3];
   facesWithNodes.elems[1].nodeIds[3] = nodes[4];
-  facesWithNodes.elems[1].nodeIds[4] = nodes[7];
-  facesWithNodes.elems[1].nodeIds[5] = nodes[8];
+  facesWithNodes.elems[1].nodeIds[4] = nodes[8];
+  facesWithNodes.elems[1].nodeIds[5] = nodes[7];
   facesWithNodes.elems[1].nbNodes = 6;
   facesWithNodes.elems[1].vtkType = VTK_QUADRATIC_TRIANGLE;
 
@@ -1272,8 +1329,8 @@ void SMDS_DownQuadTetra::computeFacesWithNodes(int cellId, ListElemByNodesType&
   facesWithNodes.elems[2].nodeIds[1] = nodes[2];
   facesWithNodes.elems[2].nodeIds[2] = nodes[3];
   facesWithNodes.elems[2].nodeIds[3] = nodes[6];
-  facesWithNodes.elems[2].nodeIds[4] = nodes[7];
-  facesWithNodes.elems[2].nodeIds[5] = nodes[9];
+  facesWithNodes.elems[2].nodeIds[4] = nodes[9];
+  facesWithNodes.elems[2].nodeIds[5] = nodes[7];
   facesWithNodes.elems[2].nbNodes = 6;
   facesWithNodes.elems[2].vtkType = VTK_QUADRATIC_TRIANGLE;
 
@@ -1281,8 +1338,8 @@ void SMDS_DownQuadTetra::computeFacesWithNodes(int cellId, ListElemByNodesType&
   facesWithNodes.elems[3].nodeIds[1] = nodes[2];
   facesWithNodes.elems[3].nodeIds[2] = nodes[3];
   facesWithNodes.elems[3].nodeIds[3] = nodes[5];
-  facesWithNodes.elems[3].nodeIds[4] = nodes[8];
-  facesWithNodes.elems[3].nodeIds[5] = nodes[9];
+  facesWithNodes.elems[3].nodeIds[4] = nodes[9];
+  facesWithNodes.elems[3].nodeIds[5] = nodes[8];
   facesWithNodes.elems[3].nbNodes = 6;
   facesWithNodes.elems[3].vtkType = VTK_QUADRATIC_TRIANGLE;
 }
@@ -1303,9 +1360,45 @@ SMDS_DownPyramid::~SMDS_DownPyramid()
 {
 }
 
-void SMDS_DownPyramid::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownPyramid::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
-  // TODO
+  set<int> setNodes;
+  setNodes.clear();
+  for (int i = 0; i < orderedNodes.size(); i++)
+    setNodes.insert(orderedNodes[i]);
+  //MESSAGE("cellId = " << cellId);
+
+  vtkIdType npts = 0;
+  vtkIdType *nodes; // will refer to the point id's of the volume
+  _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+  set<int> tofind;
+  int ids[16] = { 0, 1, 2, 3,   0, 3, 4,   3, 2, 4,   2, 1, 4,   1, 0, 4 };
+
+  tofind.clear();
+  for (int i = 0; i < 4; i++)
+    tofind.insert(nodes[ids[i]]);
+  if (setNodes == tofind)
+    {
+      for (int i = 0; i < 4; i++)
+        orderedNodes[i] = nodes[ids[i]];
+      return;
+    }
+  for (int k = 0; k < 4; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 3; i++)
+        tofind.insert(nodes[ids[4 + 3 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 3; i++)
+            orderedNodes[i] = nodes[ids[4 + 3 * k + i]];
+          return;
+        }
+    }
+  MESSAGE("=== Problem volume " << _vtkCellIds[cellId] << " " << _grid->_mesh->fromVtkToSmds(_vtkCellIds[cellId]));
+  MESSAGE(orderedNodes[0] << " " << orderedNodes[1] << " " << orderedNodes[2]);
+  MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
 }
 
 void SMDS_DownPyramid::addDownCell(int cellId, int lowCellId, unsigned char aType)
@@ -1407,9 +1500,46 @@ SMDS_DownQuadPyramid::~SMDS_DownQuadPyramid()
 {
 }
 
-void SMDS_DownQuadPyramid::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownQuadPyramid::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
-  // TODO
+  set<int> setNodes;
+  setNodes.clear();
+  for (int i = 0; i < orderedNodes.size(); i++)
+    setNodes.insert(orderedNodes[i]);
+  //MESSAGE("cellId = " << cellId);
+
+  vtkIdType npts = 0;
+  vtkIdType *nodes; // will refer to the point id's of the volume
+  _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+  set<int> tofind;
+  int ids[32] = { 0, 1, 2, 3, 5, 6, 7, 8,
+                  0, 3, 4, 8, 12, 9,   3, 2, 4, 7 , 11, 12,   2, 1, 4, 6, 10, 11,   1, 0, 4, 5, 9, 10 };
+
+  tofind.clear();
+  for (int i = 0; i < 4; i++)
+    tofind.insert(nodes[ids[i]]);
+  if (setNodes == tofind)
+    {
+      for (int i = 0; i < 8; i++)
+        orderedNodes[i] = nodes[ids[i]];
+      return;
+    }
+  for (int k = 0; k < 4; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 6; i++)
+        tofind.insert(nodes[ids[8 + 6 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 6; i++)
+            orderedNodes[i] = nodes[ids[8 + 6 * k + i]];
+          return;
+        }
+    }
+  MESSAGE("=== Problem volume " << _vtkCellIds[cellId] << " " << _grid->_mesh->fromVtkToSmds(_vtkCellIds[cellId]));
+  MESSAGE(orderedNodes[0] << " " << orderedNodes[1] << " " << orderedNodes[2]);
+  MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
 }
 
 void SMDS_DownQuadPyramid::addDownCell(int cellId, int lowCellId, unsigned char aType)
@@ -1479,8 +1609,8 @@ void SMDS_DownQuadPyramid::computeFacesWithNodes(int cellId, ListElemByNodesType
   facesWithNodes.elems[1].nodeIds[1] = nodes[1];
   facesWithNodes.elems[1].nodeIds[2] = nodes[4];
   facesWithNodes.elems[1].nodeIds[3] = nodes[5];
-  facesWithNodes.elems[1].nodeIds[4] = nodes[9];
-  facesWithNodes.elems[1].nodeIds[5] = nodes[10];
+  facesWithNodes.elems[1].nodeIds[4] = nodes[10];
+  facesWithNodes.elems[1].nodeIds[5] = nodes[9];
   facesWithNodes.elems[1].nbNodes = 6;
   facesWithNodes.elems[1].vtkType = VTK_QUADRATIC_TRIANGLE;
 
@@ -1488,8 +1618,8 @@ void SMDS_DownQuadPyramid::computeFacesWithNodes(int cellId, ListElemByNodesType
   facesWithNodes.elems[2].nodeIds[1] = nodes[2];
   facesWithNodes.elems[2].nodeIds[2] = nodes[4];
   facesWithNodes.elems[2].nodeIds[3] = nodes[6];
-  facesWithNodes.elems[2].nodeIds[4] = nodes[10];
-  facesWithNodes.elems[2].nodeIds[5] = nodes[11];
+  facesWithNodes.elems[2].nodeIds[4] = nodes[11];
+  facesWithNodes.elems[2].nodeIds[5] = nodes[10];
   facesWithNodes.elems[2].nbNodes = 6;
   facesWithNodes.elems[2].vtkType = VTK_QUADRATIC_TRIANGLE;
 
@@ -1497,8 +1627,8 @@ void SMDS_DownQuadPyramid::computeFacesWithNodes(int cellId, ListElemByNodesType
   facesWithNodes.elems[3].nodeIds[1] = nodes[3];
   facesWithNodes.elems[3].nodeIds[2] = nodes[4];
   facesWithNodes.elems[3].nodeIds[3] = nodes[7];
-  facesWithNodes.elems[3].nodeIds[4] = nodes[11];
-  facesWithNodes.elems[3].nodeIds[5] = nodes[12];
+  facesWithNodes.elems[3].nodeIds[4] = nodes[12];
+  facesWithNodes.elems[3].nodeIds[5] = nodes[11];
   facesWithNodes.elems[3].nbNodes = 6;
   facesWithNodes.elems[3].vtkType = VTK_QUADRATIC_TRIANGLE;
 
@@ -1528,9 +1658,49 @@ SMDS_DownPenta::~SMDS_DownPenta()
 {
 }
 
-void SMDS_DownPenta::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownPenta::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
-  // TODO
+  set<int> setNodes;
+  setNodes.clear();
+  for (int i = 0; i < orderedNodes.size(); i++)
+    setNodes.insert(orderedNodes[i]);
+  //MESSAGE("cellId = " << cellId);
+
+  vtkIdType npts = 0;
+  vtkIdType *nodes; // will refer to the point id's of the volume
+  _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+  set<int> tofind;
+//int ids[18] = { 0, 2, 1,  3, 4, 5,   0, 1, 4, 3,   1, 2, 5, 4,   2, 0, 3, 5 };
+  int ids[18] = { 0, 1, 2,  3, 5, 4,   0, 3, 4, 1,   1, 4, 5, 2,   2, 5, 3, 0 };
+
+  for (int k = 0; k < 2; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 3; i++)
+        tofind.insert(nodes[ids[3 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 3; i++)
+            orderedNodes[i] = nodes[ids[3 * k + i]];
+          return;
+        }
+    }
+  for (int k = 0; k < 3; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 4; i++)
+        tofind.insert(nodes[ids[6 + 4 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 4; i++)
+            orderedNodes[i] = nodes[ids[6 + 4 * k + i]];
+          return;
+        }
+    }
+  MESSAGE("=== Problem volume " << _vtkCellIds[cellId] << " " << _grid->_mesh->fromVtkToSmds(_vtkCellIds[cellId]));
+  MESSAGE(orderedNodes[0] << " " << orderedNodes[1] << " " << orderedNodes[2]);
+  MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
 }
 
 void SMDS_DownPenta::addDownCell(int cellId, int lowCellId, unsigned char aType)
@@ -1538,7 +1708,7 @@ void SMDS_DownPenta::addDownCell(int cellId, int lowCellId, unsigned char aType)
   //ASSERT((cellId >=0) && (cellId < _maxId));
   int *faces = &_cellIds[_nbDownCells * cellId];
   if (aType == VTK_QUAD)
-    for (int i = 0; i < 2; i++)
+    for (int i = 0; i < 3; i++)
       {
         if (faces[i] < 0)
           {
@@ -1551,7 +1721,7 @@ void SMDS_DownPenta::addDownCell(int cellId, int lowCellId, unsigned char aType)
   else
     {
       //ASSERT(aType == VTK_TRIANGLE);
-      for (int i = 2; i < _nbDownCells; i++)
+      for (int i = 3; i < _nbDownCells; i++)
         {
           if (faces[i] < 0)
             {
@@ -1636,9 +1806,50 @@ SMDS_DownQuadPenta::~SMDS_DownQuadPenta()
 {
 }
 
-void SMDS_DownQuadPenta::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownQuadPenta::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
-  // TODO
+  set<int> setNodes;
+  setNodes.clear();
+  for (int i = 0; i < orderedNodes.size(); i++)
+    setNodes.insert(orderedNodes[i]);
+  //MESSAGE("cellId = " << cellId);
+
+  vtkIdType npts = 0;
+  vtkIdType *nodes; // will refer to the point id's of the volume
+  _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+  set<int> tofind;
+//int ids[18] = { 0, 2, 1,  3, 4, 5,   0, 1, 4, 3,   1, 2, 5, 4,   2, 0, 3, 5 };
+  int ids[36] = { 0, 1, 2, 6, 7, 8,  3, 5, 4, 11, 10, 9,
+                  0, 3, 4, 1, 12, 9, 13, 6,   1, 4, 5, 2, 13, 10, 14, 7,   2, 5, 3, 0, 14, 11, 12, 8 };
+
+  for (int k = 0; k < 2; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 6; i++)
+        tofind.insert(nodes[ids[6 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 6; i++)
+            orderedNodes[i] = nodes[ids[6 * k + i]];
+          return;
+        }
+    }
+  for (int k = 0; k < 3; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 8; i++)
+        tofind.insert(nodes[ids[12 + 8 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 8; i++)
+            orderedNodes[i] = nodes[ids[12 + 8 * k + i]];
+          return;
+        }
+    }
+  MESSAGE("=== Problem volume " << _vtkCellIds[cellId] << " " << _grid->_mesh->fromVtkToSmds(_vtkCellIds[cellId]));
+  MESSAGE(orderedNodes[0] << " " << orderedNodes[1] << " " << orderedNodes[2]);
+  MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
 }
 
 void SMDS_DownQuadPenta::addDownCell(int cellId, int lowCellId, unsigned char aType)
@@ -1646,7 +1857,7 @@ void SMDS_DownQuadPenta::addDownCell(int cellId, int lowCellId, unsigned char aT
   //ASSERT((cellId >=0) && (cellId < _maxId));
   int *faces = &_cellIds[_nbDownCells * cellId];
   if (aType == VTK_QUADRATIC_QUAD)
-    for (int i = 0; i < 2; i++)
+    for (int i = 0; i < 3; i++)
       {
         if (faces[i] < 0)
           {
@@ -1659,7 +1870,7 @@ void SMDS_DownQuadPenta::addDownCell(int cellId, int lowCellId, unsigned char aT
   else
     {
       //ASSERT(aType == VTK_QUADRATIC_TRIANGLE);
-      for (int i = 2; i < _nbDownCells; i++)
+      for (int i = 3; i < _nbDownCells; i++)
         {
           if (faces[i] < 0)
             {
@@ -1764,9 +1975,37 @@ SMDS_DownHexa::~SMDS_DownHexa()
 {
 }
 
-void SMDS_DownHexa::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownHexa::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
-  // TODO
+  set<int> setNodes;
+  setNodes.clear();
+  for (int i = 0; i < orderedNodes.size(); i++)
+    setNodes.insert(orderedNodes[i]);
+  //MESSAGE("cellId = " << cellId);
+
+  vtkIdType npts = 0;
+  vtkIdType *nodes; // will refer to the point id's of the volume
+  _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+  set<int> tofind;
+//int ids[24] = { 0, 1, 2, 3,  7, 6, 5, 4,  4, 0, 3, 7,  5, 1, 0, 4,  6, 2, 1, 5,  7, 3, 2, 6};
+  int ids[24] = { 3, 2, 1, 0,  4, 5, 6, 7,  7, 3, 0, 4,  4, 0, 1, 5,  5, 1, 2, 6,  6, 2, 3, 7};
+  for (int k = 0; k < 6; k++) // loop on the 6 faces
+    {
+      tofind.clear();
+      for (int i = 0; i < 4; i++)
+        tofind.insert(nodes[ids[4 * k + i]]); // node ids of the face i
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 4; i++)
+            orderedNodes[i] = nodes[ids[4 * k + i]];
+          return;
+        }
+    }
+  MESSAGE("=== Problem volume " << _vtkCellIds[cellId] << " " << _grid->_mesh->fromVtkToSmds(_vtkCellIds[cellId]));
+  MESSAGE(orderedNodes[0] << " " << orderedNodes[1] << " " << orderedNodes[2] << " " << orderedNodes[3]);
+  MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
+  MESSAGE(nodes[4] << " " << nodes[5] << " " << nodes[6] << " " << nodes[7]);
 }
 
 void SMDS_DownHexa::addDownCell(int cellId, int lowCellId, unsigned char aType)
@@ -1867,9 +2106,37 @@ SMDS_DownQuadHexa::~SMDS_DownQuadHexa()
 {
 }
 
-void SMDS_DownQuadHexa::getOrderedNodesOfFace(int cellId, std::vector<int>& orderedNodes)
+void SMDS_DownQuadHexa::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
 {
-  // TODO
+  set<int> setNodes;
+  setNodes.clear();
+  for (int i = 0; i < orderedNodes.size(); i++)
+    setNodes.insert(orderedNodes[i]);
+  //MESSAGE("cellId = " << cellId);
+
+  vtkIdType npts = 0;
+  vtkIdType *nodes; // will refer to the point id's of the volume
+  _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+  set<int> tofind;
+  //int ids[24] = { 3, 2, 1, 0,  4, 5, 6, 7,  7, 3, 0, 4,  4, 0, 1, 5,  5, 1, 2, 6,  6, 2, 3, 7};
+  int ids[48] = { 3, 2, 1, 0,10, 9, 8,11,   4, 5, 6, 7,12,13,14,15,   7, 3, 0, 4,19,11,16,15,
+                  4, 0, 1, 5,16, 8,17,12,   5, 1, 2, 6,17, 9,18,13,   6, 2, 3, 7,18,10,19,14};
+  for (int k = 0; k < 6; k++)
+    {
+      tofind.clear();
+      for (int i = 0; i < 8; i++)
+        tofind.insert(nodes[ids[8 * k + i]]);
+      if (setNodes == tofind)
+        {
+          for (int i = 0; i < 8; i++)
+            orderedNodes[i] = nodes[ids[8 * k + i]];
+          return;
+        }
+    }
+  MESSAGE("=== Problem volume " << _vtkCellIds[cellId] << " " << _grid->_mesh->fromVtkToSmds(_vtkCellIds[cellId]));
+  MESSAGE(orderedNodes[0] << " " << orderedNodes[1] << " " << orderedNodes[2] << " " << orderedNodes[3]);
+  MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
 }
 
 void SMDS_DownQuadHexa::addDownCell(int cellId, int lowCellId, unsigned char aType)