-/*
- * SMDS_Downward.cxx
- *
- * Created on: Jun 3, 2010
- * Author: prascle
- */
+// Copyright (C) 2010-2013 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"
_cellDimension[VTK_QUADRATIC_TRIANGLE] = 2;
_cellDimension[VTK_QUAD] = 2;
_cellDimension[VTK_QUADRATIC_QUAD] = 2;
+ _cellDimension[VTK_BIQUADRATIC_QUAD] = 2;
_cellDimension[VTK_TETRA] = 3;
_cellDimension[VTK_QUADRATIC_TETRA] = 3;
_cellDimension[VTK_HEXAHEDRON] = 3;
_cellDimension[VTK_QUADRATIC_HEXAHEDRON] = 3;
+ _cellDimension[VTK_TRIQUADRATIC_HEXAHEDRON] = 3;
_cellDimension[VTK_WEDGE] = 3;
_cellDimension[VTK_QUADRATIC_WEDGE] = 3;
_cellDimension[VTK_PYRAMID] = 3;
_cellDimension[VTK_QUADRATIC_PYRAMID] = 3;
+ _cellDimension[VTK_HEXAGONAL_PRISM] = 3;
}
return _cellDimension[cellType];
}
this->_cellIds.clear();
this->_cellTypes.clear();
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;
- }
+ getCellDimension( VTK_LINE );
}
SMDS_Downward::~SMDS_Downward()
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++)
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);
set<int> tofind;
int ids[16] = { 0, 1, 2, 3, 0, 3, 4, 3, 2, 4, 2, 1, 4, 1, 0, 4 };
+ // Quadrangular face
tofind.clear();
for (int i = 0; i < 4; i++)
tofind.insert(nodes[ids[i]]);
orderedNodes[i] = nodes[ids[i]];
return;
}
+ // Triangular faces
for (int k = 0; k < 4; k++)
{
tofind.clear();
void SMDS_DownQuadPyramid::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& orderedNodes)
{
- // TODO
+// MESSAGE("SMDS_DownQuadPyramid::getOrderedNodesOfFace cellId = " << cellId);
+ 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 };
+
+ // Quadrangular face
+ tofind.clear();
+ for (int i = 0; i < 8; i++)
+ tofind.insert(nodes[ids[i]]);
+ if (setNodes == tofind)
+ {
+ for (int i = 0; i < 8; i++)
+ orderedNodes[i] = nodes[ids[i]];
+ return;
+ }
+ // Triangular faces
+ 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] << " " << orderedNodes[3]);
+ MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
}
void SMDS_DownQuadPyramid::addDownCell(int cellId, int lowCellId, unsigned char aType)
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;
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;
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;
//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 };
+ // Triangular faces
for (int k = 0; k < 2; k++)
{
tofind.clear();
return;
}
}
+ // Quadrangular faces
for (int k = 0; k < 3; k++)
{
tofind.clear();
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 };
+
+ // Triangular faces
+ 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;
+ }
+ }
+ // Quadrangular faces
+ 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)
//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)
{
else
{
//ASSERT(aType == VTK_QUADRATIC_TRIANGLE);
- for (int i = 2; i < _nbDownCells; i++)
+ for (int i = 3; i < _nbDownCells; i++)
{
if (faces[i] < 0)
{
